dase 4.2.0 → 4.2.1

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/dase.gemspec +2 -2
  3. data/lib/dase/mp_active_record.rb +4 -4
  4. data/lib/dase/version.rb +1 -1
  5. metadata +19 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 75b57d1d16a33aaf6039f6aff02fb26342ef15c3
4
- data.tar.gz: bb177eeae7391ba894d15395d05917bb71b1de82
3
+ metadata.gz: 54d72938545dc976310e9eb9492532577a85d58d
4
+ data.tar.gz: 25a7833a534e02a941064d54bf0db3e70279182c
5
5
  SHA512:
6
- metadata.gz: f128f08ff9148ec3e97b3c781ca502cbe6863ee5440d577f815723f6d1d6c6cdc6feb6760c840db9818986f5b87cbed10e235a7bb8ad233579c1b9e8d80ee9b5
7
- data.tar.gz: 9914f5bc4f059db6c6395bf754136d8d910b95233333236c2f4a2d928b35f8d8181e910777eb54fd0c747ca70b6176f9730034971516cfd649cdda7a3cc2b774
6
+ metadata.gz: ede367340a017004ca683a8c354fe754c848561e540104856a22305dc3286e0b9daaa7dabcd08bc1240ff74ebba1423f1a03a69084bec496f9d981aff974d488
7
+ data.tar.gz: 531aaeadbb790956b4d3649d1fe2c27e9f71af655343a20db05adabb64ef6fcd8ce8b9047905fe1ac7464a1e3ba6622c2dfe929649668f83d86a58d6d6572a0e
data/dase.gemspec CHANGED
@@ -13,12 +13,12 @@ Gem::Specification.new do |gem|
13
13
  gem.summary = %q{Provides includes_count_of method on ActiveRecord::Relation to count associated records efficiently}
14
14
  gem.homepage = "https://github.com/vovayartsev/dase"
15
15
 
16
- gem.add_runtime_dependency "activesupport", "~> 4.2.0"
16
+ gem.add_runtime_dependency "activesupport", "~> 4.2", '>= 4.2.10'
17
17
 
18
18
  if defined? JRUBY_VERSION
19
19
  gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
20
20
  else
21
- gem.add_runtime_dependency "activerecord", "~> 4.2.0"
21
+ gem.add_runtime_dependency 'activerecord', '~> 4.2', '>= 4.2.10'
22
22
  gem.add_development_dependency 'sqlite3', '~> 1.3'
23
23
  end
24
24
 
data/lib/dase/mp_active_record.rb CHANGED
@@ -25,8 +25,8 @@ module Dase
25
25
  end
26
26
  end
27
27
 
28
- def merge(other)
29
- super(other).tap do |result|
28
+ def merge(other, *args)
29
+ super.tap do |result|
30
30
  result.dase_values.merge!(other.dase_values) if other # other == nil is fine too
31
31
  end
32
32
  end
@@ -44,7 +44,8 @@ module Dase
44
44
  end
45
45
 
46
46
  def sanitize_dase_options(args, options)
47
- options.assert_valid_keys *(VALID_DASE_OPTIONS + VALID_ASSOCIATION_OPTIONS + VALID_SYNONYMS.keys)
47
+ valid_options = VALID_DASE_OPTIONS + VALID_ASSOCIATION_OPTIONS + VALID_SYNONYMS.keys
48
+ options.assert_valid_keys(*valid_options)
48
49
  if options.present? and args.many?
49
50
  raise ArgumentError, 'includes_count_of takes either multiple associations OR single association + options'
50
51
  end
@@ -75,4 +76,3 @@ end
75
76
  class << ActiveRecord::Base
76
77
  delegate :includes_count_of, :to => :all
77
78
  end
78
-
data/lib/dase/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dase
2
- VERSION = '4.2.0'
2
+ VERSION = '4.2.1'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dase
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.0
4
+ version: 4.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vladimir Yartsev
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-20 00:00:00.000000000 Z
11
+ date: 2017-11-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,28 +16,40 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 4.2.0
19
+ version: '4.2'
20
+ - - ">="
21
+ - !ruby/object:Gem::Version
22
+ version: 4.2.10
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
27
  - - "~>"
25
28
  - !ruby/object:Gem::Version
26
- version: 4.2.0
29
+ version: '4.2'
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: 4.2.10
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: activerecord
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
37
  - - "~>"
32
38
  - !ruby/object:Gem::Version
33
- version: 4.2.0
39
+ version: '4.2'
40
+ - - ">="
41
+ - !ruby/object:Gem::Version
42
+ version: 4.2.10
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
37
46
  requirements:
38
47
  - - "~>"
39
48
  - !ruby/object:Gem::Version
40
- version: 4.2.0
49
+ version: '4.2'
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: 4.2.10
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: sqlite3
43
55
  requirement: !ruby/object:Gem::Requirement
@@ -131,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
131
143
  version: '0'
132
144
  requirements: []
133
145
  rubyforge_project:
134
- rubygems_version: 2.2.2
146
+ rubygems_version: 2.6.10
135
147
  signing_key:
136
148
  specification_version: 4
137
149
  summary: Provides includes_count_of method on ActiveRecord::Relation to count associated