composite_primary_keys 5.0.0 → 5.0.1

data/History.txt

@@ -1,3 +1,9 @@
+== 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
+  but don't redefine their primary_key.  Problem was the inherited
+  models didn't correctly reference their parents primary_keys (Charlie Savage)
+
 == 5.0.0 2012-02-12
 * Fix tests so they pass on MySql (Charlie Savage)
 * Fix calculations to work with duplicate column names (cleesmith)

data/lib/composite_primary_keys/base.rb

@@ -8,9 +8,19 @@ module ActiveRecord
 
     class << self
       def primary_keys
+        unless defined?(@primary_keys)
+          reset_primary_keys
+        end
         @primary_keys
       end
 
+      # Don't like this method name, but its modeled after how AR does it
+      def reset_primary_keys
+        if self != base_class
+          self.primary_keys = base_class.primary_keys
+        end
+      end
+
       def primary_keys=(keys)
         unless keys.kind_of?(Array)
           self.primary_key = keys
@@ -27,7 +37,7 @@ module ActiveRecord
 
       def set_primary_keys(*keys)
         ActiveSupport::Deprecation.warn(
-            "Calling self.primary_keys = is deprecated. Please use `self.primary_keys = keys` instead."
+            "Calling set_primary_keys is deprecated. Please use `self.primary_keys = keys` instead."
         )
 
         keys = keys.first if keys.first.is_a?(Array)
@@ -140,4 +150,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

data/test/test_ids.rb

@@ -1,5 +1,8 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
+class ChildCpkTest < ReferenceCode
+end
+
 class TestIds < ActiveSupport::TestCase
   fixtures :reference_types, :reference_codes
   
@@ -81,6 +84,15 @@ class TestIds < ActiveSupport::TestCase
     end
   end
 
+  def test_inherited_primary_keys
+    assert_equal([:reference_type_id, :reference_code], ChildCpkTest.primary_keys)
+  end
+
+  def test_inherited_ids
+    cpk_test = ChildCpkTest.new
+    assert_equal([nil, nil], cpk_test.id)
+  end
+
   def test_assign_ids
     ref_code = ReferenceCode.new
     assert_equal([nil, nil], ref_code.id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &24424140 !ruby/object:Gem::Requirement
+  requirement: &21857400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,7 +22,7 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *24424140
+  version_requirements: *21857400
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Composite key support for ActiveRecord