composite_primary_keys 10.0.5 → 11.0.0.beta1

data/test/test_exists.rb

@@ -1,40 +1,40 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestExists < ActiveSupport::TestCase
-  fixtures :articles, :departments, :capitols
-  
-  def test_id
-    assert(Article.exists?(1))
-    assert(!Article.exists?(-1))
-  end
-
-  def test_array
-    assert(Article.exists?(['name = ?', 'Article One']))
-    assert(!Article.exists?(['name = ?', 'Article -1']))
-  end
-
-  def test_hash
-    assert(Article.exists?('name' => 'Article One'))
-    assert(!Article.exists?('name' => 'Article -1'))
-  end
-
-  def test_cpk_id
-    assert(Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,1])))
-    assert(!Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,-1])))
-  end
-
-  def test_cpk_array_id
-    assert(Department.exists?([1,1]))
-    assert(!Department.exists?([1,-1]))
-  end
-
-  def test_cpk_array_condition
-    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
-    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
-  end
-
-  def test_cpk_array_string_id
-    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
-    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestExists < ActiveSupport::TestCase
+  fixtures :articles, :departments, :capitols
+  
+  def test_id
+    assert(Article.exists?(1))
+    assert(!Article.exists?(-1))
+  end
+
+  def test_array
+    assert(Article.exists?(['name = ?', 'Article One']))
+    assert(!Article.exists?(['name = ?', 'Article -1']))
+  end
+
+  def test_hash
+    assert(Article.exists?('name' => 'Article One'))
+    assert(!Article.exists?('name' => 'Article -1'))
+  end
+
+  def test_cpk_id
+    assert(Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,1])))
+    assert(!Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,-1])))
+  end
+
+  def test_cpk_array_id
+    assert(Department.exists?([1,1]))
+    assert(!Department.exists?([1,-1]))
+  end
+
+  def test_cpk_array_condition
+    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
+    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
+  end
+
+  def test_cpk_array_string_id
+    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
+    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
+  end
 end

data/test/test_find.rb

@@ -62,7 +62,7 @@ class TestFind < ActiveSupport::TestCase
       ReferenceCode.find(['999', '999'])
     end
 
-    expected = "Couldn't find all ReferenceCodes with 'reference_type_id,reference_code': (999, 999) (found 0 results, but was looking for 1)"
+    expected = "Couldn't find all ReferenceCodes with 'reference_type_id,reference_code': (999, 999) (found 0 results, but was looking for 1)."
     assert_equal(with_quoted_identifiers(expected), error.message)
   end
 

data/test/test_miscellaneous.rb

@@ -1,32 +1,32 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestMiscellaneous < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_composite_class
-    testing_with do
-      assert_equal composite?, @klass.composite?
-    end
-  end
-
-  def test_composite_instance
-    testing_with do
-      assert_equal composite?, @first.composite?
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestMiscellaneous < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_composite_class
+    testing_with do
+      assert_equal composite?, @klass.composite?
+    end
+  end
+
+  def test_composite_instance
+    testing_with do
+      assert_equal composite?, @first.composite?
+    end
+  end
+end

data/test/test_pagination.rb

@@ -1,36 +1,36 @@
-#require File.expand_path('../abstract_unit', __FILE__)
-#require 'plugins/pagination'
-#
-#class TestPagination < ActiveSupport::TestCase
-#  fixtures :reference_types, :reference_codes
-#
-#  include ActionController::Pagination
-#  DEFAULT_PAGE_SIZE = 2
-#
-#  attr_accessor :params
-#
-#  CLASSES = {
-#    :single => {
-#      :class => ReferenceType,
-#      :primary_keys => :reference_type_id,
-#      :table => :reference_types,
-#    },
-#    :dual   => {
-#      :class => ReferenceCode,
-#      :primary_keys => [:reference_type_id, :reference_code],
-#      :table => :reference_codes,
-#    },
-#  }
-#
-#  def setup
-#    self.class.classes = CLASSES
-#    @params = {}
-#  end
-#
-#  def test_paginate_all
-#    testing_with do
-#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
-#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
-#    end
-#  end
+#require File.expand_path('../abstract_unit', __FILE__)
+#require 'plugins/pagination'
+#
+#class TestPagination < ActiveSupport::TestCase
+#  fixtures :reference_types, :reference_codes
+#
+#  include ActionController::Pagination
+#  DEFAULT_PAGE_SIZE = 2
+#
+#  attr_accessor :params
+#
+#  CLASSES = {
+#    :single => {
+#      :class => ReferenceType,
+#      :primary_keys => :reference_type_id,
+#      :table => :reference_types,
+#    },
+#    :dual   => {
+#      :class => ReferenceCode,
+#      :primary_keys => [:reference_type_id, :reference_code],
+#      :table => :reference_codes,
+#    },
+#  }
+#
+#  def setup
+#    self.class.classes = CLASSES
+#    @params = {}
+#  end
+#
+#  def test_paginate_all
+#    testing_with do
+#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
+#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
+#    end
+#  end
 #end

data/test/test_preload.rb

@@ -91,11 +91,4 @@ class TestPreload < ActiveSupport::TestCase
     assert_equal(1, employees.first.groups_2.size)
     assert_equal(2, employees.second.groups_2.size)
   end
-
-  def test_preload_settings_inversion
-    users = User.preload(:readings).all
-    reading = users.first.readings.first
-
-    assert_equal(true, reading.association(:user).loaded?)
-  end
 end

data/test/test_validations.rb

@@ -1,13 +1,13 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestValidations < ActiveSupport::TestCase
-  fixtures :students, :dorms, :rooms, :room_assignments
-
-  def test_uniqueness_validation_persisted
-    room_assignment = RoomAssignment.find([1, 1, 1])
-    assert(room_assignment.valid?)
-
-    room_assignment = RoomAssignment.new(:student_id => 1, :dorm_id => 1, :room_id => 2)
-    assert(!room_assignment.valid?)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestValidations < ActiveSupport::TestCase
+  fixtures :students, :dorms, :rooms, :room_assignments
+
+  def test_uniqueness_validation_persisted
+    room_assignment = RoomAssignment.find([1, 1, 1])
+    assert(room_assignment.valid?)
+
+    room_assignment = RoomAssignment.new(:student_id => 1, :dorm_id => 1, :room_id => 2)
+    assert(!room_assignment.valid?)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 10.0.5
+  version: 11.0.0.beta1
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: 5.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.1.6
+        version: 5.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,18 +90,16 @@ files:
 - README.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
-- lib/composite_primary_keys/arel/in.rb
 - lib/composite_primary_keys/arel/sqlserver.rb
 - lib/composite_primary_keys/arel/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
 - lib/composite_primary_keys/associations/collection_association.rb
+- lib/composite_primary_keys/associations/foreign_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
 - lib/composite_primary_keys/associations/has_many_through_association.rb
 - lib/composite_primary_keys/associations/join_dependency.rb
-- lib/composite_primary_keys/associations/join_dependency/join_association.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
-- lib/composite_primary_keys/associations/preloader/belongs_to.rb
 - lib/composite_primary_keys/attribute_methods.rb
 - lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
@@ -127,11 +119,12 @@ files:
 - lib/composite_primary_keys/locking/optimistic.rb
 - lib/composite_primary_keys/nested_attributes.rb
 - lib/composite_primary_keys/persistence.rb
+- lib/composite_primary_keys/reflection.rb
 - lib/composite_primary_keys/relation.rb
 - 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/association_query_handler.rb
+- lib/composite_primary_keys/relation/predicate_builder/association_query_value.rb
 - lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation/where_clause.rb
 - lib/composite_primary_keys/sanitization.rb
@@ -273,12 +266,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord

data/lib/composite_primary_keys/arel/in.rb

@@ -1,6 +0,0 @@
-module CompositePrimaryKeys
-  module Nodes
-    class In < ::Arel::Nodes::Equality
-    end
-  end
-end

data/lib/composite_primary_keys/associations/join_dependency/join_association.rb

@@ -1,24 +0,0 @@
-module ActiveRecord
-  module Associations
-    class JoinDependency
-      class JoinAssociation
-        silence_warnings do
-          def build_constraint(klass, table, key, foreign_table, foreign_key)
-            # CPK
-            # constraint = table[key].eq(foreign_table[foreign_key])
-            constraint = cpk_join_predicate(table, key, foreign_table, foreign_key)
-
-            if klass.finder_needs_type_condition?
-              constraint = table.create_and([
-                constraint,
-                klass.send(:type_condition, table)
-              ])
-            end
-
-            constraint
-          end
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/associations/preloader/belongs_to.rb

@@ -1,19 +0,0 @@
-module ActiveRecord
-  module Associations
-    class Preloader
-      class BelongsTo
-        def records_for(ids)
-          # CPK
-          # scope.where(association_key.in(ids))
-
-          if association_key_name.is_a?(Array)
-            predicate = cpk_in_predicate(table, association_key_name, ids)
-            scope.where(predicate)
-          else
-            scope.where(association_key_name => ids)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/composite_primary_keys/relation/predicate_builder/association_query_handler.rb

@@ -1,33 +0,0 @@
-module ActiveRecord
-  class PredicateBuilder
-    class AssociationQueryHandler
-      def call(attribute, value)
-        queries = {}
-
-        table = value.associated_table
-        if value.base_class
-          queries[table.association_foreign_type.to_s] = value.base_class.name
-        end
-
-        # CPK
-        # queries[table.association_foreign_key.to_s] = value.ids
-        # predicate_builder.build_from_hash(queries)
-        if table.association_foreign_key.is_a?(Array)
-          values = case value.value
-                    when Relation
-                      value.ids.map {|record| record.ids}
-                    when Array
-                      value.ids
-                    else
-                      [value.ids]
-                    end
-
-          CompositePrimaryKeys::Predicates.cpk_in_predicate(attribute.relation, table.association_foreign_key, values)
-        else
-          queries[table.association_foreign_key.to_s] = value.ids
-          predicate_builder.build_from_hash(queries)
-        end
-      end
-    end
-  end
-end