dase 3.2.5 → 3.2.6

data/lib/dase/mp_active_record_relation.rb

@@ -33,7 +33,8 @@ module Dase
 
     def merge(r)
       super(r).tap do |result|
-        if r.dase_values.present?
+        # it's ok to get nil here - ActiveRecord works fine in that case
+        if !r.nil? and r.dase_values.present?
           result.dase_values ||= {}
           result.dase_values.merge!(r.dase_values)
         end

data/lib/dase/version.rb

@@ -1,3 +1,3 @@
 module Dase
-  VERSION = "3.2.5"
+  VERSION = "3.2.6"
 end

metadata

@@ -1,91 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dase
-version: !ruby/object:Gem::Version
-  version: 3.2.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 3.2.6
 platform: ruby
-authors:
+authors: 
 - Vladimir Yartsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70173173459420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70173173459420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &70173173458740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70173173458740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70173173458200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70173173458200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70173173457620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.3.3
   type: :development
-  prerelease: false
-  version_requirements: *70173173457620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70173173457020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70173173457020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec-core
-  requirement: &70173173456380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70173173456380
-description: ! "Dase gem creates includes_count_of method in ActiveRecord::Relation\n
-  \                        to count associated records efficiently. See examples at
-  https://github.com/vovayartsev/dase\n                      "
-email:
+  version_requirements: *id006
+description: "Dase gem creates includes_count_of method in ActiveRecord::Relation\n                         to count associated records efficiently. See examples at https://github.com/vovayartsev/dase\n                      "
+email: 
 - vovayartsev@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -112,30 +114,32 @@ files:
 - test/test_dase.rb
 homepage: https://github.com/vovayartsev/dase
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Provides includes_count_of method on ActiveRecord::Relation to count associated
-  records efficiently
-test_files:
+summary: Provides includes_count_of method on ActiveRecord::Relation to count associated records efficiently
+test_files: 
 - test/fixtures/author.rb
 - test/fixtures/authors.yml
 - test/fixtures/book.rb
@@ -147,3 +151,4 @@ test_files:
 - test/fixtures/schema.rb
 - test/helper.rb
 - test/test_dase.rb
+has_rdoc: