acts_as_recursive_tree 2.1.0 → 3.0.0

data/spec/values_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 shared_examples 'single values' do
@@ -5,11 +7,11 @@ shared_examples 'single values' do
 
   it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::SingleValue }
 
-  it 'should apply_to' do
+  it 'apply_toes' do
     expect(value.apply_to(attribute).to_sql).to end_with " = #{single_value}"
   end
 
-  it 'should apply_negated_to' do
+  it 'apply_negated_toes' do
     expect(value.apply_negated_to(attribute).to_sql).to end_with " != #{single_value}"
   end
 end
@@ -19,8 +21,8 @@ describe ActsAsRecursiveTree::Options::Values do
   let(:attribute) { table['test_attr'] }
 
   context 'invalid agurment' do
-    it 'should raise exception' do
-      expect{described_class.create(nil)}.to raise_exception /is not supported/
+    it 'raises exception' do
+      expect { described_class.create(nil) }.to raise_exception(/is not supported/)
     end
   end
 
@@ -34,53 +36,55 @@ describe ActsAsRecursiveTree::Options::Values do
     it_behaves_like 'single values' do
       let(:value_obj) { Node.new(id: single_value) }
     end
-
   end
 
   context 'multi value' do
     context 'Array' do
-      let(:array) { [1, 2, 3] }
       subject(:value) { described_class.create(array) }
 
+      let(:array) { [1, 2, 3] }
+
       it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::MultiValue }
 
-      it 'should apply_to' do
+      it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to end_with " IN (#{array.join(', ')})"
       end
 
-      it 'should apply_negated_to' do
+      it 'apply_negated_toes' do
         expect(value.apply_negated_to(attribute).to_sql).to end_with " NOT IN (#{array.join(', ')})"
       end
     end
 
     context 'Range' do
-      let(:range) { 1..3 }
       subject(:value) { described_class.create(range) }
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::MultiValue }
+      let(:range) { 1..3 }
+
+      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::RangeValue }
 
-      it 'should apply_to' do
+      it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to end_with "BETWEEN #{range.begin} AND #{range.end}"
       end
 
-      it 'should apply_negated_to' do
-        expect(value.apply_negated_to(attribute).to_sql).to match /< #{range.begin} OR.* > #{range.end}/
+      it 'apply_negated_toes' do
+        expect(value.apply_negated_to(attribute).to_sql).to match(/< #{range.begin} OR.* > #{range.end}/)
       end
     end
 
     context 'Relation' do
-      let(:relation) { Node.where(name: 'test') }
       subject(:value) { described_class.create(relation, OpenStruct.new(primary_key: :id)) }
 
+      let(:relation) { Node.where(name: 'test') }
+
       it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::Relation }
 
-      it 'should apply_to' do
-        expect(value.apply_to(attribute).to_sql).to match /IN \(SELECT.*\)/
+      it 'apply_toes' do
+        expect(value.apply_to(attribute).to_sql).to match(/IN \(SELECT.*\)/)
       end
 
-      it 'should apply_negated_to' do
-        expect(value.apply_negated_to(attribute).to_sql).to match /NOT IN \(SELECT.*\)/
+      it 'apply_negated_toes' do
+        expect(value.apply_negated_to(attribute).to_sql).to match(/NOT IN \(SELECT.*\)/)
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_recursive_tree
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
+- Willem Mulder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,34 +17,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -62,30 +97,72 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -104,35 +181,43 @@ description: "\n  This is a ruby gem that provides drop in replacement for acts_
   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). "
 email:
-- wolfgang.wedelich@1und1.de
+- wolfgang.wedelich@ionos.com
+- 14mRh4X0r@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/rubygem.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - acts_as_recursive_tree.gemspec
+- gemfiles/ar_52.gemfile
+- gemfiles/ar_60.gemfile
+- gemfiles/ar_61.gemfile
 - lib/acts_as_recursive_tree.rb
 - lib/acts_as_recursive_tree/acts_macro.rb
 - lib/acts_as_recursive_tree/associations.rb
-- lib/acts_as_recursive_tree/builders.rb
 - lib/acts_as_recursive_tree/builders/ancestors.rb
 - lib/acts_as_recursive_tree/builders/descendants.rb
 - lib/acts_as_recursive_tree/builders/leaves.rb
 - lib/acts_as_recursive_tree/builders/relation_builder.rb
-- lib/acts_as_recursive_tree/builders/strategy.rb
-- lib/acts_as_recursive_tree/builders/strategy/join.rb
-- lib/acts_as_recursive_tree/builders/strategy/subselect.rb
+- lib/acts_as_recursive_tree/builders/strategies.rb
+- lib/acts_as_recursive_tree/builders/strategies/ancestor.rb
+- lib/acts_as_recursive_tree/builders/strategies/descendant.rb
+- lib/acts_as_recursive_tree/builders/strategies/join.rb
+- lib/acts_as_recursive_tree/builders/strategies/subselect.rb
 - lib/acts_as_recursive_tree/config.rb
 - lib/acts_as_recursive_tree/model.rb
-- lib/acts_as_recursive_tree/options.rb
 - lib/acts_as_recursive_tree/options/depth_condition.rb
 - lib/acts_as_recursive_tree/options/query_options.rb
 - lib/acts_as_recursive_tree/options/values.rb
@@ -152,7 +237,9 @@ files:
 homepage: https://github.com/1and1/acts_as_recursive_tree
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/1and1/acts_as_recursive_tree/issues
+  changelog_uri: https://github.com/1and1/acts_as_recursive_tree/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -161,15 +248,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Drop in replacement for acts_as_tree but using recursive queries

data/lib/acts_as_recursive_tree/builders.rb

@@ -1,14 +0,0 @@
-module ActsAsRecursiveTree
-  module Builders
-    extend ActiveSupport::Autoload
-
-    autoload :Values
-    autoload :DepthCondition
-    autoload :QueryOptions
-    autoload :Strategy
-    autoload :RelationBuilder
-    autoload :Descendants
-    autoload :Ancestors
-    autoload :Leaves
-  end
-end

data/lib/acts_as_recursive_tree/options.rb

@@ -1,9 +0,0 @@
-module ActsAsRecursiveTree
-  module Options
-    extend ActiveSupport::Autoload
-
-    autoload :Values
-    autoload :DepthCondition
-    autoload :QueryOptions
-  end
-end