closure_tree 6.6.0 → 7.0.0

data/lib/closure_tree/numeric_deterministic_ordering.rb

@@ -65,10 +65,15 @@ module ClosureTree
         node_score = "(1 + anc.#{_ct.quoted_order_column(false)}) * " +
           "power(#{h['total_descendants']}, #{h['max_depth'].to_i + 1} - #{depth_column})"
 
-        "sum(#{node_score})"
+        # We want the NULLs to be first in case we are not ordering roots and they have NULL order.
+        Arel.sql("SUM(#{node_score}) IS NULL DESC, SUM(#{node_score})")
       end
 
       def roots_and_descendants_preordered
+        if _ct.dont_order_roots
+          raise ClosureTree::RootOrderingDisabledError.new("Root ordering is disabled on this model")
+        end
+
         join_sql = <<-SQL.strip_heredoc
           JOIN #{_ct.quoted_hierarchy_table_name} anc_hier
             ON anc_hier.descendant_id = #{_ct.quoted_table_name}.#{_ct.quoted_id_column_name}
@@ -78,7 +83,7 @@ module ClosureTree
             SELECT descendant_id, max(generations) AS max_depth
             FROM #{_ct.quoted_hierarchy_table_name}
             GROUP BY descendant_id
-          ) AS depths ON depths.descendant_id = anc.#{_ct.quoted_id_column_name}
+          ) #{ _ct.t_alias_keyword } depths ON depths.descendant_id = anc.#{_ct.quoted_id_column_name}
         SQL
         joins(join_sql)
           .group("#{_ct.quoted_table_name}.#{_ct.quoted_id_column_name}")
@@ -113,6 +118,10 @@ module ClosureTree
     def add_sibling(sibling, add_after = true)
       fail "can't add self as sibling" if self == sibling
 
+      if _ct.dont_order_roots && parent.nil?
+        raise ClosureTree::RootOrderingDisabledError.new("Root ordering is disabled on this model")
+      end
+
       # Make sure self isn't dirty, because we're going to call reload:
       save
 

data/lib/closure_tree/numeric_order_support.rb

@@ -14,6 +14,7 @@ module ClosureTree
 
     module MysqlAdapter
       def reorder_with_parent_id(parent_id, minimum_sort_order_value = nil)
+        return if parent_id.nil? && dont_order_roots
         min_where = if minimum_sort_order_value
           "AND #{quoted_order_column} >= #{minimum_sort_order_value}"
         else
@@ -31,6 +32,7 @@ module ClosureTree
 
     module PostgreSQLAdapter
       def reorder_with_parent_id(parent_id, minimum_sort_order_value = nil)
+        return if parent_id.nil? && dont_order_roots
         min_where = if minimum_sort_order_value
           "AND #{quoted_order_column} >= #{minimum_sort_order_value}"
         else
@@ -56,6 +58,7 @@ module ClosureTree
 
     module GenericAdapter
       def reorder_with_parent_id(parent_id, minimum_sort_order_value = nil)
+        return if parent_id.nil? && dont_order_roots
         scope = model_class.
           where(parent_column_sym => parent_id).
           order(nulls_last_order_by)

data/lib/closure_tree/support.rb

@@ -22,7 +22,8 @@ module ClosureTree
         :parent_column_name => 'parent_id',
         :dependent => :nullify, # or :destroy or :delete_all -- see the README
         :name_column => 'name',
-        :with_advisory_lock => true
+        :with_advisory_lock => true,
+        :numeric_order => false
       }.merge(options)
       raise ArgumentError, "name_column can't be 'path'" if options[:name_column] == 'path'
       if order_is_numeric?
@@ -82,12 +83,15 @@ module ClosureTree
 
     # lambda-ize the order, but don't apply the default order_option
     def has_many_without_order_option(opts)
-        [lambda { order(opts[:order]) }, opts.except(:order)]
+      [lambda { order(opts[:order].call) }, opts.except(:order)]
     end
 
     def has_many_with_order_option(opts)
       order_options = [opts[:order], order_by].compact
-      [lambda { order(order_options) }, opts.except(:order)]
+      [lambda {
+        order_options = order_options.map { |o| o.is_a?(Proc) ? o.call : o }
+        order(order_options)
+      }, opts.except(:order)]
     end
 
     def ids_from(scope)

data/lib/closure_tree/support_attributes.rb

@@ -75,6 +75,10 @@ module ClosureTree
       options[:order]
     end
 
+    def dont_order_roots
+      options[:dont_order_roots] || false
+    end
+
     def nulls_last_order_by
       "-#{quoted_order_column} #{order_by_order(reverse = true)}"
     end
@@ -110,5 +114,10 @@ module ClosureTree
       prefix = include_table_name ? "#{quoted_table_name}." : ""
       "#{prefix}#{connection.quote_column_name(order_column)}"
     end
+
+    # table_name alias keyword , like "AS". When used on table name alias, Oracle Database don't support used 'AS'
+    def t_alias_keyword
+      (ActiveRecord::Base.connection.adapter_name.to_sym == :OracleEnhanced) ? "" : "AS"
+    end
   end
 end

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.6.0')
+  VERSION = Gem::Version.new('7.0.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.6.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2018-09-23 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: rspec-instafail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  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: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,12 +154,6 @@ files:
 - README.md
 - Rakefile
 - closure_tree.gemspec
-- gemfiles/activerecord_4.2.gemfile
-- gemfiles/activerecord_5.0.gemfile
-- gemfiles/activerecord_5.1.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,34 +178,6 @@ 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/pool_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:
@@ -219,36 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 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/pool_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/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.1.gemfile

@@ -1,19 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", "~> 5.1.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_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