composite_primary_keys 6.0.6 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7821e1dce524f20a81e982faa1042c1bb5cf0b
-  data.tar.gz: 5112714e5ae73ba0335ac34aca8a7f5f699ba6a3
+  metadata.gz: add6bac7bcaa5ca9b40c11e99df452b921b962ae
+  data.tar.gz: d1dd46cc248802f32c061f349c7d8f2158268cf9
 SHA512:
-  metadata.gz: 9944a233a344edfdf63b0bd1dfadf70074f241d4b1cce209aa1280307693e124d09b1bd54907ab94f7a23731c8e8b6ab693dee2246eb65475385a478728c5efd
-  data.tar.gz: 7ec24c0880bbab735c1491bd3e6891692974190150deebfe57a7347502718d751f42f7a44ef28fd9161a3a47bb16721244bf7b829d3a0c6b29d7c7e60c8787a4
+  metadata.gz: 1dbf3af753f80209f70ccc15b2dfbc08a8bca681489a114bebf5c4d442f87c6b7dd06c4245ea83da7d02b904f1bc853634a8030deef31b0a95bd823a4f5a8efa
+  data.tar.gz: b293046f7cc2c73ca0edb6d462588988101c83f9fb34c6841281da4f614990952d4fefbdacd651f39540c3c425526253dc7821a208b7c7bf9a98797412e3dd1e

data/History.rdoc

@@ -1,3 +1,7 @@
+== 6.0.7 (2014-10-06)
+
+* Support Rails 4.0.6 (Tom Hughes)
+
 == 6.0.6 (2014-05-26)
 
 * Don't refer to deprecated set_primary_keys in README (Henare Degan)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>4.0.0'
+  gem 'activerecord', '~>4.0.6'
   require 'active_record'
 end
 

data/lib/composite_primary_keys/persistence.rb

@@ -46,7 +46,7 @@ module CompositePrimaryKeys
         end
       end
 
-      def update_record(attribute_names = @attributes.keys)
+      def _update_record(attribute_names = @attributes.keys)
         return super(attribute_names) unless composite?
         
         klass = self.class

data/lib/composite_primary_keys/relation.rb

@@ -48,12 +48,12 @@ module ActiveRecord
 
     def add_cpk_where_values_hash
       class << self
-        def where_values_hash
+        def where_values_hash(relation_table_name = table_name)
           # CPK adds this so that it finds the Equality nodes beneath the And node:
           nodes_from_and = with_default_scope.where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
 
           equalities = (nodes_from_and + with_default_scope.where_values.grep(Arel::Nodes::Equality)).find_all { |node|
-            node.left.relation.name == table_name
+            node.left.relation.name == relation_table_name
           }
 
           Hash[equalities.map { |where| [where.left.name, where.right] }]

data/lib/composite_primary_keys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.6
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord