composite_primary_keys 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a95b00436decb1d0c5da9fc42f706be34aaf6dc
-  data.tar.gz: 08b6d26c4d0e136b577c59394becfc82af3b0a21
+  metadata.gz: 4e6b7d1159c668d23e4edcdf8b2fcb0634a81c7a
+  data.tar.gz: ba6783910246e18e7aaa729e0fec71160ca8c7fb
 SHA512:
-  metadata.gz: 1e02f25ffa1220a27361433d224c07f584ec130dc7cb2dfbf1f542e903486d80dec239555b62a96a96a3375eec45fa82bf9810374700d40184075aeb7ddd30b0
-  data.tar.gz: a5d9c69b6eccada21cfed579bcd2bd9a4f6ea1987a9bb3cf4c43700c31a4859d24fb0514d8b27d8d46d00cd6ccc79b59dd89e5568bb8646953051810ecd4ef3e
+  metadata.gz: a2943835037daa080b7a2d1f1e4d18a60d761968729c45460d8a4ce4da1f980aaa53f9c346e18459f7d3347811df83de0d4710835d3c1f8792a2f0f00255a787
+  data.tar.gz: 9e2b28913094cb75c372572a8c4eaed1d167cef8fd73b091aeb75e93799dbac68d1ccfe0be1ca1478d4469533fa81caf7df6ea866396320881daba4f64b2b796

data/History.rdoc

@@ -1,3 +1,10 @@
+== 7.0.3 (2014-07-04)
+
+* Fixes for Rails 4.1.2+ compatibility (Tom Hughes)
+* Nested attribute fix (Sammy Larb)
+* Test fixes (Sammy Larb)
+* Fixes instantiating join records (Charlie Savage)
+
 == 7.0.2 (2014-06-01)
 
 * Fix id_was when one of the column names is called id (Adrian Hooper)

data/lib/composite_primary_keys.rb

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

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -1,6 +1,20 @@
 module ActiveRecord
   module Associations
     class JoinDependency
+      class Aliases # :nodoc:
+        def column_alias(node, column)
+          # CPK
+          #@alias_cache[node][column]
+          if column.kind_of?(Array)
+            column.map do |a_column|
+              @alias_cache[node][a_column]
+            end
+          else
+            @alias_cache[node][column]
+          end
+        end
+      end
+
       def instantiate(result_set, aliases)
         primary_key = aliases.column_alias(join_root, join_root.primary_key)
         type_caster = result_set.column_type primary_key
@@ -18,8 +32,8 @@ module ActiveRecord
         result_set.each { |row_hash|
           # CPK
           #primary_id = type_caster.type_cast row_hash[primary_key]
-          primary_id = if row_hash[primary_key].kind_of?(Array)
-            row_hash[primary_key].map {|key| type_caster.type_cast 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

data/lib/composite_primary_keys/attribute_methods/read.rb

@@ -1,30 +1,6 @@
 module ActiveRecord
   module AttributeMethods
     module Read
-      module ClassMethods
-        def internal_attribute_access_code(attr_name, cast_code)
-          # CPK - this is a really horrid hack, needed to get
-          # right class namespace :(
-          if cast_code.match(/^ActiveRecord/)
-            cast_code = "::#{cast_code}"
-          end
-          access_code = "(v=@attributes[attr_name]) && #{cast_code}"
-
-          # CPK
-          #unless attr_name == primary_key
-          primary_keys = Array(self.primary_key)
-          unless primary_keys.include?(attr_name.to_s)
-            access_code.insert(0, "missing_attribute(attr_name, caller) unless @attributes.has_key?(attr_name); ")
-          end
-
-          if cache_attribute?(attr_name)
-            access_code = "@attributes_cache[attr_name] ||= (#{access_code})"
-          end
-
-          "attr_name = '#{attr_name}'; #{access_code}"
-        end
-      end
-
       rails_read_attribute = instance_method(:read_attribute)
       define_method(:read_attribute) do |attr_name|
         if attr_name.kind_of?(Array)

data/lib/composite_primary_keys/base.rb

@@ -114,6 +114,7 @@ module ActiveRecord
       end
 
       def ==(comparison_object)
+        return false if !persisted? && comparison_object.object_id != object_id
         return true if equal? comparison_object
         ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| !id.nil?} : super(comparison_object)
       end

data/lib/composite_primary_keys/nested_attributes.rb

@@ -31,7 +31,7 @@ module ActiveRecord
                                eq_predicates = association.klass.primary_key.zip(ids).map do |primary_key, value|
                                  association.klass.arel_table[primary_key].eq(value)
                                end
-                               association.scoped.where(*eq_predicates).to_a
+                               association.scope.where(*eq_predicates).to_a
                              else
                                []
                              end

data/lib/composite_primary_keys/relation.rb

@@ -81,7 +81,7 @@ module ActiveRecord
       end
     end
 
-    def update_record(values, id, id_was)
+    def _update_record(values, id, id_was)
       substitutes, binds = substitute_values values
 
       # CPK

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -3,9 +3,8 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 # To make debugging easier, test within this source tree versus an installed gem
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'composite_primary_keys'
-
-require 'active_support/test_case'
 require 'minitest/autorun'
+require 'active_support/test_case'
 
 # Now load the connection spec
 require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")

data/test/fixtures/membership_statuses.yml

@@ -8,4 +8,10 @@ drnic-cpk:
   id: 2
   user_id: 2
   group_id: 1
-  status: Owner
+  status: Owner
+
+cfis-cpk:
+  id: 3
+  user_id: 3
+  group_id: 2
+  status: Active

data/test/fixtures/memberships.yml

@@ -4,4 +4,8 @@ santiago-cpk:
 
 drnic-cpk:
   user_id: 2
-  group_id: 1
+  group_id: 1
+
+cfis-cpk:
+  user_id: 3
+  group_id: 2

data/test/fixtures/users.yml

@@ -4,4 +4,8 @@ santiago:
   
 drnic:
   id: 2
-  name: Dr Nic
+  name: Dr Nic
+
+cfis:
+  id: 3
+  name: cfis

data/test/test_associations.rb

@@ -255,8 +255,9 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_has_many_with_primary_key_with_associations
     memberships = Membership.includes(:statuses).where("membership_statuses.status = ?", 'Active').references(:membership_statuses)
-    assert_equal(1, memberships.length)
+    assert_equal(2, memberships.length)
     assert_equal([1,1], memberships[0].id)
+    assert_equal([3,2], memberships[1].id)
   end
 
   def test_limitable_reflections

data/test/test_callbacks.rb

@@ -1,77 +1,99 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestUpdate < ActiveSupport::TestCase
-  fixtures :suburbs
-
-  def setup
-    @@callbacks = OpenStruct.new
-  end
-
-   Suburb.class_eval do
-    before_create do
-      @@callbacks.before_create = true
-    end
-    
-    after_create do
-      @@callbacks.after_create = true
-    end
-    
-    around_create do |suburb, block|
-      @@callbacks.around_create = true
-      block.call
-    end
-
-    before_save do
-      @@callbacks.before_save = true
-    end
-
-    after_save do
-      @@callbacks.after_save = true
-    end
-
-    around_save do |suburb, block|
-      @@callbacks.around_save = true
-      block.call
-    end
-
-    before_update do
-      @@callbacks.before_update = true
-    end
-
-    after_update do
-      @@callbacks.after_update = true
-    end
-
-    around_update do |suburb, block|
-      @@callbacks.around_update = true
-      block.call
-    end
-  end
-
-  def test_create
-    suburb = Suburb.new(:city_id => 3, :suburb_id => 3, :name => 'created')
-    suburb.save!
-
-    assert(@@callbacks.before_save)
-    assert(@@callbacks.after_save)
-    assert(@@callbacks.around_save)
-
-    assert(@@callbacks.before_create)
-    assert(@@callbacks.after_create)
-    assert(@@callbacks.around_create)
-  end
-
-  def test_update
-    suburb = suburbs(:first)
-    suburb.name = 'Updated'
-    suburb.save
-
-    assert(@@callbacks.before_update)
-    assert(@@callbacks.after_update)
-    assert(@@callbacks.around_update)
-
-    assert(@@callbacks.before_save)
-    assert(@@callbacks.after_save)
-    assert(@@callbacks.around_save)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCallbacks < ActiveSupport::TestCase
+  fixtures :suburbs
+
+  def setup
+    @@callbacks = OpenStruct.new
+
+    Suburb.class_eval do
+      before_create do
+        @@callbacks.before_create = true
+      end
+
+      after_create do
+        @@callbacks.after_create = true
+      end
+
+      around_create do |suburb, block|
+        @@callbacks.around_create = true
+        block.call
+      end
+
+      before_save do
+        @@callbacks.before_save = true
+      end
+
+      after_save do
+        @@callbacks.after_save = true
+      end
+
+      around_save do |suburb, block|
+        @@callbacks.around_save = true
+        block.call
+      end
+
+      before_update do
+        @@callbacks.before_update = true
+      end
+
+      after_update do
+        @@callbacks.after_update = true
+      end
+
+      around_update do |suburb, block|
+        @@callbacks.around_update = true
+        block.call
+      end
+    end
+  end
+
+  def teardown
+    Suburb.reset_callbacks(:create)
+    Suburb.reset_callbacks(:save)
+    Suburb.reset_callbacks(:update)
+  end
+
+  def test_create
+    refute(@@callbacks.before_save)
+    refute(@@callbacks.after_save)
+    refute(@@callbacks.around_save)
+
+    refute(@@callbacks.before_create)
+    refute(@@callbacks.after_create)
+    refute(@@callbacks.around_create)
+
+    suburb = Suburb.new(:city_id => 3, :suburb_id => 3, :name => 'created')
+    suburb.save!
+
+    assert(@@callbacks.before_save)
+    assert(@@callbacks.after_save)
+    assert(@@callbacks.around_save)
+
+    assert(@@callbacks.before_create)
+    assert(@@callbacks.after_create)
+    assert(@@callbacks.around_create)
+  end
+
+  def test_update
+    refute(@@callbacks.before_save)
+    refute(@@callbacks.after_save)
+    refute(@@callbacks.around_save)
+
+    refute(@@callbacks.before_create)
+    refute(@@callbacks.after_create)
+    refute(@@callbacks.around_create)
+
+    suburb = suburbs(:first)
+    suburb.name = 'Updated'
+    suburb.save
+
+    assert(@@callbacks.before_update)
+    assert(@@callbacks.after_update)
+    assert(@@callbacks.around_update)
+
+    assert(@@callbacks.before_save)
+    assert(@@callbacks.after_save)
+    assert(@@callbacks.around_save)
+  end
+end

data/test/test_suite.rb

@@ -1,8 +1,10 @@
 %w(
+  test_aliases
   test_associations
   test_attribute_methods
   test_attributes
   test_calculations
+  test_callbacks
   test_composite_arrays
   test_create
   test_delete
@@ -13,11 +15,13 @@
   test_habtm
   test_ids
   test_miscellaneous
+  test_nested_attributes
   test_pagination
   test_polymorphic
   test_predicates
   test_santiago
   test_serialize
+  test_touch
   test_tutorial_example
   test_update
   test_validations

data/test/test_touch.rb

@@ -11,8 +11,8 @@ class TestTouch < ActiveSupport::TestCase
     previously_updated_at = tariff.updated_at
 
     tariff.amount         = previous_amount + 1
+    sleep 1.0 # we need to sleep for 1 second because the times updated (on mysql, at least) are only precise to 1 second.
     tariff.touch
-    sleep 0.1
     assert_not_equal previously_updated_at, tariff.updated_at
     assert_equal previous_amount + 1, tariff.amount
     assert tariff.amount_changed?, 'tarif amount should have changed'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.4
 description: Composite key support for ActiveRecord
 email: 
 executables: []