composite_primary_keys 10.0.2 → 10.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +5 -5
  2. data/History.rdoc +4 -0
  3. data/lib/composite_primary_keys.rb +1 -1
  4. data/lib/composite_primary_keys/associations/join_dependency.rb +2 -2
  5. data/lib/composite_primary_keys/version.rb +1 -1
  6. data/test/fixtures/tariffs.yml +14 -14
  7. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 747335fa1b0ec3dec3bf8747c73154e7315b3adf
4
- data.tar.gz: 4717b2d1fa29a60085a1a7555775acbd330aa700
2
+ SHA256:
3
+ metadata.gz: 29b9cbec2b60475dd15921781f0cd0d13bcc926a7e30d5044b6eec3785c58d33
4
+ data.tar.gz: 571a02475e5baaa6a09893c98de1d370040579ce0c57dd3d9a1df098cd77f436
5
5
  SHA512:
6
- metadata.gz: c692686ba13178d1965f53d37aa40fa10cabe399312b1281a1834d4f8b9f4c971e984daffbb89836779946d499f4648e73b665bc9a99060e27b6413ee99494c0
7
- data.tar.gz: 4bfc14d692903f6f9c00c13c2522e84900c860b457011c11f9210a7d11f8b0285bb285e21bb437510fd320897cc56a3f1cadbcffbd8f4b2021777765f0ffb6fd
6
+ metadata.gz: 114b0f20ab6ec000a62c4186927b72f5600afad9e6ff79a9d7e7d60d3bf07b38a20bca74fd4d2b81e892e252692f5c892ee860affc134cfda76bae87614073da
7
+ data.tar.gz: 26e7a765dbbff53d865073b83dfc1a876219aa6067b33216134d7f8d90dd0451a0c5534783e89f443555abb4c76bc4596c26de3e20db537de6d6fc91c06901fa
data/History.rdoc CHANGED
@@ -1,3 +1,7 @@
1
+ == 10.0.3 (2018-02-25)
2
+
3
+ * Require a minimum of activerecord version 5.1.5 (Tom Hughes)
4
+
1
5
  == 10.0.2 (2017-12-02)
2
6
 
3
7
  * Fix frozen string mutation for mysql (Sergey Sein)
data/lib/composite_primary_keys.rb CHANGED
@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
26
26
 
27
27
  unless defined?(ActiveRecord)
28
28
  require 'rubygems'
29
- gem 'activerecord', ['~>5.1.0', '>= 5.1.4']
29
+ gem 'activerecord', ['~>5.1.0', '>= 5.1.5']
30
30
  require 'active_record'
31
31
  end
32
32
 
data/lib/composite_primary_keys/associations/join_dependency.rb CHANGED
@@ -18,7 +18,7 @@ module ActiveRecord
18
18
  end
19
19
 
20
20
  silence_warnings do
21
- def instantiate(result_set, aliases)
21
+ def instantiate(result_set, &block)
22
22
  primary_key = aliases.column_alias(join_root, join_root.primary_key)
23
23
 
24
24
  seen = Hash.new { |i, object_id|
@@ -47,7 +47,7 @@ module ActiveRecord
47
47
  primary_key ? row_hash[primary_key] : row_hash
48
48
  end
49
49
 
50
- parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases)
50
+ parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases, &block)
51
51
  construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
52
52
  }
53
53
  end
data/lib/composite_primary_keys/version.rb CHANGED
@@ -2,7 +2,7 @@ module CompositePrimaryKeys
2
2
  module VERSION
3
3
  MAJOR = 10
4
4
  MINOR = 0
5
- TINY = 2
5
+ TINY = 3
6
6
  STRING = [MAJOR, MINOR, TINY].join('.')
7
7
  end
8
8
  end
data/test/fixtures/tariffs.yml CHANGED
@@ -1,15 +1,15 @@
1
- flat:
2
- tariff_id: 1
3
- start_date: <%= Date.today.to_s(:db) %>
4
- amount: 50
5
-
6
- free:
7
- tariff_id: 2
8
- start_date: <%= Date.today.to_s(:db) %>
9
- amount: 0
10
-
11
- flat_future:
12
- tariff_id: 1
13
- start_date: <%= Date.today.next.to_s(:db) %>
14
- amount: 100
1
+ flat:
2
+ tariff_id: 1
3
+ start_date: <%= Date.today.to_s(:db) %>
4
+ amount: 50
5
+
6
+ free:
7
+ tariff_id: 2
8
+ start_date: <%= Date.today.to_s(:db) %>
9
+ amount: 0
10
+
11
+ flat_future:
12
+ tariff_id: 1
13
+ start_date: <%= Date.today.next.to_s(:db) %>
14
+ amount: 100
15
15
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: composite_primary_keys
3
3
  version: !ruby/object:Gem::Version
4
- version: 10.0.2
4
+ version: 10.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charlie Savage
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-02 00:00:00.000000000 Z
11
+ date: 2018-02-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: 5.1.0
20
20
  - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: 5.1.4
22
+ version: 5.1.5
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  version: 5.1.0
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: 5.1.4
32
+ version: 5.1.5
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: rake
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
279
279
  version: '0'
280
280
  requirements: []
281
281
  rubyforge_project:
282
- rubygems_version: 2.6.13
282
+ rubygems_version: 2.7.3
283
283
  signing_key:
284
284
  specification_version: 4
285
285
  summary: Composite key support for ActiveRecord