composite_primary_keys 10.0.2 → 10.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 747335fa1b0ec3dec3bf8747c73154e7315b3adf
-  data.tar.gz: 4717b2d1fa29a60085a1a7555775acbd330aa700
+SHA256:
+  metadata.gz: 29b9cbec2b60475dd15921781f0cd0d13bcc926a7e30d5044b6eec3785c58d33
+  data.tar.gz: 571a02475e5baaa6a09893c98de1d370040579ce0c57dd3d9a1df098cd77f436
 SHA512:
-  metadata.gz: c692686ba13178d1965f53d37aa40fa10cabe399312b1281a1834d4f8b9f4c971e984daffbb89836779946d499f4648e73b665bc9a99060e27b6413ee99494c0
-  data.tar.gz: 4bfc14d692903f6f9c00c13c2522e84900c860b457011c11f9210a7d11f8b0285bb285e21bb437510fd320897cc56a3f1cadbcffbd8f4b2021777765f0ffb6fd
+  metadata.gz: 114b0f20ab6ec000a62c4186927b72f5600afad9e6ff79a9d7e7d60d3bf07b38a20bca74fd4d2b81e892e252692f5c892ee860affc134cfda76bae87614073da
+  data.tar.gz: 26e7a765dbbff53d865073b83dfc1a876219aa6067b33216134d7f8d90dd0451a0c5534783e89f443555abb4c76bc4596c26de3e20db537de6d6fc91c06901fa

data/History.rdoc

@@ -1,3 +1,7 @@
+== 10.0.3 (2018-02-25)
+
+* Require a minimum of activerecord version 5.1.5 (Tom Hughes)
+
 == 10.0.2 (2017-12-02)
 
 * Fix frozen string mutation for mysql (Sergey Sein)

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', ['~>5.1.0', '>= 5.1.4']
+  gem 'activerecord', ['~>5.1.0', '>= 5.1.5']
   require 'active_record'
 end
 

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -18,7 +18,7 @@ module ActiveRecord
       end
 
       silence_warnings do
-        def instantiate(result_set, aliases)
+        def instantiate(result_set, &block)
           primary_key = aliases.column_alias(join_root, join_root.primary_key)
 
           seen = Hash.new { |i, object_id|
@@ -47,7 +47,7 @@ module ActiveRecord
                              primary_key ? row_hash[primary_key] : row_hash
                            end
 
-              parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases)
+              parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, &block)
               construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
             }
           end

data/lib/composite_primary_keys/version.rb

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

data/test/fixtures/tariffs.yml

@@ -1,15 +1,15 @@
-flat:
-  tariff_id: 1
-  start_date: <%= Date.today.to_s(:db) %>
-  amount: 50
-
-free:
-  tariff_id: 2
-  start_date: <%= Date.today.to_s(:db) %>
-  amount: 0
-  
-flat_future:
-  tariff_id: 1
-  start_date: <%= Date.today.next.to_s(:db) %>
-  amount: 100
+flat:
+  tariff_id: 1
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 50
+
+free:
+  tariff_id: 2
+  start_date: <%= Date.today.to_s(:db) %>
+  amount: 0
+  
+flat_future:
+  tariff_id: 1
+  start_date: <%= Date.today.next.to_s(:db) %>
+  amount: 100
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 10.0.3
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 5.1.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord