activerecord-deprecated_finders 0.0.1 → 0.0.2

data/activerecord-deprecated_finders.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{This gem contains deprecated finder APIs extracted from Active Record.}
   gem.homepage      = "https://github.com/rails/activerecord-deprecated_finders"
 
-  gem.files         = [".gitignore",".travis.yml","Gemfile","LICENSE","README.md","Rakefile","activerecord-deprecated_finders.gemspec","lib/active_record/deprecated_finders.rb","lib/active_record/deprecated_finders/association_builder.rb","lib/active_record/deprecated_finders/base.rb","lib/active_record/deprecated_finders/collection_proxy.rb","lib/active_record/deprecated_finders/dynamic_matchers.rb","lib/active_record/deprecated_finders/relation.rb","lib/active_record/deprecated_finders/version.rb","test/associations_test.rb","test/calculate_test.rb","test/default_scope_test.rb","test/dynamic_methods_test.rb","test/find_in_batches_test.rb","test/finder_options_test.rb","test/finder_test.rb","test/helper.rb","test/scope_test.rb","test/scoped_test.rb","test/update_all_test.rb","test/with_scope_test.rb"]
+  gem.files         = [".gitignore",".travis.yml","Gemfile","LICENSE","README.md","Rakefile","activerecord-deprecated_finders.gemspec","activerecord-deprecated_finders.gemspec.erb","lib/active_record/deprecated_finders.rb","lib/active_record/deprecated_finders/association_builder.rb","lib/active_record/deprecated_finders/base.rb","lib/active_record/deprecated_finders/collection_proxy.rb","lib/active_record/deprecated_finders/dynamic_matchers.rb","lib/active_record/deprecated_finders/relation.rb","lib/active_record/deprecated_finders/version.rb","test/associations_test.rb","test/calculate_test.rb","test/default_scope_test.rb","test/dynamic_methods_test.rb","test/find_in_batches_test.rb","test/finder_options_test.rb","test/finder_test.rb","test/helper.rb","test/scope_test.rb","test/scoped_test.rb","test/update_all_test.rb","test/with_scope_test.rb"]
   gem.test_files    = ["test/associations_test.rb","test/calculate_test.rb","test/default_scope_test.rb","test/dynamic_methods_test.rb","test/find_in_batches_test.rb","test/finder_options_test.rb","test/finder_test.rb","test/helper.rb","test/scope_test.rb","test/scoped_test.rb","test/update_all_test.rb","test/with_scope_test.rb"]
   gem.executables   = []
   gem.name          = "activerecord-deprecated_finders"

data/activerecord-deprecated_finders.gemspec.erb

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/active_record/deprecated_finders/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Jon Leighton"]
+  gem.email         = ["j@jonathanleighton.com"]
+  gem.description   = %q{This gem contains deprecated finder APIs extracted from Active Record.}
+  gem.summary       = %q{This gem contains deprecated finder APIs extracted from Active Record.}
+  gem.homepage      = "https://github.com/rails/activerecord-deprecated_finders"
+
+  gem.files         = [<%= files.map(&:inspect).join ',' %>]
+  gem.test_files    = [<%= test_files.map(&:inspect).join ',' %>]
+  gem.executables   = [<%= executables.map(&:inspect).join ',' %>]
+  gem.name          = "activerecord-deprecated_finders"
+  gem.require_paths = ["lib"]
+  gem.version       = ActiveRecord::DeprecatedFinders::VERSION
+
+  gem.add_development_dependency 'minitest',     '>= 3'
+  gem.add_development_dependency 'activerecord', '~> 4.0.0.beta'
+  gem.add_development_dependency 'sqlite3',      '~> 1.3'
+end

data/lib/active_record/deprecated_finders/association_builder.rb

@@ -9,7 +9,6 @@ module ActiveRecord::Associations::Builder
     def initialize(options)
       options[:includes]  = options.delete(:include)    if options[:include]
       options[:where]     = options.delete(:conditions) if options[:conditions]
-      options[:extending] = options.delete(:extend)     if options[:extend]
 
       @options = options
     end
@@ -34,9 +33,9 @@ module ActiveRecord::Associations::Builder
 
   class Association
     DEPRECATED_OPTIONS = [:readonly, :order, :limit, :group, :having,
-                          :offset, :select, :uniq, :include, :conditions, :extend]
+                          :offset, :select, :uniq, :include, :conditions]
 
-    self.valid_options += [:select, :conditions, :include, :extend, :readonly]
+    self.valid_options += [:select, :conditions, :include, :readonly]
 
     def initialize_with_deprecated_options(model, name, scope, options)
       if scope.is_a?(Hash)

data/lib/active_record/deprecated_finders/relation.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/module/aliasing'
 module ActiveRecord
   class Relation
     module DeprecatedMethods
-      VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend,
+      VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset,
                              :order, :select, :readonly, :group, :having, :from, :lock ]
 
       # The silence_deprecation arg is for internal use, where we have already output a
@@ -19,13 +19,12 @@ module ActiveRecord
         finders = options.dup
         finders.delete_if { |key, value| value.nil? && key != :limit }
 
-        ((VALID_FIND_OPTIONS - [:conditions, :include, :extend]) & finders.keys).each do |finder|
+        ((VALID_FIND_OPTIONS - [:conditions, :include]) & finders.keys).each do |finder|
           relation = relation.send(finder, finders[finder])
         end
 
         relation = relation.where(finders[:conditions]) if options.has_key?(:conditions)
         relation = relation.includes(finders[:include]) if options.has_key?(:include)
-        relation = relation.extending(finders[:extend]) if options.has_key?(:extend)
 
         relation
       end
@@ -76,7 +75,7 @@ module ActiveRecord
         if options.except(:distinct).present?
           ActiveSupport::Deprecation.warn(
             "Relation#calculate with finder options is deprecated. Please build " \
-            "a scope and then call find_in_batches on it instead."
+            "a scope and then call calculate on it instead."
           )
 
           apply_finder_options(options.except(:distinct), true)

data/lib/active_record/deprecated_finders/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DeprecatedFinders
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/test/associations_test.rb

@@ -8,12 +8,9 @@ describe 'associations' do
   end
 
   it 'translates hash scope options into scopes' do
-    extension = Module.new
-
     assert_deprecated do
       @klass.has_many :comments, readonly: 'a', order: 'b', limit: 'c', group: 'd', having: 'e',
-                                 offset: 'f', select: 'g', uniq: 'h', include: 'i', conditions: 'j',
-                                 extend: extension
+                                 offset: 'f', select: 'g', uniq: 'h', include: 'i', conditions: 'j'
     end
 
     scope = @klass.new.comments
@@ -28,7 +25,6 @@ describe 'associations' do
     scope.uniq_value.must_equal 'h'
     scope.includes_values.must_equal ['i']
     scope.where_values.must_include 'j'
-    scope.extensions.must_equal [extension]
   end
 
   it 'supports proc where values' do
@@ -46,17 +42,6 @@ describe 'associations' do
     @klass.new(title: 'omg').comments.where_values.must_include 'omg'
   end
 
-  it 'allows an extend option plus a block extension' do
-    mod = Module.new { def foo; 'foo'; end }
-    ActiveSupport::Deprecation.silence do
-      @klass.has_many(:comments, extend: mod) { def bar; 'bar'; end }
-    end
-
-    obj = @klass.new
-    obj.comments.foo.must_equal 'foo'
-    obj.comments.bar.must_equal 'bar'
-  end
-
   it "allows a declaration with a scope with no options" do
     ActiveSupport::Deprecation.silence do
       @klass.has_many :comments, -> { limit 5 }

data/test/finder_options_test.rb

@@ -39,12 +39,6 @@ describe 'apply_finder_options' do
     scope.offset_value.must_equal 5
   end
 
-  it 'supports :extend' do
-    mod   = Module.new
-    scope = Post.scoped.apply_finder_options(:extend => mod)
-    scope.extensions.must_include mod
-  end
-
   it "does not support :references (as it's new in 4.0)" do
     lambda { Post.scoped.apply_finder_options(references: :foo) }.must_raise ArgumentError
   end

data/test/scoped_test.rb

@@ -9,11 +9,6 @@ describe 'scoped' do
     assert_deprecated { Post.scoped(include: :foo) }.includes_values.must_equal [:foo]
   end
 
-  it 'accepts a deprecated extend option' do
-    mod = Module.new
-    assert_deprecated { Post.scoped(extend: mod) }.extensions.must_equal [mod]
-  end
-
   it 'is deprecated' do
     assert_deprecated { Post.scoped }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-deprecated_finders
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -73,6 +73,7 @@ files:
 - README.md
 - Rakefile
 - activerecord-deprecated_finders.gemspec
+- activerecord-deprecated_finders.gemspec.erb
 - lib/active_record/deprecated_finders.rb
 - lib/active_record/deprecated_finders/association_builder.rb
 - lib/active_record/deprecated_finders/base.rb
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem contains deprecated finder APIs extracted from Active Record.