composite_primary_keys 3.1.10 → 3.1.11

data/History.txt

@@ -1,3 +1,6 @@
+== 3.1.11 2012-05-20
+Fix AssociationReflection#derive_primary_key for belongs_to relationships (Heinrich Lee Yu).
+
 == 3.1.10 2011-07-08
 * Bugfix for belongs_to with includes (John Ash)
 * Improved tests for calling clear on a habtm association, which involved (David Rueck)

data/lib/composite_primary_keys/reflection.rb

@@ -5,9 +5,7 @@ module ActiveRecord
         if options[:foreign_key]
           options[:foreign_key]
         elsif belongs_to?
-          #CPK
-          #"#{name}_id"
-          class_name.foreign_key
+          "#{name}_id"
         elsif options[:as]
           "#{options[:as]}_id"
         else
@@ -36,4 +34,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

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

metadata

@@ -1,71 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: composite_primary_keys
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 3.1.11
   prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 10
-  version: 3.1.10
 platform: ruby
-authors: 
+authors:
 - Dr Nic Williams
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 3.0.0
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 0
-        - 5
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    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
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Composite key support for ActiveRecord 3
-email: 
+email:
 - drnicwilliams@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - History.txt
 - README.txt
@@ -209,40 +200,29 @@ 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 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: compositekeys
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 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