acts_as_recursive_tree 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f081d3db44eb5e8048b41f4117163982098cbf0da278245e21a9c3c72cf9524
-  data.tar.gz: ad000b2858a04df23fa3e50a4cb103a5c365f1387dd731b37e204cb3cce5fa48
+  metadata.gz: ea1cf22b09ed91c55f3388b8c794a3d820eb353896feca3df3cd16bfadd1e1fb
+  data.tar.gz: 55605034be64624f710175f2bc5714273f87e39124799fa4952dfb8425f9719d
 SHA512:
-  metadata.gz: c38a516a86f307e94be69e10808ced5692e5894e1e1502c7ab492d49439d32fdcf365b419b31a4cf9c636af1859da59f401c8fb3e4d9e9f6d875642405d7843e
-  data.tar.gz: 544488083842293d361e9f0c51b9553c856130bac0f21b3ece4e1316314d74c3474dfc4466c9fdb1fd7f78084b2746297fafd639c30250fc22ec928715d3cf2c
+  metadata.gz: 4e357b5809c1aa3c28789af9c81d6ac17739f04b40cec8e43a6ecb2b690ea69e9d3752aab7cf3579fb38042b387132c9e02ddf5b3facc54b1206b33eb184d194
+  data.tar.gz: 97a0ecfa41d4085f2a6a14a964be479747f4857af9400e9412699f6b7a21324c2af3632bba5831576ac08156fa8ff01ff06025e09c46b0e51fe64221b8a8bef6

data/.gitignore

@@ -14,4 +14,5 @@
 mkmf.log
 /.idea
 db.log
-test.sqlite3
+test.sqlite3
+/gemfiles

data/Appraisals

@@ -0,0 +1,26 @@
+appraise "ar-50" do
+    ruby '~> 2'
+
+    gem 'activerecord', '~> 5.0.0'
+    gem 'sqlite3', '~> 1.3.6'
+end
+
+appraise "ar-51" do
+    ruby '~> 2'
+
+    gem 'activerecord', '~> 5.1.0'
+end
+
+appraise "ar-52" do
+    ruby '~> 2'
+
+    gem 'activerecord', '~> 5.2.0'
+end
+
+appraise "ar-60" do
+    gem 'activerecord', '~> 6.0.0'
+end
+
+appraise "ar-61" do
+    gem 'activerecord', '~> 6.1.0'
+end

data/acts_as_recursive_tree.gemspec

@@ -6,8 +6,8 @@ require 'acts_as_recursive_tree/version'
 Gem::Specification.new do |spec|
   spec.name        = 'acts_as_recursive_tree'
   spec.version     = ActsAsRecursiveTree::VERSION
-  spec.authors     = ['Wolfgang Wedelich-John']
-  spec.email       = ['wolfgang.wedelich@1und1.de']
+  spec.authors     = ['Wolfgang Wedelich-John', 'Willem Mulder']
+  spec.email       = ['wolfgang.wedelich@1und1.de', '14mRh4X0r@gmail.com']
   spec.summary     = %q{Drop in replacement for acts_as_tree but using recursive queries}
   spec.description = %q{
   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). }
@@ -20,10 +20,11 @@ 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.1.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0.0', '< 6.2.0'
 
   spec.add_development_dependency 'database_cleaner', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.5'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'appraisal', '~> 2.4'
 end

data/lib/acts_as_recursive_tree/options/values.rb

@@ -38,6 +38,16 @@ module ActsAsRecursiveTree
         end
       end
 
+      class RangeValue < Base
+        def apply_to(attribute)
+          attribute.between(prepared_value)
+        end
+
+        def apply_negated_to(attribute)
+          attribute.not_between(prepared_value)
+        end
+      end
+
       class MultiValue < Base
         def apply_to(attribute)
           attribute.in(prepared_value)
@@ -62,6 +72,8 @@ module ActsAsRecursiveTree
           SingleValue
         when ::ActiveRecord::Relation
           Relation
+        when Range
+          RangeValue
         when Enumerable
           MultiValue
         when ::ActiveRecord::Base
@@ -74,4 +86,4 @@ module ActsAsRecursiveTree
       end
     end
   end
-end
+end

data/lib/acts_as_recursive_tree/version.rb

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

data/spec/db/database.rb

@@ -8,10 +8,16 @@ ActiveRecord::Migration.verbose = false
 
 ActiveRecord::Base.configurations = YAML::load(File.read("#{database_folder}/database.yml"))
 
-config = ActiveRecord::Base.configurations[database_adapter]
+if ActiveRecord.version >= Gem::Version.new('6.1.0')
+  config = ActiveRecord::Base.configurations.configs_for env_name: database_adapter, name: "primary"
+  database = config.database
+else
+  config = ActiveRecord::Base.configurations[database_adapter]
+  database = config["database"]
+end
 
 # remove database if present
-FileUtils.rm config['database'], force: true
+FileUtils.rm database, force: true
 
 ActiveRecord::Base.establish_connection(database_adapter.to_sym)
 ActiveRecord::Base.establish_connection(config)

data/spec/values_spec.rb

@@ -57,7 +57,7 @@ describe ActsAsRecursiveTree::Options::Values do
       let(:range) { 1..3 }
       subject(:value) { described_class.create(range) }
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::MultiValue }
+      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::RangeValue }
 
       it 'should apply_to' do
         expect(value.apply_to(attribute).to_sql).to end_with "BETWEEN #{range.begin} AND #{range.end}"
@@ -83,4 +83,4 @@ describe ActsAsRecursiveTree::Options::Values do
       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.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Wolfgang Wedelich-John
-autorequire: 
+- Willem Mulder
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +20,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +30,7 @@ dependencies:
         version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -86,11 +87,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.4'
 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). "
 email:
 - wolfgang.wedelich@1und1.de
+- 14mRh4X0r@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -99,6 +115,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -141,7 +158,7 @@ homepage: https://github.com/1and1/acts_as_recursive_tree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +173,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Drop in replacement for acts_as_tree but using recursive queries
 test_files: