composite_primary_keys 5.0.1 → 5.0.2

data/{History.txt → History.rdoc}

@@ -1,3 +1,12 @@
+== 5.0.2 2012-03-16
+* Use .rdoc extension on RDoc files (Elia Schito)
+* Update documentation to use self.primary_keys instead of set_primary_keys (Miguel Fonseca)
+* Added tests for comparing composite ids (Jim Jones)
+* Updating the README for clarity (Brett Fishman)
+* Fix method signature mismatch with active_record (Miguel Fonseca)
+* Fix ref in README (Elia Schito)
+* Add test for habm create (Charlie Savage)
+
 == 5.0.1 2012-02-13
 * Fix deprecation warning that was exactly backwards (Tom Hughes)
 * Fix primary_keys handling in models that inherit from other models

data/{README.txt → README.rdoc}

@@ -2,29 +2,41 @@
 
 == Summary
 
-ActiveRecords/Rails famously doesn't support composite primary keys. 
+ActiveRecords/Rails famously doesn't support composite primary keys.
 This RubyGem extends the activerecord gem to provide CPK support.
 
 == Installation
 
     gem install composite_primary_keys
-    
+
 == Usage
-  
+
     require 'composite_primary_keys'
     class ProductVariation
-      set_primary_keys :product_id, :variation_seq
+      self.primary_keys = :product_id, :variation_seq
     end
-    
+
     pv = ProductVariation.find(345, 12)
-    
+
+== Factories
+
+    class ModelWithCompositeKeys < ActiveRecord::Base
+      set_primary_keys :id, :updated_at
+    end
+
+    FactoryGirl.define do
+      factory :model_with_composite_keys do
+	      sequence( :id ) { |n| [n,Time.now] }
+	      name "Brett"
+
+
 It even supports composite foreign keys for associations.
 
 See http://compositekeys.rubyforge.org for more.
 
 == Running Tests
 
-See test/README_tests.txt
+See test/README_tests.rdoc
 
 == Url
 

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -1,8 +1,14 @@
 module ActiveRecord
   module Associations
     class HasAndBelongsToManyAssociation
-      def insert_record(record, validate = true)
-        return if record.new_record? && !record.save(:validate => validate)
+      def insert_record(record, validate = true, raise = false)
+        if record.new_record?
+          if raise
+            record.save!(:validate => validate)
+          else
+            return unless record.save(:validate => validate)
+          end
+        end
 
         if options[:insert_sql]
           owner.connection.insert(interpolate(options[:insert_sql], record))

data/lib/composite_primary_keys/version.rb

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

data/test/test_composite_arrays.rb

@@ -15,10 +15,17 @@ class CompositeArraysTest < ActiveSupport::TestCase
     assert_equal '1,2,3', keys.to_s
     assert_equal '1,2,3', "#{keys}"
   end
-  
+
   def test_to_composite_keys
     keys = [1,2,3].to_composite_keys
     assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
     assert_equal '1,2,3', keys.to_s
   end
+
+  def test_composite_keys_equality
+    keys_array_1 = [1, Time.now].to_composite_keys
+    keys_array_2 = [1, Time.now].to_composite_keys
+    assert keys_array_1 == keys_array_2
+    assert keys_array_1.eql? keys_array_2
+  end
 end

data/test/test_create.rb

@@ -62,7 +62,7 @@ class TestCreate < ActiveSupport::TestCase
     assert_equal(rc.reference_type_id, rt.reference_type_id)
   end
 
-  def test_create_habtm
+  def test_new_habtm
     restaurant = Restaurant.new(:franchise_id => 22,
                                 :store_id => 23,
                                 :name => "My Store")
@@ -87,4 +87,26 @@ class TestCreate < ActiveSupport::TestCase
     assert_equal(25, suburb.suburb_id)
     assert_equal("My Suburb", suburb.name)
   end
+
+  def test_create_habtm
+    restaurant = Restaurant.create(:franchise_id => 22,
+                                   :store_id => 23,
+                                   :name => "My Store")
+
+    restaurant.suburbs.create(:city_id => 24,
+                              :suburb_id => 25,
+                              :name => "My Suburb")
+
+    # Test restaurant
+    assert_equal(22, restaurant.franchise_id)
+    assert_equal(23, restaurant.store_id)
+    assert_equal("My Store", restaurant.name)
+    assert_equal(1, restaurant.suburbs.length)
+
+    # Test suburbs
+    suburb = restaurant.suburbs[0]
+    assert_equal(24, suburb.city_id)
+    assert_equal(25, suburb.suburb_id)
+    assert_equal("My Suburb", suburb.name)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &21857400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,12 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21857400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -30,9 +35,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- History.txt
-- README.txt
-- README_DB2.txt
+- History.rdoc
+- README.rdoc
+- README_DB2.rdoc
 - init.rb
 - install.rb
 - loader.rb
@@ -148,7 +153,7 @@ files:
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
-- test/README_tests.txt
+- test/README_tests.rdoc
 - test/setup.rb
 - test/test_associations.rb
 - test/test_attributes.rb
@@ -192,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 1.8.16
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord
@@ -200,7 +205,7 @@ test_files:
 - test/abstract_unit.rb
 - test/db_test.rb
 - test/debug.log
-- test/README_tests.txt
+- test/README_tests.rdoc
 - test/setup.rb
 - test/test_associations.rb
 - test/test_attributes.rb