acts_as_recursive_tree 2.0.1 → 2.0.2

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 (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -0
  3. data/acts_as_recursive_tree.gemspec +3 -3
  4. data/lib/acts_as_recursive_tree/builders/relation_builder.rb +2 -1
  5. data/lib/acts_as_recursive_tree/version.rb +1 -1
  6. metadata +9 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ffd168c454a68c9fdc6ae7fb32b705bdaba8964f
4
- data.tar.gz: 2367e9b864ee904abc49198936f5afb59bb2d46b
3
+ metadata.gz: 064f977e7f4e77083f3a967fce16c6c47fc29ee9
4
+ data.tar.gz: 2b8e5949381e248c33034868ee816126367e19bd
5
5
  SHA512:
6
- metadata.gz: 4c4e359bbc497ff24f6ba6e8ccfbd846ce17178c0842850d3e3a0bee43e7d15cd8cd6a0a40072aa74d48e538d4a4dc892be743a677c34c39b7280348588ed74e
7
- data.tar.gz: 12c7f7bac25c0547573d66bc8efa7b6e6ea4e3815f3490c929b8551886512c2cef6619f48a954d02a89518a79ac4da412d66fb69973b8321245d9bd7049952ba
6
+ metadata.gz: 91e3f8cdf111f4efed5618391d806ccab6e5bdb2c8e5325862292e23a67d990aaa86de199dfffabade3f0ee6a18ba501d9032e9a700b9dba567eb75e0d6265ec
7
+ data.tar.gz: cb6576280d42539dc013e96b07414cae5ad49b416a28518c742731fb43697ec9fc997da237cf8f0cbc5f53c01bf530fd37353bb3108cf9e1e06313c2174aecc9
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ ### Version 2.0.2
2
+ - fix for condition relation was executed before merging
3
+
1
4
  ### Version 2.0.1
2
5
  - fix for parent_type_column applied not properly
3
6
 
data/acts_as_recursive_tree.gemspec CHANGED
@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
23
23
  spec.add_runtime_dependency 'activerecord', '>= 5.0.0', '< 6.0.0'
24
24
 
25
25
  spec.add_development_dependency 'bundler', '~> 1.7'
26
- spec.add_development_dependency 'database_cleaner', '~> 1.5.0'
26
+ spec.add_development_dependency 'database_cleaner', '~> 1.5'
27
27
  spec.add_development_dependency 'rake', '~> 10.0'
28
- spec.add_development_dependency 'rspec-rails', '~> 3.5.0'
29
- spec.add_development_dependency 'sqlite3', '~> 1.3.10'
28
+ spec.add_development_dependency 'rspec-rails', '~> 3.5'
29
+ spec.add_development_dependency 'sqlite3', '~> 1.3'
30
30
  end
data/lib/acts_as_recursive_tree/builders/relation_builder.rb CHANGED
@@ -120,7 +120,8 @@ module ActsAsRecursiveTree
120
120
  end
121
121
 
122
122
  def apply_query_opts_condition(relation)
123
- return relation unless condition.present?
123
+ # check with nil? and not #present?/#blank? which will execute the query
124
+ return relation if condition.nil?
124
125
  relation.merge(condition)
125
126
  end
126
127
 
data/lib/acts_as_recursive_tree/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ActsAsRecursiveTree
2
- VERSION = '2.0.1'.freeze
2
+ VERSION = '2.0.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: acts_as_recursive_tree
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wolfgang Wedelich-John
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-01-23 00:00:00.000000000 Z
11
+ date: 2018-02-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -50,14 +50,14 @@ dependencies:
50
50
  requirements:
51
51
  - - "~>"
52
52
  - !ruby/object:Gem::Version
53
- version: 1.5.0
53
+ version: '1.5'
54
54
  type: :development
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: 1.5.0
60
+ version: '1.5'
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: rake
63
63
  requirement: !ruby/object:Gem::Requirement
@@ -78,28 +78,28 @@ dependencies:
78
78
  requirements:
79
79
  - - "~>"
80
80
  - !ruby/object:Gem::Version
81
- version: 3.5.0
81
+ version: '3.5'
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - "~>"
87
87
  - !ruby/object:Gem::Version
88
- version: 3.5.0
88
+ version: '3.5'
89
89
  - !ruby/object:Gem::Dependency
90
90
  name: sqlite3
91
91
  requirement: !ruby/object:Gem::Requirement
92
92
  requirements:
93
93
  - - "~>"
94
94
  - !ruby/object:Gem::Version
95
- version: 1.3.10
95
+ version: '1.3'
96
96
  type: :development
97
97
  prerelease: false
98
98
  version_requirements: !ruby/object:Gem::Requirement
99
99
  requirements:
100
100
  - - "~>"
101
101
  - !ruby/object:Gem::Version
102
- version: 1.3.10
102
+ version: '1.3'
103
103
  description: "\n This is a ruby gem that provides drop in replacement for acts_as_tree
104
104
  but makes use of SQL recursive statement. Be sure to have a DBMS that supports recursive
105
105
  queries when using this gem (e.g. PostgreSQL or SQLite). "
@@ -180,3 +180,4 @@ test_files:
180
180
  - spec/model/relation_spec.rb
181
181
  - spec/spec_helper.rb
182
182
  - spec/values_spec.rb
183
+ has_rdoc: