activerecord-deprecated_finders 1.0.1 → 1.0.2

data/lib/active_record/deprecated_finders/collection_proxy.rb

@@ -4,15 +4,17 @@ 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 && self.respond_to?(sanitized_method) && proxy_association.reflection.options[:through].present?
-            self.send(sanitized_method, Hash[match.attribute_names.zip(args)])
-
-          elsif match && match.is_a?(DynamicMatchers::Instantiator)
+          if match && match.is_a?(DynamicMatchers::Instantiator)
             scoping do
               klass.send(method, *args) do |record|
-                proxy_association.add_to_target(record)
+
+                sanitized_method = match.class.prefix + match.class.suffix
+                if %w(find_or_create_by find_or_create_by!).include?(sanitized_method) && proxy_association.reflection.options[:through].present?
+                  proxy_association.send(:save_through_record, record)
+                else
+                  proxy_association.add_to_target(record)
+                end
                 yield record if block_given?
               end
             end

data/lib/active_record/deprecated_finders/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DeprecatedFinders
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/test/associations_test.rb

@@ -8,6 +8,14 @@ describe 'associations' do
     Appointment.delete_all
   end
 
+  it 'should respect find_by_anything method defined on the base class' do
+    physician = Physician.create!
+
+    ActiveSupport::Deprecation.silence do
+      assert_equal [], physician.patients.find_by_custom_name
+    end
+  end
+
   it 'find_or_create_by on has_many through should work' do
     physician = Physician.create!
     ActiveSupport::Deprecation.silence do
@@ -16,6 +24,14 @@ describe 'associations' do
     assert_equal 1, Appointment.count
   end
 
+  it 'find_or_create_by with bang 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 'find_or_create_by on has_many should work' do
     physician = Physician.create!
     ActiveSupport::Deprecation.silence do

data/test/helper.rb

@@ -50,6 +50,9 @@ class Appointment < ActiveRecord::Base
 end
 
 class Patient < ActiveRecord::Base
+  def self.find_by_custom_name
+    []
+  end
 end
 
 class Physician < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-deprecated_finders
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -136,4 +136,3 @@ test_files:
 - test/scoped_test.rb
 - test/update_all_test.rb
 - test/with_scope_test.rb
-has_rdoc: