dase 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75b57d1d16a33aaf6039f6aff02fb26342ef15c3
-  data.tar.gz: bb177eeae7391ba894d15395d05917bb71b1de82
+  metadata.gz: 54d72938545dc976310e9eb9492532577a85d58d
+  data.tar.gz: 25a7833a534e02a941064d54bf0db3e70279182c
 SHA512:
-  metadata.gz: f128f08ff9148ec3e97b3c781ca502cbe6863ee5440d577f815723f6d1d6c6cdc6feb6760c840db9818986f5b87cbed10e235a7bb8ad233579c1b9e8d80ee9b5
-  data.tar.gz: 9914f5bc4f059db6c6395bf754136d8d910b95233333236c2f4a2d928b35f8d8181e910777eb54fd0c747ca70b6176f9730034971516cfd649cdda7a3cc2b774
+  metadata.gz: ede367340a017004ca683a8c354fe754c848561e540104856a22305dc3286e0b9daaa7dabcd08bc1240ff74ebba1423f1a03a69084bec496f9d981aff974d488
+  data.tar.gz: 531aaeadbb790956b4d3649d1fe2c27e9f71af655343a20db05adabb64ef6fcd8ce8b9047905fe1ac7464a1e3ba6622c2dfe929649668f83d86a58d6d6572a0e

data/dase.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Provides includes_count_of method on ActiveRecord::Relation to count associated records efficiently}
   gem.homepage      = "https://github.com/vovayartsev/dase"
 
-  gem.add_runtime_dependency "activesupport", "~> 4.2.0"
+  gem.add_runtime_dependency "activesupport", "~> 4.2", '>= 4.2.10' 
 
   if defined? JRUBY_VERSION
     gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
   else
-    gem.add_runtime_dependency "activerecord", "~> 4.2.0"
+    gem.add_runtime_dependency 'activerecord', '~> 4.2', '>= 4.2.10'
     gem.add_development_dependency 'sqlite3', '~> 1.3'
   end
 

data/lib/dase/mp_active_record.rb

@@ -25,8 +25,8 @@ module Dase
       end
     end
 
-    def merge(other)
-      super(other).tap do |result|
+    def merge(other, *args)
+      super.tap do |result|
         result.dase_values.merge!(other.dase_values) if other # other == nil is fine too
       end
     end
@@ -44,7 +44,8 @@ module Dase
     end
 
     def sanitize_dase_options(args, options)
-      options.assert_valid_keys *(VALID_DASE_OPTIONS + VALID_ASSOCIATION_OPTIONS + VALID_SYNONYMS.keys)
+      valid_options = VALID_DASE_OPTIONS + VALID_ASSOCIATION_OPTIONS + VALID_SYNONYMS.keys
+      options.assert_valid_keys(*valid_options)
       if options.present? and args.many?
         raise ArgumentError, 'includes_count_of takes either multiple associations OR single association + options'
       end
@@ -75,4 +76,3 @@ end
 class << ActiveRecord::Base
   delegate :includes_count_of, :to => :all
 end
-

data/lib/dase/version.rb

@@ -1,3 +1,3 @@
 module Dase
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dase
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Vladimir Yartsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Provides includes_count_of method on ActiveRecord::Relation to count associated