composite_primary_keys 7.0.7 → 7.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df048b0184c228678c8e77400bc92ec63f54c008
-  data.tar.gz: 01f520e6e90a9216c0d76e2174703ae9a2f0edbb
+  metadata.gz: cc0ec64847be066d4ea0a2e1cc8bbef8d938df03
+  data.tar.gz: 27a854255a8c832b24ada64d40d056611d147b35
 SHA512:
-  metadata.gz: db16567e55619423e804aeaed7f094d133af909875ad09ed59b8e52da55bae3e3aaeecf710cffc88423ed41dc90a4c31e43492ab8981c6088279c7b8b472a8e8
-  data.tar.gz: f526cdb914772be1e606fd7ec496829b29ed5682a29cbbddf19f19bd4cc6606f621726d7571a71df9ecf436a06392a148db878621576a086690e14eadbd2889c
+  metadata.gz: 83dfb994708e614f2379506ae3282fcc3bd104ee29f37aadfb98bab8bfac019a9c9c8dd9376dd774c61e24da632296f1d7af8b8b5ada38bbbbe53f35870ed2fc
+  data.tar.gz: 688a266a56600582a2853dd913684266953e17bd591a89594f903c12cfeaa181fe0832717fa33f961f47e74d96cd512d982700e27ecd9184d7eb314c999647db

data/History.rdoc

@@ -1,9 +1,18 @@
+== 7.0.8 (2014-08-03)
+
+* Fix instantiation of has_many records via :includes that use composite keys (Charlie Savage)
+
 == 7.0.7 (2014-07-29)
 
 * Add back support for calling find like this (Sammy Larbi):
 
   Membership.find('1,1')
 
+== 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)
 

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -33,10 +33,10 @@ module ActiveRecord
           # CPK
           #primary_id = type_caster.type_cast row_hash[primary_key]
           primary_id = if primary_key.kind_of?(Array)
-            primary_key.map {|key| type_caster.type_cast row_hash[key]}
-          else
-            type_caster.type_cast row_hash[primary_key]
-          end
+                         primary_key.map {|key| type_caster.type_cast row_hash[key]}
+                       else
+                         type_caster.type_cast row_hash[primary_key]
+                       end
           parent = parents[primary_id] ||= join_root.instantiate(row_hash, column_aliases)
           construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
         }
@@ -44,49 +44,44 @@ module ActiveRecord
         parents.values
       end
 
-      protected
+      def construct(ar_parent, parent, row, rs, seen, model_cache, aliases)
+        primary_id  = ar_parent.id
 
-      def construct_association(record, join_part, row)
-        return if record.id.to_s != join_part.parent.record_id(row).to_s
+        parent.children.each do |node|
+          if node.reflection.collection?
+            other = ar_parent.association(node.reflection.name)
+            other.loaded!
+          else
+            if ar_parent.association_cache.key?(node.reflection.name)
+              model = ar_parent.association(node.reflection.name).target
+              construct(model, node, row, rs, seen, model_cache, aliases)
+              next
+            end
+          end
 
-        macro = join_part.reflection.macro
-        if macro == :has_one
-          return if record.association_cache.key?(join_part.reflection.name)
-          # CPK
-          # association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
-          association = association_for_primary_key_from_row(join_part, row)
+          key = aliases.column_alias(node, node.primary_key)
 
-          set_target_and_inverse(join_part, association, record)
-        else
           # CPK
-          # association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
-          association = association_for_primary_key_from_row(join_part, row)
-
-          case macro
-          when :has_many, :has_and_belongs_to_many
-            other = record.association(join_part.reflection.name)
-            other.loaded!
-            other.target.push(association) if association
-            other.set_inverse_instance(association)
-          when :belongs_to
-            set_target_and_inverse(join_part, association, record)
+          if key.is_a?(Array)
+            id = Array(key).map do |column_alias|
+              row[column_alias]
+            end
+            next if id.empty?
           else
-            raise ConfigurationError, "unknown macro: #{join_part.reflection.macro}"
+            id = row[key]
+            next if id.nil?
           end
-        end
-        association
-      end
 
-      private
+          model = seen[parent.base_klass][primary_id][node.base_klass][id]
 
-      def association_for_primary_key_from_row(join_part, row)
-        result = nil
-        if (cpk = join_part.aliased_primary_key).is_a?(Array)
-          result = join_part.instantiate(row) if cpk.detect {|pk| row[pk].nil? }.nil?
-        else
-          result = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
+          if model
+            construct(model, node, row, rs, seen, model_cache, aliases)
+          else
+            model = construct_model(ar_parent, node, row, model_cache, id, aliases)
+            seen[parent.base_klass][primary_id][node.base_klass][id] = model
+            construct(model, node, row, rs, seen, model_cache, aliases)
+          end
         end
-        result
       end
     end
   end

data/lib/composite_primary_keys/version.rb

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

data/test/test_find.rb

@@ -20,10 +20,6 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.7
+  version: 7.0.8
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord