composite_primary_keys 6.0.0 → 6.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTg5ODVmZTc1ZThmM2U1Y2Q1OTllMDM1MGNhMGZiNTk5ZTc0ZWIwMg==
-  data.tar.gz: !binary |-
-    MDg4MjRkMzllODdmNTIwMjE3YTk4OTlmNDgyYzdlNmIxYmEyNDY2YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MmYzM2E0YWY5MTY2ZWY0YTc3NGYwMmY0NDIxZjc4ODgzMzFmZmQyOTljNjQ5
-    NmNmYTZmNzJmZjkxMzMzMDgxNzU3NTE1MWZlMmU0Mjk4MTlkN2RjNDQ1NzIy
-    NTdlZDZjNjI5NTU3MWUxNmM5NTdlZjZiNTk4NzQ0MzNiNWVjNDY=
-  data.tar.gz: !binary |-
-    YTU3N2Y3YWM3N2I1OGMzNmE5NmI0ZDljNTgwNzRmYzQ2Nzg1YzdhM2E0MWI4
-    OGY5NzUzNWUyNzZkOGU2MjgzOTM2MmMzYTAyYTkxYmJjMTM0NzZlNjViMDg2
-    NjQ1NGUxNTI2ODFhZjVjYzk2YjNhYzg3OGYxNzMzZjczNjIzZGE=
+SHA1:
+  metadata.gz: c978ed5109a507f202bab7ad54362c0f543d7ed6
+  data.tar.gz: 65dac9d9389d1cbf8727ec25a5cc1a93a706d91f
+SHA512:
+  metadata.gz: 340806c9233d93bb1d18e4203080650600de58400231302bcf50b9f019f056d99d0c9883dc534d8483d081249b968bcf205f29e35fdb852565cc795ac9f4da5c
+  data.tar.gz: 10e4247371f8e979b96074ebe2e55ee79da37cc6a37ea03be8f21e48610180d122625f6690cd70eabf6fec65d4c017061cc52042ea81376b5bec0b72a94f3833

data/History.rdoc

@@ -1,3 +1,11 @@
+== 6.0.1 (2013-11-29)
+
+* Handle records == :all in HasManyAssociation#delete_records. Without this calling
+  delete or clear on a has_many assocation can result in an exception (Tom Hughes)
+* Don't include cpk key as an attributes - fixes json serialization - #168 (Charlie Savage)
+* Fix tests running on ruby 1.9.3 (Charlie Savage)
+* Update nested_attributes to work with activerecord 4.0.x (Nick DeLuca)
+
 == 6.0.0 (2013-08-04)
 * ActiveRecord 4.0 support (Sammy Larbi)
 

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.0'
   require 'active_record'
 end
 

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -6,23 +6,27 @@ module ActiveRecord
           records.each { |r| r.destroy }
           update_counter(-records.length) unless inverse_updates_counter_cache?
         else
-          # CPK
-          # keys  = records.map { |r| r[reflection.association_primary_key] }
-          # scope = scope.where(reflection.association_primary_key => keys)
-          table = Arel::Table.new(reflection.table_name)
-          and_conditions = records.map do |record|
-            eq_conditions = Array(reflection.association_primary_key).map do |name|
-              table[name].eq(record[name])
+          if records == :all
+            scope = self.scope
+          else
+            # CPK
+            # keys  = records.map { |r| r[reflection.association_primary_key] }
+            # scope = scope.where(reflection.association_primary_key => keys)
+            table = Arel::Table.new(reflection.table_name)
+            and_conditions = records.map do |record|
+              eq_conditions = Array(reflection.association_primary_key).map do |name|
+                table[name].eq(record[name])
+              end
+              Arel::Nodes::And.new(eq_conditions)
             end
-            Arel::Nodes::And.new(eq_conditions)
-          end
 
-          condition = and_conditions.shift
-          and_conditions.each do |and_condition|
-            condition = condition.or(and_condition)
-          end
+            condition = and_conditions.shift
+            and_conditions.each do |and_condition|
+              condition = condition.or(and_condition)
+            end
 
-          scope = scope.where(condition)
+            scope = self.scope.where(condition)
+          end
 
           if method == :delete_all
             update_counter(-scope.delete_all)

data/lib/composite_primary_keys/core.rb

@@ -1,5 +1,12 @@
 module ActiveRecord
   module Core
+    def init_internals_with_cpk
+      init_internals_without_cpk
+      # Remove cpk array from attributes, fixes to_json
+      @attributes.delete(self.class.primary_key) if self.composite?
+    end
+    alias_method_chain :init_internals, :cpk
+
     def initialize_dup(other)
       cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
       self.class.initialize_attributes(cloned_attributes, :serialized => false)

data/lib/composite_primary_keys/nested_attributes.rb

@@ -1,23 +1,21 @@
 module ActiveRecord
   module NestedAttributes
-    def assign_nested_attributes_for_collection_association(association_name, attributes_collection, assignment_opts = {})
+    def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
       options = self.nested_attributes_options[association_name]
 
       unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
         raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
       end
 
-      if options[:limit] && attributes_collection.size > options[:limit]
-        raise TooManyRecords, "Maximum #{options[:limit]} records are allowed. Got #{attributes_collection.size} records instead."
-      end
+      check_record_limit!(options[:limit], attributes_collection)
 
       if attributes_collection.is_a? Hash
         keys = attributes_collection.keys
         attributes_collection = if keys.include?('id') || keys.include?(:id)
-                                  Array.wrap(attributes_collection)
-                                else
-                                  attributes_collection.values
-                                end
+          [attributes_collection]
+        else
+          attributes_collection.values
+        end
       end
 
       association = association(association_name)
@@ -40,7 +38,7 @@ module ActiveRecord
                            end.flatten.compact
                          else
                            attribute_ids = attributes_collection.map {|a| a['id'] || a[:id] }.compact
-                           attribute_ids.empty? ? [] : association.scoped.where(association.klass.primary_key => attribute_ids)
+                           attribute_ids.empty? ? [] : association.scope.where(association.klass.primary_key => attribute_ids)
                          end
 
       attributes_collection.each do |attributes|
@@ -48,11 +46,11 @@ module ActiveRecord
 
         if attributes['id'].blank?
           unless reject_new_record?(association_name, attributes)
-            association.build(attributes.except(*unassignable_keys(assignment_opts)), assignment_opts)
+            association.build(attributes.except(*UNASSIGNABLE_KEYS))
           end
         elsif existing_record = existing_records.detect { |record| record.id.to_s == attributes['id'].to_s }
-          unless association.loaded? || call_reject_if(association_name, attributes)
-            # Make sure we are operating on the actual object which is in the association's
+          unless call_reject_if(association_name, attributes)
+            # Make sure we are operatingon the actual object which is in the assocaition's
             # proxy_target array (either by finding it, or adding it if not found)
             target_record = association.target.detect { |record| record == existing_record }
 
@@ -61,16 +59,13 @@ module ActiveRecord
             else
               association.add_to_target(existing_record)
             end
-
           end
 
           if !call_reject_if(association_name, attributes)
-            assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy], assignment_opts)
+            assign_to_or_mark_for_destruction(existing_record, attributes, options[:allow_destroy])
           end
-        elsif assignment_opts[:without_protection]
-          association.build(attributes.except(*unassignable_keys(assignment_opts)), assignment_opts)
         else
-          raise_nested_attributes_record_not_found(association_name, attributes['id'])
+          raise_nested_attributes_record_not_found!(association_name, attributes['id'])
         end
       end
     end

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -1,6 +1,9 @@
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-require "test/unit"
+require 'active_support/test_case'
+require 'minitest/autorun'
+require 'minitest/reporters'
+MiniTest::Reporters.use!
 
 # To make debugging easier, test within this source tree versus an installed gem
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))

data/test/test_serialize.rb

@@ -0,0 +1,15 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestEqual < ActiveSupport::TestCase
+  fixtures :departments
+
+  def test_json
+    department = Department.first
+    assert_equal('{"department_id":1,"location_id":1}', department.to_json)
+  end
+
+  def test_serializable_hash
+    department = Department.first
+    assert_equal({"department_id" => 1,"location_id" => 1}, department.serializable_hash)
+  end
+end

data/test/test_suite.rb

@@ -17,10 +17,10 @@
   test_polymorphic
   test_predicates
   test_santiago
+  test_serialize
   test_tutorial_example
   test_update
   test_validations
-  test_delete_without_pk
 ).each do |test|
   require File.expand_path("../#{test}", __FILE__)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: Composite key support for ActiveRecord
@@ -179,6 +179,7 @@ files:
 - test/test_polymorphic.rb
 - test/test_predicates.rb
 - test/test_santiago.rb
+- test/test_serialize.rb
 - test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
@@ -193,17 +194,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -233,6 +234,7 @@ test_files:
 - test/test_polymorphic.rb
 - test/test_predicates.rb
 - test/test_santiago.rb
+- test/test_serialize.rb
 - test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb