composite_primary_keys 3.1.0 → 3.1.1

data/History.txt

@@ -1,3 +1,11 @@
+== 3.1.1 2010-02-07
+* Implement id_before_type_cast (Jason Lewis)
+* Add in tests for Model.includes(:other_model)
+* Fix object comparison with nil in composite primary keys (StackNG)
+* Make it easier to run tests with different database adapters (Toby Cabot)
+* Fix AssociationReflection#primary_key_name for polymorphic relationships (Dave Doan)
+
+
 == 3.1.0 2010-12-17
 * Add back in rake test tasks (Toby Cabot)
 * Add support for multiple string composite keys (wouter)

data/README.txt

@@ -32,7 +32,7 @@ http://compositekeys.rubyforge.org
 
 == Questions, Discussion and Contributions
 
-http://groups.google.com/compositekeys
+http://groups.google.com/group/compositekeys
 
 == Author
 

data/Rakefile

@@ -21,11 +21,16 @@ Dir.glob('tasks/**/*.rake').each do |rake_file|
   load File.join(File.dirname(__FILE__), rake_file)
 end
 
-# Set up test tasks
-for adapter in %w( mysql sqlite oracle oracle_enhanced postgresql ibm_db )
-  Rake::TestTask.new("test_#{adapter}") do |t|
-    t.libs << "test" << "test/connections/native_#{adapter}"
-    t.pattern = "test/test_*.rb"
-    t.verbose = true
+# Set up test tasks for each supported connection adapter
+%w(mysql sqlite oracle oracle_enhanced postgresql ibm_db).each do |adapter|
+  namespace adapter do
+    desc "Run tests using the #{adapter} adapter"
+    task "test" do
+      ENV["ADAPTER"] = adapter
+      Rake::TestTask.new("subtest_#{adapter}") do |t|
+        t.libs << "test"
+      end
+      Rake::Task["subtest_#{adapter}"].invoke
+    end
   end
 end

data/lib/composite_primary_keys/base.rb

@@ -116,8 +116,10 @@ module ActiveRecord
         end
       end
 
-      def id_before_type_cast #:nodoc:
-        raise CompositeKeyError, CompositePrimaryKeys::ActiveRecord::Base::NOT_IMPLEMENTED_YET
+      def id_before_type_cast
+        self.class.primary_keys.map do |key|
+          self.send("#{key.to_s}_before_type_cast")
+        end
       end
 
       def quoted_id #:nodoc:
@@ -138,6 +140,10 @@ module ActiveRecord
         id
       end
 
+      def ==(comparison_object)
+        ids.is_a?(Array) ? super(comparison_object) && ids.all? {|id| id.present?} : super(comparison_object)
+      end
+
       # Cloned objects have no id assigned and are treated as new records. Note that this is a "shallow" clone
       # as it copies the object's attributes only, not its associations. The extent of a "deep" clone is
       # application specific and is therefore left to the application to implement according to its need.
@@ -188,4 +194,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/reflection.rb

@@ -9,7 +9,7 @@ module ActiveRecord
           #"#{name}_id"
           class_name.foreign_key
         elsif options[:as]
-          options[:as]
+          "#{options[:as]}_id"
         else
           active_record.name.foreign_key
         end

data/lib/composite_primary_keys/version.rb

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

data/test/README_tests.txt

@@ -7,17 +7,29 @@ There are tests available for the following adapters:
 * ibmdb
 * mysql
 * oracle
+* oracle_enhanced
 * postgresql
 * sqlite
 
-To run the tests for on of the adapters follow these steps (using mysql in the example):
+To run the tests for one of the adapters follow these steps (using mysql in the example):
 
-* rake -T | grep mysql
+* rake -T mysql
 
     rake mysql:build_databases         # Build the MySQL test databases
     rake mysql:drop_databases          # Drop the MySQL test databases
     rake mysql:rebuild_databases       # Rebuild the MySQL test databases
-    rake test_mysql                    # Run tests for test_mysql
+    rake mysql:test                    # Run tests using the mysql adapter
 
 * rake mysql:build_databases
-* rake test_mysql
+* rake mysql:test
+
+== Running tests individually
+
+You can specify which test you'd like to run on the command line:
+
+* rake mysql:test TEST=test/test_equal.rb
+
+If you want to run closer to the metal you can cd into the test/
+directory and run the tests like so:
+
+* ADAPTER=mysql ruby test_equal.rb

data/test/abstract_unit.rb

@@ -1,7 +1,7 @@
 dir = File.dirname(__FILE__)
 PROJECT_ROOT = File.expand_path(File.join(dir, '..'))
 
-adapter = 'postgresql'
+adapter = ENV["ADAPTER"] || 'postgresql'
 
 require 'pp'
 require 'test/unit'

data/test/connections/native_postgresql/connection.rb

@@ -7,7 +7,6 @@ require File.join(PROJECT_ROOT, 'lib', 'composite_primary_keys', 'connection_ada
 def connection_string
   options = Hash.new
   options['U'] = SPEC['username']  if SPEC['username']
-  options['p'] = SPEC['password']  if SPEC['password']
   options.map { |key, value| "-#{key} #{value}" }.join(" ")
 end
 

data/test/test_associations.rb

@@ -56,31 +56,59 @@ class TestAssociations < ActiveSupport::TestCase
 
   # Its not generating the instances of associated classes from the rows
   def test_find_includes_products
+    # Old style
     assert @products = Product.find(:all, :include => :product_tariffs)
     assert_equal 2, @products.length
     assert_not_nil @products.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
     assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length},
       "Incorrect number of product_tariffs returned"
+
+    # New style
+    assert @products = Product.includes(:product_tariffs)
+    assert_equal 2, @products.length
+    assert_not_nil @products.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
+    assert_equal 3, @products.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length},
+      "Incorrect number of product_tariffs returned"
   end
 
   def test_find_includes_tariffs
+    # Old style
     assert @tariffs = Tariff.find(:all, :include => :product_tariffs)
     assert_equal 3, @tariffs.length
     assert_not_nil @tariffs.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
     assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length},
       "Incorrect number of product_tariffs returnedturned"
+
+    # New style
+    assert @tariffs = Tariff.includes(:product_tariffs)
+    assert_equal 3, @tariffs.length
+    assert_not_nil @tariffs.first.instance_variable_get('@product_tariffs'), '@product_tariffs not set; should be array'
+    assert_equal 3, @tariffs.inject(0) {|sum, tariff| sum + tariff.instance_variable_get('@product_tariffs').length},
+      "Incorrect number of product_tariffs returnedturned"
   end
 
-  def test_find_includes_product
+  def test_find_includes_product_tariffs
+    # Old style
     assert @product_tariffs = ProductTariff.find(:all, :include => :product)
     assert_equal 3, @product_tariffs.length
     assert_not_nil @product_tariffs.first.instance_variable_get('@product'), '@product not set'
+
+    # New style
+    assert @product_tariffs = ProductTariff.includes(:product)
+    assert_equal 3, @product_tariffs.length
+    assert_not_nil @product_tariffs.first.instance_variable_get('@product'), '@product not set'
   end
 
   def test_find_includes_comp_belongs_to_tariff
+    # Old style
     assert @product_tariffs = ProductTariff.find(:all, :include => :tariff)
     assert_equal 3, @product_tariffs.length
     assert_not_nil @product_tariffs.first.instance_variable_get('@tariff'), '@tariff not set'
+
+    # New style
+    assert @product_tariffs = ProductTariff.includes(:tariff)
+    assert_equal 3, @product_tariffs.length
+    assert_not_nil @product_tariffs.first.instance_variable_get('@tariff'), '@tariff not set'
   end
 
   def test_find_includes_extended

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -07:00
+date: 2011-02-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: compositekeys
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord