closure_tree 6.5.0 → 7.3.0

data/lib/closure_tree/support_flags.rb

@@ -17,10 +17,7 @@ module ClosureTree
     end
 
     def order_is_numeric?
-      # The table might not exist yet (in the case of ActiveRecord::Observer use, see issue 32)
-      return false if !order_option? || !model_class.table_exists?
-      c = model_class.columns_hash[order_column]
-      c && c.type == :integer
+      options[:numeric_order]
     end
 
     def subclass?

data/lib/closure_tree/version.rb

@@ -1,3 +1,3 @@
 module ClosureTree
-  VERSION = Gem::Version.new('6.5.0')
+  VERSION = Gem::Version.new('7.3.0')
 end

data/lib/generators/closure_tree/migration_generator.rb

@@ -1,5 +1,6 @@
 require 'closure_tree/active_record_support'
 require 'forwardable'
+require 'rails/generators'
 require 'rails/generators/active_record'
 require 'rails/generators/named_base'
 
@@ -41,6 +42,13 @@ module ClosureTree
         end
       end
 
+      def migration_version
+        major = ActiveRecord::VERSION::MAJOR
+        if major >= 5
+          "[#{major}.#{ActiveRecord::VERSION::MINOR}]"
+        end
+      end
+
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end

data/lib/generators/closure_tree/templates/create_hierarchies_table.rb.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :<%= migration_name %>, id: false do |t|
       t.<%= primary_key_type %> :ancestor_id, null: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 7.3.0
 platform: ruby
 authors:
 - Matthew McEachen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,30 +16,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.10
 - !ruby/object:Gem::Dependency
   name: with_advisory_lock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-instafail
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: rspec-instafail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,9 +185,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
@@ -139,13 +195,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- _config.yml
+- bin/appraisal
+- bin/rake
+- bin/rspec
 - closure_tree.gemspec
-- gemfiles/activerecord_4.2.gemfile
-- gemfiles/activerecord_5.0.gemfile
-- gemfiles/activerecord_5.0_foreigner.gemfile
-- gemfiles/activerecord_edge.gemfile
-- img/example.png
-- img/preorder.png
 - lib/closure_tree.rb
 - lib/closure_tree/active_record_support.rb
 - lib/closure_tree/configuration.rb
@@ -170,39 +224,12 @@ files:
 - lib/generators/closure_tree/templates/config.rb
 - lib/generators/closure_tree/templates/create_hierarchies_table.rb.erb
 - mktree.rb
-- spec/cache_invalidation_spec.rb
-- spec/cuisine_type_spec.rb
-- spec/db/database.yml
-- spec/db/models.rb
-- spec/db/schema.rb
-- spec/fixtures/tags.yml
-- spec/generators/migration_generator_spec.rb
-- spec/has_closure_tree_root_spec.rb
-- spec/hierarchy_maintenance_spec.rb
-- spec/label_spec.rb
-- spec/matcher_spec.rb
-- spec/metal_spec.rb
-- spec/model_spec.rb
-- spec/namespace_type_spec.rb
-- spec/parallel_spec.rb
-- spec/spec_helper.rb
-- spec/support/database.rb
-- spec/support/database_cleaner.rb
-- spec/support/exceed_query_limit.rb
-- spec/support/hash_monkey_patch.rb
-- spec/support/query_counter.rb
-- spec/support/sqlite3_with_advisory_lock.rb
-- spec/support_spec.rb
-- spec/tag_examples.rb
-- spec/tag_spec.rb
-- spec/user_spec.rb
-- spec/uuid_tag_spec.rb
 - tests.sh
 homepage: http://mceachen.github.io/closure_tree/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,36 +244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Easily and efficiently make your ActiveRecord model support hierarchies
-test_files:
-- spec/cache_invalidation_spec.rb
-- spec/cuisine_type_spec.rb
-- spec/db/database.yml
-- spec/db/models.rb
-- spec/db/schema.rb
-- spec/fixtures/tags.yml
-- spec/generators/migration_generator_spec.rb
-- spec/has_closure_tree_root_spec.rb
-- spec/hierarchy_maintenance_spec.rb
-- spec/label_spec.rb
-- spec/matcher_spec.rb
-- spec/metal_spec.rb
-- spec/model_spec.rb
-- spec/namespace_type_spec.rb
-- spec/parallel_spec.rb
-- spec/spec_helper.rb
-- spec/support/database.rb
-- spec/support/database_cleaner.rb
-- spec/support/exceed_query_limit.rb
-- spec/support/hash_monkey_patch.rb
-- spec/support/query_counter.rb
-- spec/support/sqlite3_with_advisory_lock.rb
-- spec/support_spec.rb
-- spec/tag_examples.rb
-- spec/tag_spec.rb
-- spec/user_spec.rb
-- spec/uuid_tag_spec.rb
+test_files: []

data/.travis.yml

@@ -1,29 +0,0 @@
-cache: bundler
-sudo: false
-language: ruby
-rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
-# these haven't been passing for a while:
-#  - jruby-head
-#  - rbx
-
-gemfile:
-  - gemfiles/activerecord_4.2.gemfile
-  - gemfiles/activerecord_5.0_foreigner.gemfile
-  - gemfiles/activerecord_5.0.gemfile
-  - gemfiles/activerecord_edge.gemfile
-
-env:
-  - DB=sqlite
-  - DB=mysql
-  - DB=postgresql
-
-script: WITH_ADVISORY_LOCK_PREFIX=$TRAVIS_JOB_ID bundle exec rake --trace spec:all
-
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/activerecord_edge.gemfile
-    - rvm: jruby-head
-    - rvm: rbx

data/gemfiles/activerecord_4.2.gemfile

@@ -1,19 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 4.2.0"
-
-platforms :ruby, :rbx do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_5.0.gemfile

@@ -1,19 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-
-platforms :ruby, :rbx do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_5.0_foreigner.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.0.0"
-gem "foreigner"
-
-platforms :ruby, :rbx do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"

data/gemfiles/activerecord_edge.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", :github => "rails/rails"
-gem "arel", :github => "rails/arel"
-
-platforms :ruby, :rbx do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-gemspec :path => "../"

data/spec/cache_invalidation_spec.rb

@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-
-describe 'cache invalidation', cache: true do
-  before do
-    Timecop.travel(10.seconds.ago) do
-      #create a long tree with 2 branch
-      @root = MenuItem.create(
-        name: SecureRandom.hex(10)
-      )
-      2.times do
-        parent = @root
-        10.times do
-          parent = parent.children.create(
-            name: SecureRandom.hex(10)
-          )
-        end
-      end
-      @first_leaf = MenuItem.leaves.first
-      @second_leaf = MenuItem.leaves.last
-    end
-  end
-
-  describe 'touch option' do
-    it 'should invalidate cache for all it ancestors' do
-      old_time_stamp = @first_leaf.ancestors.pluck(:updated_at)
-      @first_leaf.touch
-      new_time_stamp = @first_leaf.ancestors.pluck(:updated_at)
-      expect(old_time_stamp).to_not eq(new_time_stamp)
-    end
-
-    it 'should not invalidate cache for another branch' do
-      old_time_stamp = @second_leaf.updated_at
-      @first_leaf.touch
-      new_time_stamp = @second_leaf.updated_at
-      expect(old_time_stamp).to eq(new_time_stamp)
-    end
-  end
-end