composite_primary_keys 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67949f62c5795509a482f74ac109193f0d6e294a
-  data.tar.gz: 1705dca290c512bd57401db0d61cc58e2c13d6d1
+  metadata.gz: 1a95b00436decb1d0c5da9fc42f706be34aaf6dc
+  data.tar.gz: 08b6d26c4d0e136b577c59394becfc82af3b0a21
 SHA512:
-  metadata.gz: ebead783540875cd89cfefce57b3113b85d76295753d4029f54c5b866598a6a5961d1f0bb247fff7279716b1e9989bea4607c1be247e884b662ec934adcd08ef
-  data.tar.gz: 563cf8163a7526483b14018b4438134c7ca4cbac0b1868003d864d7f55348f61e686c472afed787db5ef8aed0377ee886a09d7167caf3a8623025ef21b106532
+  metadata.gz: 1e02f25ffa1220a27361433d224c07f584ec130dc7cb2dfbf1f542e903486d80dec239555b62a96a96a3375eec45fa82bf9810374700d40184075aeb7ddd30b0
+  data.tar.gz: a5d9c69b6eccada21cfed579bcd2bd9a4f6ea1987a9bb3cf4c43700c31a4859d24fb0514d8b27d8d46d00cd6ccc79b59dd89e5568bb8646953051810ecd4ef3e

data/History.rdoc

@@ -1,3 +1,8 @@
+== 7.0.2 (2014-06-01)
+
+* Fix id_was when one of the column names is called id (Adrian Hooper)
+* Fix queries that use ActiveRecord objects in the where clause (Adrian Hooper)
+
 == 7.0.1 (2014-05-27)
 
 * Fix setting of timestamps automatically by Rails (Charlie Savage)

data/README.rdoc

@@ -71,6 +71,13 @@ Now we want to be able to find instances using the same syntax we always use for
 
 Notice the use of an array to specify the composite key values.
 
+NOTE - API CHANGE.  CPK Version 6.x and earlier used to allow composite keys to be listed out
+like this:
+
+  Membership.find(1,1)
+
+This usage is no longer supported.
+
 == Databases
 
 CPK supports the following databases:

data/lib/composite_primary_keys.rb

@@ -64,6 +64,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/relation/batches'
 require 'active_record/relation/calculations'
 require 'active_record/relation/finder_methods'
+require 'active_record/relation/predicate_builder'
 require 'active_record/relation/query_methods'
 
 require 'active_record/validations/uniqueness'
@@ -104,6 +105,7 @@ require 'composite_primary_keys/connection_adapters/abstract/connection_specific
 require 'composite_primary_keys/relation/batches'
 require 'composite_primary_keys/relation/calculations'
 require 'composite_primary_keys/relation/finder_methods'
+require 'composite_primary_keys/relation/predicate_builder'
 require 'composite_primary_keys/relation/query_methods'
 
 require 'composite_primary_keys/validations/uniqueness'

data/lib/composite_primary_keys/active_model/dirty.rb

@@ -3,8 +3,8 @@ module ActiveModel
     def attribute_was(attr)
       # CPK
       if self.composite? && attr == "id"
-        self.class.primary_keys.map do |attr|
-          attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr)
+        self.class.primary_keys.map do |key_attr|
+          attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
         end
       else
         attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr)

data/lib/composite_primary_keys/composite_predicates.rb

@@ -9,9 +9,12 @@ module CompositePrimaryKeys
     end
 
     def cpk_or_predicate(predicates)
-      ::Arel::Nodes::Grouping.new(predicates.inject { |memo,node|
+      or_predicate = predicates.map do |predicate|
+        ::Arel::Nodes::Grouping.new(predicate)
+      end.inject do |memo, node|
         ::Arel::Nodes::Or.new(memo, node)
-      })
+      end
+      ::Arel::Nodes::Grouping.new(or_predicate)
     end
 
     def cpk_id_predicate(table, keys, values)
@@ -45,6 +48,4 @@ ActiveRecord::Associations::JoinDependency::JoinAssociation.send(:include, Compo
 ActiveRecord::Associations::Preloader::Association.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::Associations::HasManyThroughAssociation.send(:include, CompositePrimaryKeys::Predicates)
 ActiveRecord::Relation.send(:include, CompositePrimaryKeys::Predicates)
-
-
-
+ActiveRecord::PredicateBuilder.send(:extend, CompositePrimaryKeys::Predicates)

data/lib/composite_primary_keys/relation.rb

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

data/lib/composite_primary_keys/relation/predicate_builder.rb

@@ -0,0 +1,22 @@
+module ActiveRecord
+  class PredicateBuilder
+    def self.expand(klass, table, column, value)
+      queries = []
+      if klass && reflection = klass.reflect_on_association(column.to_sym)
+        if reflection.polymorphic? && base_class = polymorphic_base_class_from_value(value)
+          queries << build(table[reflection.foreign_type], base_class)
+        end
+
+        column = reflection.foreign_key
+      end
+
+      #CPK
+      if Base === value && value.composite?
+        queries << cpk_id_predicate(table, column, value.id)
+      else
+        queries << build(table[column], value)
+      end
+      queries
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/membership.rb

@@ -1,5 +1,4 @@
 class Membership < ActiveRecord::Base
-  # self.primary_keys = *keys - turns on composite key functionality
   self.primary_keys = :user_id, :group_id
   belongs_to :user
 	belongs_to :group

data/test/test_callbacks.rb

@@ -0,0 +1,77 @@
+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

data/test/test_find.rb

@@ -85,4 +85,10 @@ class TestFind < ActiveSupport::TestCase
       assert_equal(Department.count, batch.size)
     end
   end
+
+  def test_expand
+    department = departments(:engineering)
+    employees = Employee.where(:department => department)
+    assert_equal(2, employees.count)
+  end
 end

data/test/test_predicates.rb

@@ -16,7 +16,7 @@ class TestEqual < ActiveSupport::TestCase
 
     connection = ActiveRecord::Base.connection
     quoted = "#{connection.quote_table_name('departments')}.#{connection.quote_column_name('id')}"
-    expected = "(#{quoted} = 0 OR #{quoted} = 1 OR #{quoted} = 2)"
+    expected = "((#{quoted} = 0) OR (#{quoted} = 1) OR (#{quoted} = 2))"
 
     pred = cpk_or_predicate(predicates)
     assert_equal(with_quoted_identifiers(expected), pred.to_sql)

data/test/test_update.rb

@@ -62,9 +62,9 @@ class TestUpdate < ActiveSupport::TestCase
 
   def test_update_all
     assert_nothing_raised do
-      refrence_code = ReferenceCode.create
-      primary_key = refrence_code.class.primary_key
-      ReferenceCode.where(primary_key => refrence_code[primary_key]).
+      reference_code = ReferenceCode.create
+      primary_key = reference_code.class.primary_key
+      ReferenceCode.where(primary_key => reference_code[primary_key]).
         update_all(description: 'random value')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -68,6 +68,7 @@ files:
 - lib/composite_primary_keys/relation/batches.rb
 - lib/composite_primary_keys/relation/calculations.rb
 - lib/composite_primary_keys/relation/finder_methods.rb
+- lib/composite_primary_keys/relation/predicate_builder.rb
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/sanitization.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
@@ -167,6 +168,7 @@ files:
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
 - test/test_calculations.rb
+- test/test_callbacks.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb
@@ -190,7 +192,8 @@ files:
 - test/test_update.rb
 - test/test_validations.rb
 homepage: https://github.com/composite-primary-keys/composite_primary_keys
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -207,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: compositekeys
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
@@ -222,6 +225,7 @@ test_files:
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
 - test/test_calculations.rb
+- test/test_callbacks.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb