composite_primary_keys 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac56003035ab69fb85bb4d3ec40644e5d3d80eb
-  data.tar.gz: 5fa4ebe741e44a8334b63a52ee050acdfa42140f
+  metadata.gz: df048b0184c228678c8e77400bc92ec63f54c008
+  data.tar.gz: 01f520e6e90a9216c0d76e2174703ae9a2f0edbb
 SHA512:
-  metadata.gz: 56e41e34385f9ae35be4a3c4fdeb8d5db149fdb6139122e67f169420637365c7c38d1e33e8e177eca175653fa0aa18fcd2d4e746126dafc66b6d20518b8c17d7
-  data.tar.gz: b84fc59f176103f616bd31fc202a6e12e2c611cf75957ee6e4304da3850103b55da205d04b89f809d2652f8ad8c851186d41369c742a58f8a8b0319c98187be7
+  metadata.gz: db16567e55619423e804aeaed7f094d133af909875ad09ed59b8e52da55bae3e3aaeecf710cffc88423ed41dc90a4c31e43492ab8981c6088279c7b8b472a8e8
+  data.tar.gz: f526cdb914772be1e606fd7ec496829b29ed5682a29cbbddf19f19bd4cc6606f621726d7571a71df9ecf436a06392a148db878621576a086690e14eadbd2889c

data/History.rdoc

@@ -1,6 +1,14 @@
+== 7.0.7 (2014-07-29)
+
+* Add back support for calling find like this (Sammy Larbi):
+
+  Membership.find('1,1')
+
+
 == 7.0.6 (2014-07-22)
 
-* Change the way we override ActiveRecord::Persistence to call sequence of included modules (such as callbacks)
+* Change the way we override ActiveRecord::Persistence to call sequence of included modules such
+  as callbacks (Charlie Savage)
 
 == 7.0.5 (2014-07-21)
 

data/lib/composite_primary_keys/relation/finder_methods.rb

@@ -77,6 +77,8 @@ module CompositePrimaryKeys
       end
 
       def find_with_ids(*ids)
+        # CPK handle strings that come w/ calling to_param on CPK-enabled models
+        ids = parse_ids(ids)
         raise UnknownPrimaryKey.new(@klass) if primary_key.nil?
 
         expects_array = ids.first.kind_of?(Array)
@@ -84,7 +86,6 @@ module CompositePrimaryKeys
 
         # CPK - don't do this, we want an array of arrays
         #ids = ids.flatten.compact.uniq
-
         case ids.size
           when 0
             raise RecordNotFound, "Couldn't find #{@klass.name} without an ID"
@@ -170,6 +171,26 @@ module CompositePrimaryKeys
           raise_record_not_found_exception!(ids, result.size, expected_size)
         end
       end
+
+      private
+      def parse_ids(ids)
+        result = []
+        ids.each do |id|
+          if id.is_a?(String)
+            if id.index(",")
+              result << [id.split(",")]
+            else
+              result << [id]
+            end
+          elsif id.is_a?(Array) && id.count > 1 && id.first.to_s.index(",")
+            result << id.map{|subid| subid.split(",")}
+          else
+            result << [id]
+          end
+        end
+        result = result.flatten(1)
+        return result
+      end
     end
   end
 end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_find.rb

@@ -20,6 +20,10 @@ class TestFind < ActiveSupport::TestCase
     ref_code = ReferenceCode.find([1,3])
     assert_not_nil(ref_code)
     assert_equal([1,3], ref_code.id)
+
+    ref_code = ReferenceCode.find(1,3)
+    assert_not_nil(ref_code)
+    assert_equal([1,3], ref_code.id)
   end
 
   def test_find_some
@@ -91,4 +95,28 @@ class TestFind < ActiveSupport::TestCase
     employees = Employee.where(:department => department)
     assert_equal(2, employees.count)
   end
+
+  def test_find_one_with_params_id
+    params_id = ReferenceCode.find([1,3]).to_param
+    assert_equal params_id, "1,3"
+
+    ref_code = ReferenceCode.find(params_id)
+    assert_not_nil(ref_code)
+    assert_equal([1,3], ref_code.id)
+  end
+
+  def test_find_some_with_array_of_params_id
+    params_ids = ReferenceCode.find([1,3], [2,1]).map(&:to_param)
+    assert_equal ["1,3", "2,1"], params_ids
+
+    ref_codes = ReferenceCode.find(params_ids)
+    assert_kind_of(Array, ref_codes)
+    assert_equal(2, ref_codes.length)
+
+    ref_code = ref_codes[0]
+    assert_equal([1,3], ref_code.id)
+
+    ref_code = ref_codes[1]
+    assert_equal([2,1], ref_code.id)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.0.7
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord