kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

extract deprecated code

Browse source
This commit is contained in:
Jon Leighton 2012-04-22 12:28:26 +02:00
parent 618c5fc3c0
commit af27c8b041
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record/scoping/named.rb
View file

@ -171,7 +171,7 @@ module ActiveRecord
# Article.published.featured.latest_article # Article.published.featured.latest_article
# Article.featured.titles # Article.featured.titles
def scope(name, body = {}, &block) def scope(name, body, &block)
extension = Module.new(&block) if block extension = Module.new(&block) if block
# Check body.is_a?(Relation) to prevent the relation actually being # Check body.is_a?(Relation) to prevent the relation actually being
@ -188,9 +188,7 @@ module ActiveRecord
end end
singleton_class.send(:define_method, name) do |*args| singleton_class.send(:define_method, name) do |*args|
options = body.respond_to?(:call) ? unscoped { body.call(*args) } : body options = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
options = scoped.apply_finder_options(options) if options.is_a?(Hash)
relation = scoped.merge(options) relation = scoped.merge(options)
extension ? relation.extending(extension) : relation extension ? relation.extending(extension) : relation

5
activerecord/test/cases/named_scope_test.rb
View file

@ -459,11 +459,6 @@ class NamedScopeTest < ActiveRecord::TestCase
klass = Class.new(ActiveRecord::Base) klass = Class.new(ActiveRecord::Base)
klass.table_name = 'posts' klass.table_name = 'posts'
assert_deprecated do
klass.scope :welcome, { :conditions => { :id => posts(:welcome).id } }
end
assert_equal [posts(:welcome).title], klass.welcome.map(&:title)
assert_deprecated do assert_deprecated do
klass.scope :welcome_2, klass.where(:id => posts(:welcome).id) klass.scope :welcome_2, klass.where(:id => posts(:welcome).id)
end end

4
activerecord/test/models/topic.rb
View file

@ -45,8 +45,8 @@ class Topic < ActiveRecord::Base
2 2
end end
end end
scope :named_extension, -> { { :extend => NamedExtension } } scope :named_extension, :extend => NamedExtension
scope :multiple_extensions, -> { { :extend => [MultipleExtensionTwo, MultipleExtensionOne] } } scope :multiple_extensions, :extend => [MultipleExtensionTwo, MultipleExtensionOne]
has_many :replies, :dependent => :destroy, :foreign_key => "parent_id" has_many :replies, :dependent => :destroy, :foreign_key => "parent_id"
has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title" has_many :replies_with_primary_key, :class_name => "Reply", :dependent => :destroy, :primary_key => "title", :foreign_key => "parent_title"