acts_as_recursive_tree 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa1a901a4881db96a5aff4515cb0fe5f5b52d8713c7277aa67b4c5e3ffba70d4
-  data.tar.gz: 5201f9c51c39a944b2fcb7e8abafe24d07722870f2545cf0cfb1116a46567238
+  metadata.gz: 1f081d3db44eb5e8048b41f4117163982098cbf0da278245e21a9c3c72cf9524
+  data.tar.gz: ad000b2858a04df23fa3e50a4cb103a5c365f1387dd731b37e204cb3cce5fa48
 SHA512:
-  metadata.gz: '028d295a1d44a545798862a602448f635dd854bc63373d654ebaa217b41d8fded8327d6c10d0d64a566d7fd96beef3430261f66a135bdb1d7484cbcd25d3cae7'
-  data.tar.gz: 0a0746c45165e981ef5965bb751d5bfc88ac8ffdb07edc898799b4fa781a2f302d12c57b4ee2582e41c8b5c439d9c50b0019aa60f0b21a270f8388911dcc1939
+  metadata.gz: c38a516a86f307e94be69e10808ced5692e5894e1e1502c7ab492d49439d32fdcf365b419b31a4cf9c636af1859da59f401c8fb3e4d9e9f6d875642405d7843e
+  data.tar.gz: 544488083842293d361e9f0c51b9553c856130bac0f21b3ece4e1316314d74c3474dfc4466c9fdb1fd7f78084b2746297fafd639c30250fc22ec928715d3cf2c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### Version 2.2.0
+- Rails 6.0 support
+
 ### Version 2.1.1
 - Enabled subselect query when using depth
 - new QueryOption query_strategy for forcing a specific strategy (:join, :subselect)

data/acts_as_recursive_tree.gemspec

@@ -20,9 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files            = spec.files.grep(%r{^spec/})
   spec.require_paths         = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '>= 5.0.0', '< 6.0.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0.0', '< 6.1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'database_cleaner', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.5'

data/lib/acts_as_recursive_tree/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRecursiveTree
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/spec/builders_spec.rb

@@ -20,12 +20,14 @@ end
 
 shared_examples 'basic recursive examples' do
   it { is_expected.to start_with "SELECT \"#{model_class.table_name}\".* FROM \"#{model_class.table_name}\"" }
+
   it { is_expected.to match /WHERE "#{model_class.table_name}"."#{model_class.primary_key}" = #{model_id}/ }
+
   it { is_expected.to match /WITH RECURSIVE "#{builder.travers_loc_table.name}" AS/ }
+
   it { is_expected.to match /SELECT "#{model_class.table_name}"."#{model_class.primary_key}", "#{model_class.table_name}"."#{model_class._recursive_tree_config.parent_key}", 0 AS recursive_depth FROM "#{model_class.table_name}"/ }
+
   it { is_expected.to match /SELECT "#{model_class.table_name}"."#{model_class.primary_key}", "#{model_class.table_name}"."#{model_class._recursive_tree_config.parent_key}", \("#{builder.travers_loc_table.name}"."recursive_depth" \+ 1\) AS recursive_depth FROM "#{model_class.table_name}"/ }
-  it { is_expected.to match /#{Regexp.escape(builder.travers_loc_table.project(Arel.star).to_sql)}/ }
-  it { is_expected.to match /"#{model_class.table_name}"."#{model_class.primary_key}" = "#{builder.recursive_temp_table.name}"."#{model_class.primary_key}"/ }
 end
 
 shared_examples 'build recursive query' do
@@ -70,6 +72,7 @@ shared_examples 'descendant query' do
   include_context 'base_setup'
 
   it { is_expected.to match /"#{model_class.table_name}"."#{model_class._recursive_tree_config.parent_key}" = "#{builder.travers_loc_table.name}"."#{model_class.primary_key}"/ }
+  it { is_expected.to match /#{Regexp.escape(builder.travers_loc_table.project(builder.travers_loc_table[model_class.primary_key]).to_sql)}/ }
 end
 
 shared_context 'context with ordering' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -170,8 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Drop in replacement for acts_as_tree but using recursive queries