composite_primary_keys 7.0.11 → 7.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4146bd7f227eed41c3dbfeb8cd6e397789839531
-  data.tar.gz: 523601026d76d779cc5b96e216fb04adb562c0a1
+  metadata.gz: 65cb7db711192f8ae6b531e8c5cc5fa316554806
+  data.tar.gz: ce079278064acfc94b691592c804047c6b0a4dd5
 SHA512:
-  metadata.gz: feb2446749e8f8872a7073a1ba9d6409071e963cf46ea84d7b3bf8abd922ec580320b99cb33459694d56d4d57d74568a9f13ddb9b2f6e2eda7eb7e9c12a6ef6c
-  data.tar.gz: b842f5f95e23cae95d0af45bb315355542f6601d9407f745db47ac7a15d8315ebcc5a52506e380395a69e45183183f5f8b6191014e5c980f5643b58ed99f2719
+  metadata.gz: f927ff29273325bc1034c2981382403fc568709f6f400db40e9d33c0933dc2016b222a9ae67cc85ad414b1e8b0e5186441ca534039f9c61c0bf35fe27c87c284
+  data.tar.gz: c0f88b9953c629c61b2bb001b0ff9375878c196b9b13f6d60e92705514ff04971b5a5ed4add442c55eebd169aded609f159d5a30ee0bd326a4b370f1d595a787

data/History.rdoc

@@ -1,3 +1,9 @@
+== 7.0.12 (2014-11-09)
+
+* ActiveRecord 4.1.7 support (Tom Hughes)
+* Extract CPK methods to its own module and extending instead of opening the singleton class
+  which fixes Marshal#dump (Nicolás Hock Isaza)
+
 == 7.0.11 (2014-10-10)
 
 * ActiveRecord 4.1.6 support (Tom Hughes, Charlie Savage)

data/README.rdoc

@@ -84,6 +84,7 @@ CPK supports the following databases:
 
  * PostgreSQL
  * MySQL
+ * MariaDB
  * Oracle
  * DB2
  * SQLite

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>4.1.6'
+  gem 'activerecord', '~>4.1.7'
   require 'active_record'
 end
 
@@ -104,3 +104,5 @@ require 'composite_primary_keys/relation/predicate_builder'
 require 'composite_primary_keys/relation/query_methods'
 
 require 'composite_primary_keys/validations/uniqueness'
+
+require 'composite_primary_keys/composite_relation'

data/lib/composite_primary_keys/composite_relation.rb

@@ -0,0 +1,48 @@
+module CompositePrimaryKeys
+  module CompositeRelation
+    include CompositePrimaryKeys::ActiveRecord::Batches
+    include CompositePrimaryKeys::ActiveRecord::Calculations
+    include CompositePrimaryKeys::ActiveRecord::FinderMethods
+    include CompositePrimaryKeys::ActiveRecord::QueryMethods
+
+    def delete(id_or_array)
+      # CPK
+      if self.composite?
+        id_or_array = if id_or_array.is_a?(CompositePrimaryKeys::CompositeKeys)
+                        [id_or_array]
+                      else
+                        Array(id_or_array)
+                      end
+
+        id_or_array.each do |id|
+          # Is the passed in id actually a record?
+          id = id.kind_of?(::ActiveRecord::Base) ? id.id : id
+          where(cpk_id_predicate(table, self.primary_key, id)).delete_all
+        end
+      else
+        where(primary_key => id_or_array).delete_all
+      end
+    end
+
+    def destroy(id_or_array)
+      # Without CPK:
+      #if id.is_a?(Array)
+      #  id.map { |one_id| destroy(one_id) }
+      #else
+      #  find(id).destroy
+      #end
+
+      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
+        [id_or_array]
+      else
+        Array(id_or_array)
+      end
+
+      id_or_array.each do |id|
+        where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
+          record.destroy
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/nested_attributes.rb

@@ -1,5 +1,13 @@
 module ActiveRecord
   module NestedAttributes
+    def cpk_detect_record(id, records)
+      id_string = id.is_a?(Array) ? CompositePrimaryKeys::CompositeKeys.new(id).to_s : id.to_s
+
+      records.detect do |record|
+        record.id.to_s == id_string
+      end
+    end
+
     def assign_nested_attributes_for_collection_association(association_name, attributes_collection)
       options = self.nested_attributes_options[association_name]
 
@@ -48,12 +56,12 @@ module ActiveRecord
           unless reject_new_record?(association_name, attributes)
             association.build(attributes.except(*UNASSIGNABLE_KEYS))
           end
-        elsif existing_record = existing_records.detect { |record| record.id.to_s == attributes['id'].to_s }
+        elsif existing_record = cpk_detect_record(attributes['id'], existing_records)
           unless call_reject_if(association_name, attributes)
             # Make sure we are operating on the actual object which is in the association's
             # proxy_target array (either by finding it, or adding it if not found)
             # Take into account that the proxy_target may have changed due to callbacks
-            target_record = association.target.detect { |record| record.id.to_s == attributes['id'].to_s }
+            target_record = cpk_detect_record(attributes['id'], association.target)
             if target_record
               existing_record = target_record
             else

data/lib/composite_primary_keys/relation.rb

@@ -4,7 +4,6 @@ module ActiveRecord
     def initialize(klass, table, values = {})
       initialize_without_cpk(klass, table, values)
       add_cpk_support if klass && klass.composite?
-      add_cpk_where_values_hash
     end
 
     alias :initialize_copy_without_cpk :initialize_copy
@@ -14,75 +13,27 @@ module ActiveRecord
     end
 
     def add_cpk_support
-      class << self
-        include CompositePrimaryKeys::ActiveRecord::Batches
-        include CompositePrimaryKeys::ActiveRecord::Calculations
-        include CompositePrimaryKeys::ActiveRecord::FinderMethods
-        include CompositePrimaryKeys::ActiveRecord::QueryMethods
-
-        def delete(id_or_array)
-          # CPK
-          if self.composite?
-            id_or_array = if id_or_array.is_a?(CompositePrimaryKeys::CompositeKeys)
-                            [id_or_array]
-                          else
-                            Array(id_or_array)
-                          end
-
-            id_or_array.each do |id|
-              # Is the passed in id actually a record?
-              id = id.kind_of?(ActiveRecord::Base) ? id.id : id
-              where(cpk_id_predicate(table, self.primary_key, id)).delete_all
-            end
-          else
-            where(primary_key => id_or_array).delete_all
-          end
-        end
-
-        def destroy(id_or_array)
-          # Without CPK:
-          #if id.is_a?(Array)
-          #  id.map { |one_id| destroy(one_id) }
-          #else
-          #  find(id).destroy
-          #end
-
-          id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-            [id_or_array]
-          else
-            Array(id_or_array)
-          end
-
-          id_or_array.each do |id|
-            where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
-              record.destroy
-            end
-          end
-        end
-      end
+      extend CompositePrimaryKeys::CompositeRelation
     end
 
-    def add_cpk_where_values_hash
-      class << self
-        def where_values_hash(relation_table_name = table_name)
-          # CPK adds this so that it finds the Equality nodes beneath the And node:
-          #equalities = where_values.grep(Arel::Nodes::Equality).find_all { |node|
-          #  node.left.relation.name == table_name
-          # }
-          nodes_from_and = where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
+    # CPK adds this so that it finds the Equality nodes beneath the And node:
+    # equalities = where_values.grep(Arel::Nodes::Equality).find_all { |node|
+    #  node.left.relation.name == table_name
+    # }
+    alias :where_values_hash_without_cpk :where_values_hash
+    def where_values_hash(relation_table_name = table_name)
+      nodes_from_and = where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
 
-          equalities = (nodes_from_and + where_values.grep(Arel::Nodes::Equality)).find_all { |node|
-            node.left.relation.name == relation_table_name
-          }
+      equalities = (nodes_from_and + where_values.grep(Arel::Nodes::Equality)).find_all { |node|
+        node.left.relation.name == relation_table_name
+      }
 
-          binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
+      binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]
 
-          Hash[equalities.map { |where|
-            name = where.left.name
-            [name, binds.fetch(name.to_s) { where.right }]
-          }]
-        end
-      end
+      Hash[equalities.map { |where|
+        name = where.left.name
+        [name, binds.fetch(name.to_s) { where.right }]
+      }]
     end
 
     def _update_record(values, id, id_was)

data/lib/composite_primary_keys/version.rb

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

data/test/test_attribute_methods.rb

@@ -51,5 +51,13 @@ class TestAttributeMethods < ActiveSupport::TestCase
     assert_equal([1,1], ref_code.to_key)
   end
 
-
+  def test_id_was
+    rt = ReferenceType.find(1)
+    rt.id = 2
+    assert_equal 1, rt.id_was
+    
+    ref_code = ReferenceCode.find([1, 1])
+    ref_code.id = [1,2]
+    assert_equal [1,1], ref_code.id_was
+  end
 end

data/test/test_delete.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestDelete < ActiveSupport::TestCase
-  fixtures :departments, :employees, :products, :product_tariffs,
+  fixtures :articles, :departments, :employees, :products, :tariffs, :product_tariffs,
            :reference_types, :reference_codes
   
   CLASSES = {

data/test/test_delete_all.rb

@@ -13,10 +13,9 @@ class TestValidations < ActiveSupport::TestCase
     EmployeesGroup.create(employee_id: 3, group_id: 103)
 
     assert_equal(EmployeesGroup.all.size, 3)
-    exception = assert_raises(ActiveRecord::StatementInvalid) {
+    assert_raises(ActiveRecord::StatementInvalid) {
       EmployeesGroup.where(employee_id: 1).first.destroy
     }
-    assert_match(/Unknown column 'employees_groups.' in 'where clause/, exception.message)
     assert(EmployeesGroup.all.size == 3)
   end
 end

data/test/test_dumpable.rb

@@ -0,0 +1,15 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestDumpable < ActiveSupport::TestCase
+  fixtures :articles, :readings, :users
+
+  def test_marshal_with_simple_preload
+    articles = Article.preload(:readings).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+
+  def test_marshal_with_comples_preload
+    articles = Article.preload({ readings: :user }).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+end

data/test/test_suite.rb

@@ -8,7 +8,10 @@
   test_composite_arrays
   test_create
   test_delete
+  test_delete_all
+  test_dumpable
   test_dup
+  test_enum
   test_equal
   test_exists
   test_find

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.11
+  version: 7.0.12
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 4.1.7
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -34,8 +34,6 @@ files:
 - README.rdoc
 - README_DB2.rdoc
 - Rakefile
-- init.rb
-- install.rb
 - lib/composite_primary_keys.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
@@ -55,6 +53,7 @@ files:
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
+- lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
@@ -73,7 +72,6 @@ files:
 - lib/composite_primary_keys/sanitization.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
-- loader.rb
 - scripts/console.rb
 - scripts/txt2html
 - scripts/txt2js
@@ -176,6 +174,7 @@ files:
 - test/test_create.rb
 - test/test_delete.rb
 - test/test_delete_all.rb
+- test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_enum.rb
 - test/test_equal.rb
@@ -235,6 +234,7 @@ test_files:
 - test/test_create.rb
 - test/test_delete.rb
 - test/test_delete_all.rb
+- test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_enum.rb
 - test/test_equal.rb

data/init.rb

@@ -1,2 +0,0 @@
-# Include hook code here
-require_dependency 'composite_primary_keys'

data/install.rb

@@ -1,30 +0,0 @@
-require 'rbconfig'
-require 'find'
-require 'ftools'
-
-include Config
-
-# this was adapted from rdoc's install.rb by ways of Log4r
-
-$sitedir = CONFIG["sitelibdir"]
-unless $sitedir
-  version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
-  $libdir = File.join(CONFIG["libdir"], "ruby", version)
-  $sitedir = $:.find {|x| x =~ /site_ruby/ }
-  if !$sitedir
-    $sitedir = File.join($libdir, "site_ruby")
-  elsif $sitedir !~ Regexp.quote(version)
-    $sitedir = File.join($sitedir, version)
-  end
-end
-
-# the acual gruntwork
-Dir.chdir("lib")
-
-Find.find("composite_primary_keys", "composite_primary_keys.rb") { |f|
-  if f[-3..-1] == ".rb"
-    File::install(f, File.join($sitedir, *f.split(/\//)), 0644, true)
-  else
-    File::makedirs(File.join($sitedir, *f.split(/\//)))
-  end
-}

data/loader.rb

@@ -1,24 +0,0 @@
-# Load local config files in /local
-begin
-  local_file_supported = Dir[File.join(PROJECT_ROOT, 'local/*.sample')].map { |path| File.basename(path).sub(".sample","") }
-  local_file_supported.each do |file|
-    require "local/#{file}"
-  end
-rescue LoadError
-  puts <<-EOS
-  This Gem supports local developer extensions in local/ folder. 
-  Supported files:
-    #{local_file_supported.map { |f| "local/#{f}"}.join(', ')}
-
-  Setup default sample files:
-    rake local:setup
-
-  Current warning: #{$!}
-  
-  EOS
-end
-
-
-# Now load Rake tasks from /tasks
-rakefiles = Dir[File.join(File.dirname(__FILE__), "tasks/**/*.rake")]
-rakefiles.each { |rakefile| load File.expand_path(rakefile) }