composite_primary_keys 3.1.11 → 4.0.0.beta1

data/test/{test_clone.rb → test_dup.rb}

@@ -18,14 +18,17 @@ class TestClone < ActiveSupport::TestCase
     self.class.classes = CLASSES
   end
   
-  def test_truth
+  def test_dup
     testing_with do
-      clone = @first.clone
-      assert_equal @first.attributes.block(@klass.primary_key), clone.attributes
+      clone = @first.dup
+      assert_equal(@first.attributes.block(@klass.primary_key), clone.attributes)
+
       if composite?
-        @klass.primary_key.each {|key| assert_nil clone[key], "Primary key '#{key}' should be nil"} 
+        @klass.primary_key.each do |key|
+          assert_nil(clone[key], "Primary key '#{key}' should be nil")
+        end
       else
-        assert_nil clone[@klass.primary_key], "Sole primary key should be nil"
+        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
       end
     end
   end

data/test/test_exists.rb

@@ -3,21 +3,33 @@ require 'abstract_unit'
 class TestExists < ActiveSupport::TestCase
   fixtures :articles, :departments
   
-  def test_single_key_exists_giving_id
-    assert Article.exists?(1)
+  def test_id
+    assert(Article.exists?(1))
+    assert(!Article.exists?(-1))
   end
 
-  def test_single_key_exists_giving_condition
-    assert Article.exists?(['name = ?', 'Article One'])
+  def test_array
+    assert(Article.exists?(['name = ?', 'Article One']))
+    assert(!Article.exists?(['name = ?', 'Article -1']))
   end
 
-  def test_composite_key_exists_giving_ids_as_array
-    assert Department.exists?([1,1])
-    assert_equal(false, Department.exists?([1111,1111]))
+  def test_hash
+    assert(Article.exists?('name' => 'Article One'))
+    assert(!Article.exists?('name' => 'Article -1'))
   end
 
-  def test_composite_key_exists_giving_ids_as_condition
-    assert Department.exists?(['department_id = ? and location_id = ?', 1, 1])
-    assert_equal(false, Department.exists?(['department_id = ? and location_id = ?', 11111, 11111]))
+  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
 end

data/test/test_habtm.rb

@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'ruby-debug'
 
 class TestHabtm < ActiveSupport::TestCase
 
@@ -13,48 +12,6 @@ class TestHabtm < ActiveSupport::TestCase
     assert_equal 2, @restaurant.suburbs.size
   end
 
-  def test_include_cpk_both_sides
-    # assuming the association was set up in the fixtures
-    # file restaurants_suburbs.yml
-    mcdonalds = restaurants(:mcdonalds)
-    # check positive
-    suburb = mcdonalds.suburbs[0]
-    assert mcdonalds.suburbs.include?(suburb)
-    # check negative
-    suburb_with_no_mcdonalds = suburbs(:no_mcdonalds)
-    assert !mcdonalds.suburbs.include?(suburb_with_no_mcdonalds)
-  end
-
-  def test_include_cpk_owner_side_only
-    subway = restaurants(:subway_one)
-    product = products(:first_product)
-    subway.products << product
-
-    # reload
-    # test positive
-    subway = restaurants(:subway_one)
-    assert subway.products.include?(product)
-
-    # test negative
-    product_two = products(:second_product)
-    assert !subway.products.include?(product_two)
-  end
-
-  def test_include_cpk_association_side_only
-    product = products(:first_product)
-    subway = restaurants(:subway_one)
-    product.restaurants << subway
-    
-    # reload
-    # test positive
-    product = products(:first_product)
-    assert product.restaurants.include?(subway)
-
-    # test negative
-    mcdonalds = restaurants(:mcdonalds)
-    assert !product.restaurants.include?(mcdonalds)
-  end
-
   def test_habtm_clear_cpk_both_sides
     @restaurant = restaurants(:mcdonalds)
     assert_equal 2, @restaurant.suburbs.size
@@ -69,8 +26,6 @@ class TestHabtm < ActiveSupport::TestCase
     subway.products << first_product << second_product
     assert_equal 2, subway.products.size
     subway.products.clear
-    # reload to force reload of associations
-    subway = restaurants(:subway_one)
     assert_equal 0, subway.products.size
   end
 
@@ -81,36 +36,7 @@ class TestHabtm < ActiveSupport::TestCase
     product.restaurants << subway_one << subway_two
     assert_equal 2, product.restaurants.size
     product.restaurants.clear
-    # reload to force reload of associations
-    product = products(:first_product)
     assert_equal 0, product.restaurants.size
   end
 
-  # tests case reported in issue #39 where a bug resulted in
-  # deletion of incorrect join table records because the owner's id
-  # was assumed to be an array and is not in this case
-  # and evaluates to a useable but incorrect value
-  def test_habtm_clear_cpk_association_side_only_deletes_only_correct_records
-    product_one = Product.find(1)
-    product_three = Product.find(3)
-    subway_one = restaurants(:subway_one)
-    subway_two = restaurants(:subway_two)
-    product_one.restaurants << subway_one << subway_two
-    product_three.restaurants << subway_one << subway_two
-    assert_equal 2, product_one.restaurants.size
-    assert_equal 2, product_three.restaurants.size
-
-    # if product_three's id is incorrectly assumed to be
-    # an array it will be evaluated as 3[0], which is 1, which would
-    # delete product_one's associations rather than product_three's
-    product_three.restaurants.clear
-    
-    # reload to force reload of associations
-    product_one = Product.find(1)
-    product_three = Product.find(3)
-    
-    assert_equal 0, product_three.restaurants.size
-    assert_equal 2, product_one.restaurants.size
-  end
-
 end

data/test/test_ids.rb

@@ -71,7 +71,8 @@ class TestIds < ActiveSupport::TestCase
         assert_not_nil @klass.primary_keys
         assert_equal @primary_keys.map {|key| key.to_sym}, @klass.primary_keys
         assert_equal @klass.primary_keys, @klass.primary_key
-        assert_equal @primary_keys.map {|key| key.to_sym}.to_s, @klass.primary_key.to_s
+        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
+        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
       else
         assert_not_nil @klass.primary_key
         assert_equal @primary_keys.first, @klass.primary_key.to_sym

data/test/test_miscellaneous.rb

@@ -31,7 +31,7 @@ class TestMiscellaneous < ActiveSupport::TestCase
   end
   
   def test_count
-    assert_equal 3, Product.count
+    assert_equal 2, Product.count
   end
   
-end
+end

data/test/test_polymorphic.rb

@@ -21,6 +21,6 @@ class TestPolymorphic < ActiveSupport::TestCase
 
   def test_polymorphic_has_many_through
     user = users(:santiago)
-    assert_equal ['andrew'], user.hacks.collect { |a| a.name }.sort
+    assert_equal(['andrew'], user.hacks.collect { |a| a.name }.sort)
   end
 end

data/test/test_suite.rb

@@ -3,10 +3,10 @@ require 'test/unit'
 require 'test_associations'
 require 'test_attribute_methods'
 require 'test_attributes'
-require 'test_clone'
 require 'test_composite_arrays'
 require 'test_create'
 require 'test_delete'
+require 'test_dup'
 require 'test_equal'
 require 'test_exists'
 require 'test_find'

data/test/test_update.rb

@@ -28,10 +28,10 @@ class TestUpdate < ActiveSupport::TestCase
   
   def test_update_attributes
     testing_with do
-      assert @first.update_attributes(@klass_info[:update])
-      assert @first.reload
+      assert(@first.update_attributes(@klass_info[:update]))
+      assert(@first.reload)
       @klass_info[:update].each_pair do |attr_name, new_value|
-        assert_equal new_value, @first[attr_name], "Attribute #{attr_name} is incorrect"
+        assert_equal(new_value, @first[attr_name])
       end
     end
   end

metadata

@@ -1,62 +1,53 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: composite_primary_keys
-version: !ruby/object:Gem::Version
-  version: 3.1.11
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 62196257
+  prerelease: 6
+  segments: 
+  - 4
+  - 0
+  - 0
+  - beta
+  - 1
+  version: 4.0.0.beta1
 platform: ruby
-authors:
+authors: 
 - Dr Nic Williams
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-06-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.5
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15424103
+        segments: 
+        - 3
+        - 1
+        - 0
+        - rc
+        - 1
+        version: 3.1.0.rc1
+  type: :runtime
+  version_requirements: *id001
 description: Composite key support for ActiveRecord 3
-email:
+email: 
 - drnicwilliams@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - Rakefile
 - History.txt
 - README.txt
@@ -64,34 +55,31 @@ files:
 - init.rb
 - install.rb
 - loader.rb
-- lib/composite_primary_keys/associations/association_proxy.rb
+- lib/composite_primary_keys/associations/association.rb
+- lib/composite_primary_keys/associations/association_scope.rb
 - lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
-- lib/composite_primary_keys/associations/has_one_association.rb
-- lib/composite_primary_keys/associations/through_association_scope.rb
-- lib/composite_primary_keys/associations.rb
-- lib/composite_primary_keys/association_preload.rb
-- lib/composite_primary_keys/attribute_methods.rb
+- lib/composite_primary_keys/associations/join_dependency/join_association.rb
+- lib/composite_primary_keys/associations/join_dependency/join_part.rb
+- lib/composite_primary_keys/associations/preloader/association.rb
+- lib/composite_primary_keys/associations/preloader/belongs_to.rb
+- lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
+- lib/composite_primary_keys/attribute_methods/dirty.rb
+- lib/composite_primary_keys/attribute_methods/read.rb
+- lib/composite_primary_keys/attribute_methods/write.rb
 - lib/composite_primary_keys/base.rb
-- lib/composite_primary_keys/calculations.rb
 - lib/composite_primary_keys/composite_arrays.rb
+- lib/composite_primary_keys/composite_predicates.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
-- lib/composite_primary_keys/connection_adapters/ibm_db_adapter.rb
-- lib/composite_primary_keys/connection_adapters/oracle_adapter.rb
-- lib/composite_primary_keys/connection_adapters/oracle_enhanced_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
-- lib/composite_primary_keys/connection_adapters/sqlite3_adapter.rb
-- lib/composite_primary_keys/finder_methods.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/persistence.rb
-- lib/composite_primary_keys/primary_key.rb
-- lib/composite_primary_keys/query_methods.rb
-- lib/composite_primary_keys/read.rb
-- lib/composite_primary_keys/reflection.rb
+- lib/composite_primary_keys/relation/calculations.rb
+- lib/composite_primary_keys/relation/finder_methods.rb
+- lib/composite_primary_keys/relation/query_methods.rb
 - lib/composite_primary_keys/relation.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
-- lib/composite_primary_keys/write.rb
 - lib/composite_primary_keys.rb
 - scripts/console.rb
 - scripts/txt2html
@@ -181,10 +169,10 @@ files:
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
-- test/test_clone.rb
 - test/test_composite_arrays.rb
 - test/test_create.rb
 - test/test_delete.rb
+- test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -200,29 +188,42 @@ files:
 - test/test_validations.rb
 homepage: http://github.com/cfis/composite_primary_keys
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: compositekeys
-rubygems_version: 1.8.24
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
-test_files:
+test_files: 
 - test/abstract_unit.rb
 - test/db_test.rb
 - test/debug.log
@@ -232,10 +233,10 @@ test_files:
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
-- test/test_clone.rb
 - test/test_composite_arrays.rb
 - test/test_create.rb
 - test/test_delete.rb
+- test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb