acts_as_recursive_tree 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd168c454a68c9fdc6ae7fb32b705bdaba8964f
-  data.tar.gz: 2367e9b864ee904abc49198936f5afb59bb2d46b
+  metadata.gz: 064f977e7f4e77083f3a967fce16c6c47fc29ee9
+  data.tar.gz: 2b8e5949381e248c33034868ee816126367e19bd
 SHA512:
-  metadata.gz: 4c4e359bbc497ff24f6ba6e8ccfbd846ce17178c0842850d3e3a0bee43e7d15cd8cd6a0a40072aa74d48e538d4a4dc892be743a677c34c39b7280348588ed74e
-  data.tar.gz: 12c7f7bac25c0547573d66bc8efa7b6e6ea4e3815f3490c929b8551886512c2cef6619f48a954d02a89518a79ac4da412d66fb69973b8321245d9bd7049952ba
+  metadata.gz: 91e3f8cdf111f4efed5618391d806ccab6e5bdb2c8e5325862292e23a67d990aaa86de199dfffabade3f0ee6a18ba501d9032e9a700b9dba567eb75e0d6265ec
+  data.tar.gz: cb6576280d42539dc013e96b07414cae5ad49b416a28518c742731fb43697ec9fc997da237cf8f0cbc5f53c01bf530fd37353bb3108cf9e1e06313c2174aecc9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 2.0.2
+- fix for condition relation was executed before merging
+
 ### Version 2.0.1
 - fix for parent_type_column applied not properly
 

data/acts_as_recursive_tree.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activerecord', '>= 5.0.0', '< 6.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'database_cleaner', '~> 1.5.0'
+  spec.add_development_dependency 'database_cleaner', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec-rails', '~> 3.5.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.3.10'
+  spec.add_development_dependency 'rspec-rails', '~> 3.5'
+  spec.add_development_dependency 'sqlite3', '~> 1.3'
 end

data/lib/acts_as_recursive_tree/builders/relation_builder.rb

@@ -120,7 +120,8 @@ module ActsAsRecursiveTree
       end
 
       def apply_query_opts_condition(relation)
-        return relation unless condition.present?
+        # check with nil? and not #present?/#blank? which will execute the query
+        return relation if condition.nil?
         relation.merge(condition)
       end
 

data/lib/acts_as_recursive_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRecursiveTree
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: '1.3'
 description: "\n  This is a ruby gem that provides drop in replacement for acts_as_tree
   but makes use of SQL recursive statement. Be sure to have a DBMS that supports recursive
   queries when using this gem (e.g. PostgreSQL or SQLite). "
@@ -180,3 +180,4 @@ test_files:
 - spec/model/relation_spec.rb
 - spec/spec_helper.rb
 - spec/values_spec.rb
+has_rdoc: