activerecord-deprecated_finders 0.0.3 → 1.0.0

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
+gemfile:
+  - gemfiles/Gemfile-edge
+  - Gemfile
 notifications:
-  email:
-    - j@jonathanleighton.com
+  email: false
+  campfire:
+    on_success: change
+    on_failure: always
+    rooms:
+      - secure: "DwWWfmRXWSYoelIo3W6H99FrLM2V9ugFoAu+xBo42n2pNV44lU+8T9O+zWkV\nwD3Lz+7URB/5IRPcEel/KYaRYNJl71YUBgtlcvjM7Xl/7YGLYFAcPT2RXfKA\nctvckk/5NehmSawnLhhvMz2gKtIx/fIwCVqxUnRqqYE0eEQaONA="
 before_install:
   - gem install bundler

data/Gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in active_record_deprecated_finders.gemspec
 gemspec
 
-if ENV['RAILS']
-  gem 'rails', path: ENV['RAILS']
-else
-  gem 'rails', git: 'git://github.com/rails/rails', branch: 'master'
-end
+gem 'rails', '>= 4.0.0.beta', '< 5'

data/Rakefile

@@ -16,7 +16,7 @@ deps = `git ls-files`.split("\n") - [specname]
 task :gemspec => specname
 
 file specname => deps do
-  files       = `git ls-files`.split("\n")
+  files       = `git ls-files`.split("\n") - Dir["gemfiles/*"]
   test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 

data/activerecord-deprecated_finders.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/active_record/deprecated_finders/version', __FI
 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.description   = %q{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"
 

data/activerecord-deprecated_finders.gemspec.erb

@@ -4,7 +4,7 @@ require File.expand_path('../lib/active_record/deprecated_finders/version', __FI
 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.description   = %q{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"
 

data/lib/active_record/deprecated_finders/association_builder.rb

@@ -38,10 +38,16 @@ module ActiveRecord::Associations::Builder
     self.valid_options += [:select, :conditions, :include, :readonly]
 
     def initialize_with_deprecated_options(model, name, scope, options)
-      if scope.is_a?(Hash)
-        options            = scope
-        deprecated_options = options.slice(*DEPRECATED_OPTIONS)
+      options            = scope if scope.is_a?(Hash)
+      deprecated_options = options.slice(*DEPRECATED_OPTIONS)
+
+      if scope.respond_to?(:call) && !deprecated_options.empty?
+        raise ArgumentError,
+          "Invalid mix of scope block and deprecated finder options on " \
+          "ActiveRecord association: #{model.name}.#{macro} :#{name}"
+      end
 
+      if scope.is_a?(Hash)
         if deprecated_options.empty?
           scope = nil
         else

data/lib/active_record/deprecated_finders/collection_proxy.rb

@@ -4,8 +4,12 @@ module ActiveRecord
       module InterceptDynamicInstantiators
         def method_missing(method, *args, &block)
           match = DynamicMatchers::Method.match(klass, method)
+          sanitized_method = match.class.prefix + match.class.suffix if match
 
-          if match && match.is_a?(DynamicMatchers::Instantiator)
+          if match && self.respond_to?(sanitized_method)
+            self.send(sanitized_method, Hash[match.attribute_names.zip(args)])
+
+          elsif match && match.is_a?(DynamicMatchers::Instantiator)
             scoping do
               klass.send(method, *args) do |record|
                 proxy_association.add_to_target(record)

data/lib/active_record/deprecated_finders/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DeprecatedFinders
-    VERSION = "0.0.3"
+    VERSION = "1.0.0"
   end
 end

data/test/associations_test.rb

@@ -7,6 +7,14 @@ describe 'associations' do
     @klass.table_name = 'posts'
   end
 
+  it 'find_or_create_by on has_many through should work' do
+    physician = Physician.create!
+    ActiveSupport::Deprecation.silence do
+      physician.patients.find_or_create_by_name('Tim')
+    end
+    assert_equal 1, Appointment.count
+  end
+
   it 'translates hash scope options into scopes' do
     assert_deprecated do
       @klass.has_many :comments, readonly: 'a', order: 'b', limit: 'c', group: 'd', having: 'e',
@@ -49,4 +57,10 @@ describe 'associations' do
     scope = @klass.new.comments
     scope.limit_value.must_equal 5
   end
+
+  it "raises an ArgumentError when declaration uses both scope and deprecated options" do
+    assert_raises(ArgumentError) do
+      @klass.has_many :comments, -> { limit 5 }, :order=>'b'
+    end
+  end
 end

data/test/finder_options_test.rb

@@ -44,8 +44,8 @@ describe 'apply_finder_options' do
   end
 
   it 'supports :order' do
-    scope = Post.scoped.apply_finder_options(:order => :foo)
-    scope.order_values.must_equal [:foo]
+    scope = Post.scoped.apply_finder_options(:order => 'foo')
+    scope.order_values.must_equal ['foo']
   end
 
   it 'supports :select' do

data/test/helper.rb

@@ -17,6 +17,19 @@ ActiveRecord::Schema.define do
     t.string :title
     t.references :post
   end
+
+  create_table :appointments do |t|
+    t.integer :physician_id
+    t.integer :patient_id
+  end
+
+  create_table :physicians do |t|
+    t.string :name
+  end
+
+  create_table :patients do |t|
+    t.string :name
+  end
 end
 
 class Post < ActiveRecord::Base
@@ -29,6 +42,19 @@ class Comment < ActiveRecord::Base
   end
 end
 
+class Appointment < ActiveRecord::Base
+  belongs_to :physician
+  belongs_to :patient
+end
+
+class Patient < ActiveRecord::Base
+end
+
+class Physician < ActiveRecord::Base
+  has_many :appointments
+  has_many :patients, through: :appointments
+end
+
 require 'active_support/testing/deprecation'
 ActiveSupport::Deprecation.debug = true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-deprecated_finders
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -65,7 +65,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-description: This gem contains deprecated finder APIs extracted from Active Record.
+description: Deprecated finder APIs extracted from Active Record.
 email:
 - j@jonathanleighton.com
 executables: []
@@ -136,3 +136,4 @@ test_files:
 - test/scoped_test.rb
 - test/update_all_test.rb
 - test/with_scope_test.rb
+has_rdoc: