composite_primary_keys 2.3.5.1 → 3.0.0.b2

data/test/test_attributes.rb

@@ -30,7 +30,7 @@ class TestAttributes < ActiveSupport::TestCase
       end
     end
   end
-    
+
   def test_brackets_primary_key
     testing_with do
       assert_equal @first.id, @first[@primary_keys], "[] failing for #{@klass}"
@@ -51,26 +51,22 @@ class TestAttributes < ActiveSupport::TestCase
     @flat = Tariff.find(1, Date.today.to_s(:db))
     @second_free = ProductTariff.find(2,2,Date.today.to_s(:db))
     @second_free_fk = [:tariff_id, :tariff_start_date]
+
     @second_free[key = @second_free_fk] = @flat.id
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-      assert_equal @flat.id, @second_free[key]
-    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids] = @flat.id.to_s
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
-    @second_free[key = @second_free_fk.to_composite_ids.to_s] = @flat.id.to_s
-      assert_equal @flat.id, @second_free[key]
-      compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+    assert_equal @flat.id, @second_free[key]
+
+    @second_free[key = @second_free_fk.to_composite_keys] = @flat.id
+    assert_equal @flat.id, @second_free[key]
+    compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
+
+    @second_free[key = @second_free_fk.to_composite_keys.to_s] = @flat.id
+    assert_equal @flat.id, @second_free[key]
+    compare_indexes('@flat', @flat.class.primary_key, '@second_free', @second_free_fk)
   end
-private
+  
+  private
+
   def compare_indexes(obj_name1, indexes1, obj_name2, indexes2)
     obj1, obj2 = eval "[#{obj_name1}, #{obj_name2}]"
     indexes1.length.times do |key_index|

data/test/test_composite_arrays.rb

@@ -24,28 +24,9 @@ class CompositeArraysTest < ActiveSupport::TestCase
     assert_equal '1,2,3', keys.to_s
   end
 
-  def test_new_ids
-    keys = CompositePrimaryKeys::CompositeIds.new
-    assert_not_nil keys
-    assert_equal '', keys.to_s
-    assert_equal '', "#{keys}"
-  end
-
-  def test_initialize_ids
-    keys = CompositePrimaryKeys::CompositeIds.new([1,2,3])
-    assert_not_nil keys
-    assert_equal '1,2,3', keys.to_s
-    assert_equal '1,2,3', "#{keys}"
-  end
-  
   def test_to_composite_ids
     keys = [1,2,3].to_composite_ids
-    assert_equal CompositePrimaryKeys::CompositeIds, keys.class
-    assert_equal '1,2,3', keys.to_s
-  end
-  
-  def test_flatten
-    keys = [CompositePrimaryKeys::CompositeIds.new([1,2,3]), CompositePrimaryKeys::CompositeIds.new([4,5,6])]
-    assert_equal 6, keys.flatten.size
+    assert_equal Array, keys.class
+    assert_equal '123', keys.to_s
   end
 end

data/test/test_create.rb

@@ -29,14 +29,14 @@ class TestCreate < ActiveSupport::TestCase
       assert_not_nil @klass_info[:create]
     end
   end
-  
+
   def test_create
     testing_with do
       assert new_obj = @klass.create(@klass_info[:create])
       assert !new_obj.new_record?
     end
   end
-  
+
   def test_create_no_id
     testing_with do
       begin
@@ -50,7 +50,7 @@ class TestCreate < ActiveSupport::TestCase
       assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
     end
   end
-  
+
   def test_create_on_association
     suburb = Suburb.find(:first)
     suburb.streets.create(:name => "my street")

data/test/test_delete.rb

@@ -24,14 +24,7 @@ class TestDelete < ActiveSupport::TestCase
   
   def test_destroy_one
     testing_with do
-      #assert @first.destroy
-      assert true
-    end
-  end
-  
-  def test_destroy_one_via_class
-    testing_with do
-      assert @klass.destroy(*@first.id)
+      assert @first.destroy
     end
   end
   
@@ -41,12 +34,6 @@ class TestDelete < ActiveSupport::TestCase
     end
   end
   
-  def test_delete_one
-    testing_with do
-      assert @klass.delete(*@first.id) if composite?
-    end
-  end
-  
   def test_delete_one_alone
     testing_with do
       assert @klass.delete(@first.id)
@@ -67,12 +54,12 @@ class TestDelete < ActiveSupport::TestCase
   end
 
   def test_clear_association
-      department = Department.find(1,1)
-      assert_equal 2, department.employees.size, "Before clear employee count should be 2."
-      department.employees.clear
-      assert_equal 0, department.employees.size, "After clear employee count should be 0."
-      department.reload
-      assert_equal 0, department.employees.size, "After clear and a reload from DB employee count should be 0."
+    department = Department.find(1,1)
+    assert_equal 2, department.employees.size, "Before clear employee count should be 2."
+    department.employees.clear
+    assert_equal 0, department.employees.size, "After clear employee count should be 0."
+    department.reload
+    assert_equal 0, department.employees.size, "After clear and a reload from DB employee count should be 0."
   end
 
   def test_delete_association

data/test/test_exists.rb

@@ -8,20 +8,16 @@ class TestExists < ActiveSupport::TestCase
   def test_single_key_exists_giving_id
     assert Article.exists?(1)
   end
-  
+
   def test_single_key_exists_giving_condition
     assert Article.exists?(['name = ?', 'Article One'])
   end
-  
-  def test_composite_key_exists_giving_ids_as_string
-    assert Department.exists?('1,1,')
-  end
-  
+
   def test_composite_key_exists_giving_ids_as_array
     assert Department.exists?([1,1])
     assert_equal(false, Department.exists?([1111,1111]))
   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]))

data/test/test_find.rb

@@ -1,6 +1,4 @@
 require 'abstract_unit'
-require 'fixtures/reference_type'
-require 'fixtures/reference_code'
 
 # Testing the find action on composite ActiveRecords with two primary keys
 class TestFind < ActiveSupport::TestCase
@@ -53,12 +51,6 @@ class TestFind < ActiveSupport::TestCase
     end
   end
   
-  def test_to_param
-    testing_with do
-      assert_equal first_id_str, @first.to_param.to_s
-    end
-  end
-  
   def things_to_look_at
     testing_with do
       assert_equal found, @klass.find(found.id.to_s) # fails for 2+ keys

data/test/test_ids.rb

@@ -30,13 +30,6 @@ class TestIds < ActiveSupport::TestCase
     end
   end
   
-  def test_id_to_s
-    testing_with do
-      assert_equal first_id_str, @first.id.to_s
-      assert_equal first_id_str, "#{@first.id}"
-    end
-  end
-  
   def test_ids_to_s
     testing_with do
       order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
@@ -46,13 +39,6 @@ class TestIds < ActiveSupport::TestCase
     end
   end
   
-  def test_composite_where_clause
-    testing_with do
-      where = 'reference_codes.reference_type_id=1 AND reference_codes.reference_code=2) OR (reference_codes.reference_type_id=2 AND reference_codes.reference_code=2'
-      assert_equal(where, @klass.composite_where_clause([[1, 2], [2, 2]])) if @key_test == :dual
-    end
-  end
-  
   def test_set_ids_string
     testing_with do
       array = @primary_keys.collect {|key| 5}
@@ -86,12 +72,12 @@ 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
       else
         assert_not_nil @klass.primary_key
-        assert_equal @primary_keys, [@klass.primary_key.to_sym]
+        assert_equal @primary_keys.first, @klass.primary_key.to_sym
+        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
       end
-      assert_equal @primary_keys.join(','), @klass.primary_key.to_s
-      # Need a :primary_keys should be Array with to_s overridden
     end
   end
 end

data/test/test_polymorphic.rb

@@ -1,5 +1,7 @@
 require 'abstract_unit'
 require 'fixtures/comment'
+require 'fixtures/article'
+require 'fixtures/reading'
 require 'fixtures/user'
 require 'fixtures/employee'
 require 'fixtures/hack'
@@ -11,21 +13,20 @@ class TestPolymorphic < ActiveSupport::TestCase
     comments = Hack.find('andrew').comments
     assert_equal 'andrew', comments[0].person_id
   end
-  
+
   def test_polymorphic_has_one
     first_comment = Hack.find('andrew').first_comment
     assert_equal 'andrew', first_comment.person_id
   end
-  
+
   def test_has_many_through
     user = users(:santiago)
     article_names = user.articles.collect { |a| a.name }.sort
     assert_equal ['Article One', 'Article Two'], article_names
   end
-  
+
   def test_polymorphic_has_many_through
     user = users(:santiago)
     assert_equal ['andrew'], user.hacks.collect { |a| a.name }.sort
   end
-
 end

data/test/test_suite.rb

@@ -0,0 +1,19 @@
+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_exists'
+require 'test_find'
+require 'test_ids'
+require 'test_miscellaneous'
+require 'test_pagination'
+require 'test_polymorphic'
+require 'test_santiago'
+require 'test_tutorial_example'
+require 'test_update'
+require 'test_validations'

metadata

@@ -1,105 +1,120 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 2.3.5.1
+  hash: 6629740
+  prerelease: true
+  segments: 
+  - 3
+  - 0
+  - 0
+  - b2
+  version: 3.0.0.b2
 platform: ruby
 authors: 
 - Dr Nic Williams
+- Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +01:00
+date: 2010-11-06 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
-description: Composite key support for ActiveRecords
-email: drnicwilliams@gmail.com
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Composite key support for ActiveRecord 3
+email: 
+- drnicwilliams@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- README_DB2.txt
-- website/index.txt
-- website/version-raw.txt
-- website/version.txt
+extra_rdoc_files: []
+
 files: 
+- Rakefile
 - History.txt
-- Manifest.txt
 - README.txt
 - README_DB2.txt
-- Rakefile
 - init.rb
 - install.rb
-- lib/adapter_helper/base.rb
-- lib/adapter_helper/mysql.rb
-- lib/adapter_helper/oracle.rb
-- lib/adapter_helper/postgresql.rb
-- lib/adapter_helper/sqlite3.rb
-- lib/composite_primary_keys.rb
-- lib/composite_primary_keys/association_preload.rb
+- loader.rb
+- lib/composite_primary_keys/associations/association_proxy.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/base.rb
 - lib/composite_primary_keys/calculations.rb
 - lib/composite_primary_keys/composite_arrays.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/migration.rb
+- lib/composite_primary_keys/read.rb
 - lib/composite_primary_keys/reflection.rb
+- lib/composite_primary_keys/relation.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
-- loader.rb
-- local/database_connections.rb.sample
-- local/paths.rb.sample
-- local/tasks.rb.sample
+- lib/composite_primary_keys.rb
 - scripts/console.rb
 - scripts/txt2html
 - scripts/txt2js
-- tasks/activerecord_selection.rake
-- tasks/databases.rake
 - tasks/databases/mysql.rake
 - tasks/databases/oracle.rake
 - tasks/databases/postgresql.rake
 - tasks/databases/sqlite3.rake
-- tasks/deployment.rake
-- tasks/local_setup.rake
+- tasks/Rakefile.rb
 - tasks/website.rake
-- test/README_tests.txt
 - test/abstract_unit.rb
+- test/connections/connection_spec.rb
+- test/connections/databases.example.yml
+- test/connections/databases.yml
 - test/connections/native_ibm_db/connection.rb
 - test/connections/native_mysql/connection.rb
 - test/connections/native_oracle/connection.rb
+- test/connections/native_oracle_enhanced/connection.rb
 - test/connections/native_postgresql/connection.rb
 - test/connections/native_sqlite/connection.rb
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
+- test/fixtures/article_group.rb
+- test/fixtures/article_groups.yml
 - test/fixtures/comment.rb
 - test/fixtures/comments.yml
 - test/fixtures/db_definitions/db2-create-tables.sql
@@ -109,30 +124,50 @@ files:
 - test/fixtures/db_definitions/oracle.sql
 - test/fixtures/db_definitions/postgresql.sql
 - test/fixtures/db_definitions/sqlite.sql
+- test/fixtures/debug.log
 - test/fixtures/department.rb
 - test/fixtures/departments.yml
+- test/fixtures/dorm.rb
+- test/fixtures/dorms.yml
 - test/fixtures/employee.rb
 - test/fixtures/employees.yml
 - test/fixtures/group.rb
 - test/fixtures/groups.yml
 - test/fixtures/hack.rb
 - test/fixtures/hacks.yml
+- test/fixtures/kitchen_sink.rb
+- test/fixtures/kitchen_sinks.yml
 - test/fixtures/membership.rb
+- test/fixtures/memberships.yml
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
-- test/fixtures/memberships.yml
 - test/fixtures/product.rb
+- test/fixtures/products.yml
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
-- test/fixtures/products.yml
 - test/fixtures/reading.rb
 - test/fixtures/readings.yml
 - test/fixtures/reference_code.rb
 - test/fixtures/reference_codes.yml
 - test/fixtures/reference_type.rb
 - test/fixtures/reference_types.yml
+- test/fixtures/restaurant.rb
+- test/fixtures/restaurants.yml
+- test/fixtures/restaurants_suburbs.yml
+- test/fixtures/room.rb
+- test/fixtures/rooms.yml
+- test/fixtures/room_assignment.rb
+- test/fixtures/room_assignments.yml
+- test/fixtures/room_attribute.rb
+- test/fixtures/room_attributes.yml
+- test/fixtures/room_attribute_assignment.rb
+- test/fixtures/room_attribute_assignments.yml
+- test/fixtures/seat.rb
+- test/fixtures/seats.yml
 - test/fixtures/street.rb
 - test/fixtures/streets.yml
+- test/fixtures/student.rb
+- test/fixtures/students.yml
 - test/fixtures/suburb.rb
 - test/fixtures/suburbs.yml
 - test/fixtures/tariff.rb
@@ -142,14 +177,14 @@ files:
 - test/hash_tricks.rb
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
+- test/README_tests.txt
 - test/test_associations.rb
-- test/test_attribute_methods.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_dummy.rb
 - test/test_exists.rb
 - test/test_find.rb
 - test/test_ids.rb
@@ -157,57 +192,59 @@ files:
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_santiago.rb
-- test/test_tutorial_examle.rb
+- test/test_suite.rb
+- test/test_tutorial_example.rb
 - test/test_update.rb
-- tmp/test.db
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.js
-- website/template.rhtml
-- website/version-raw.js
-- website/version-raw.txt
-- website/version.js
-- website/version.txt
+- test/test_validations.rb
 has_rdoc: true
-homepage: http://compositekeys.rubyforge.org
+homepage: http://github.com/cfis/composite_primary_keys
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Composite key support for ActiveRecords
+summary: Composite key support for ActiveRecord
 test_files: 
+- test/abstract_unit.rb
+- test/hash_tricks.rb
+- test/README_tests.txt
 - test/test_associations.rb
-- test/test_attribute_methods.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_dummy.rb
 - test/test_exists.rb
 - test/test_find.rb
 - test/test_ids.rb
@@ -215,6 +252,7 @@ test_files:
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_santiago.rb
-- test/test_tutorial_examle.rb
+- test/test_suite.rb
+- test/test_tutorial_example.rb
 - test/test_update.rb
 - test/test_validations.rb