composite_primary_keys 11.0.2 → 11.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7dfdfaa1b55a68763587de0f1d7b9fd7c1264fa83a666db64886571dfb890a
-  data.tar.gz: 06f9267179912b8b873f096580bfc0a22407878ce94b06dca805ff34f14ecc47
+  metadata.gz: cb2211207f8a43539739b1d61b5d9f0c655e5ef3d1a0d53a7399fe550c25d36e
+  data.tar.gz: 512b0acad25f57c1d9796c7196827bf9a3c58be3319df5f6c0a11ea16658da09
 SHA512:
-  metadata.gz: dbda63a50cf354490318d0ef5ff082a62b146de042cb8e462b28fac283ce647040f4410960ce0b1fb0c12fee99c43a6ac9d17fc0f4d8771133bb654b61c50ed7
-  data.tar.gz: b360de0431222facb297a066519fcab4f9a32ce61d64a3e7d1cb8a0ce9535894b1b1d9c92262e29a10c4ae996f18e5e2a3c2a27af650790ed2995f2bfe02185b
+  metadata.gz: 19c175e1fc9f6ee5290573b75a1370314cfdb0598f65397ac99d616cc48d7a8a7a679ead3040f17249ff3419cbb0bb39355dc458dc4c12ce1235cf04b6dcf8be
+  data.tar.gz: ae880cc7d8c05910b601b9ca99a935468ec70bc6f440daf1015e1932f1544d73340f3bbacd8513a7cfe1f0f86d31df7c74b0ca2da47d31424027b58a012ce2d0

data/History.rdoc

@@ -1,3 +1,6 @@
+== 11.0.3 (2018-06-25)
+* Fix overridden attribute readers and writers (Charlie Savage)
+
 == 11.0.2 (2018-06-24)
 * Remove no longer needed overrides (Charlie Savage)
 

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -2,16 +2,22 @@ module ActiveRecord
   module AttributeMethods
     module Read
       def read_attribute(attr_name, &block)
+        name = if self.class.attribute_alias?(attr_name)
+                 # CPK
+                 # self.class.attribute_alias(attr_name).to_s
+                 self.class.attribute_alias(attr_name)
+               else
+                 # CPK
+                 # attr_name.to_s
+                 attr_name
+               end
+
+        primary_key = self.class.primary_key
         # CPK
-        if attr_name.kind_of?(Array) || attr_name.to_s == 'id'.freeze && @attributes.key?('id')
-          _read_attribute(attr_name, &block)
-        else
-          name = attr_name.to_s
-          # CPK
-          #name = self.class.primary_key if name == 'id'.freeze
-          name = self.class.primary_key if name == 'id'.freeze && !composite?
-          _read_attribute(name, &block)
-        end
+        # name = primary_key if name == "id".freeze && primary_key
+        name = primary_key if name == "id".freeze && primary_key && !composite?
+        sync_with_transaction_state if name == primary_key
+        _read_attribute(name, &block)
       end
 
       def _read_attribute(attr_name)

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -3,41 +3,35 @@ module ActiveRecord
     module Write
       def write_attribute(attr_name, value)
         name = if self.class.attribute_alias?(attr_name)
-          # CPK
-          # self.class.attribute_alias(attr_name).to_s
-          self.class.attribute_alias(attr_name)
-        else
-          # CPK
-          # attr_name.to_s
-          attr_name
-        end
+                 # CPK
+                 #self.class.attribute_alias(attr_name).to_s
+                 self.class.attribute_alias(attr_name)
+               else
+                 # CPK
+                 # attr_name.to_s
+                 attr_name
+               end
 
-        write_attribute_with_type_cast(name, value, true)
+        primary_key = self.class.primary_key
+        # CPK
+        # name = primary_key if name == "id".freeze && primary_key
+        name = primary_key if name == "id".freeze && primary_key && !composite?
+        sync_with_transaction_state if name == primary_key
+        _write_attribute(name, value)
       end
 
-      def write_attribute_with_type_cast(attr_name, value, should_type_cast)
+      def _write_attribute(attr_name, value) # :nodoc:
         # CPK
         if attr_name.kind_of?(Array)
-          value = [nil]*attr_name.length if value.nil?
-          unless value.length == attr_name.length
-            raise "Number of attr_names #{attr_name.inspect} and values #{value.inspect} do not match"
+          attr_name.each_with_index do |attr_child_name, i|
+            child_value = value ? value[i] : value
+            @attributes.write_from_user(attr_child_name.to_s, child_value)
           end
-          [attr_name, value].transpose.map {|name,val| write_attribute(name, val)}
-          value
         else
-          attr_name = attr_name.to_s
-          # CPK
-          # attr_name = self.class.primary_key if attr_name == 'id' && self.class.primary_key
-          attr_name = self.class.primary_key if attr_name == 'id' && self.class.primary_key && !self.composite?
-
-          if should_type_cast
-            @attributes.write_from_user(attr_name, value)
-          else
-            @attributes.write_cast_value(attr_name, value)
-          end
-
-          value
+          @attributes.write_from_user(attr_name.to_s, value)
         end
+
+        value
       end
     end
   end

data/lib/composite_primary_keys/version.rb

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

data/test/test_associations.rb

@@ -237,7 +237,7 @@ class TestAssociations < ActiveSupport::TestCase
     assert_equal({"department_id"=>[1, 2]}, steve.changes)
   end
 
-  def test_composite_belongs_to__setting_to_nil
+  def test_composite_belongs_to_setting_to_nil
     room_assignment = room_assignments(:jacksons_room)
     # This was raising an error before:
     #   NoMethodError: undefined method `length' for nil:NilClass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 11.0.2
+  version: 11.0.3
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord