closure_tree 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 417c1d78863c2c69db6e25b1fcf4e241c12287adf8db72953652072d36ee7f79
-  data.tar.gz: 45505a5b14cd3d9de2e0a823ef4805d27e9b27bc55fe3edbe1ae0aee05d62db1
+  metadata.gz: b0625b057493bad32e0431a7ac4cdba5abc8ee8ac29d09edab97953a68e670bd
+  data.tar.gz: b99a0700c15e962034444aa6393a774a20ea8fd996c312af1aadf2ad941d938f
 SHA512:
-  metadata.gz: c606867a720cc4dd7ddfc608ef0f61e5e06decd8623caa86938629d6089b7b86e3c95f68df864ba306f533d5287e6765559f023e18cc6157410852164fd1f4e0
-  data.tar.gz: 0bbd08988841abd22f52d706501d3556ea7cc52319ac212ea86ee1b82315aa83de2cb58327ac21cecaa465a53e9305d73fa0b0ab6031ad58f3e7d04acab4c5d3
+  metadata.gz: 630b296849c1c26b4129e21d29e502d02fa61daa481b1c518846817208ab92f6c8ff75c708a687f1068a2c4ce84ad60b7d711d58a4e03a2a53a2f2ee6c459a89
+  data.tar.gz: b40be25daf8524d0a9cd5776163ec5a0be247fdf20e7172e3b2bd64b4002591224de88f145c20dacf087c0ec11dbfbc24ca56ef4ec27415f29977e9f092d2ac3

data/.travis.yml

@@ -1,7 +1,8 @@
 cache: bundler
-sudo: false
 language: ruby
+
 rvm:
+  - 2.7.1
   - 2.6.3
   - 2.5.5
 
@@ -31,3 +32,5 @@ matrix:
   exclude:
   - rvm: 2.5.5
     gemfile: gemfiles/activerecord_edge.gemfile
+  - rvm: 2.7.1
+    gemfile: gemfiles/activerecord_4.2.gemfile

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 7.2.0
+- Ruby 2.7 support
+- Ordering raw SQL argument wrapped with Arel.sql
+
 ### 7.1.0
 Closure Tree is now tested against Rails 6.0
 - Directly require core_ext for String#strip_heredoc[PR 350](https://github.com/ClosureTree/closure_tree/pull/350) 

data/README.md

@@ -662,7 +662,7 @@ end
 
 Closure tree is [tested under every valid combination](http://travis-ci.org/#!/ClosureTree/closure_tree) of
 
-* Ruby 2.5, 2.6
+* Ruby 2.5, 2.6 and 2.7
 * ActiveRecord 4.2, 5.x and 6.0
 * PostgreSQL, MySQL, and SQLite. Concurrency tests are only run with MySQL and PostgreSQL.
 

data/lib/closure_tree.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'active_support/core_ext/string/strip'
 
 module ClosureTree
   extend ActiveSupport::Autoload

data/lib/closure_tree/finders.rb

@@ -34,7 +34,7 @@ module ClosureTree
     end
 
     def find_all_by_generation(generation_level)
-      s = _ct.base_class.joins(<<-SQL.strip_heredoc)
+      s = _ct.base_class.joins(<<-SQL.squish)
         INNER JOIN (
           SELECT descendant_id
           FROM #{_ct.quoted_hierarchy_table_name}
@@ -70,7 +70,7 @@ module ClosureTree
       end
 
       def leaves
-        s = joins(<<-SQL.strip_heredoc)
+        s = joins(<<-SQL.squish)
           INNER JOIN (
             SELECT ancestor_id
             FROM #{_ct.quoted_hierarchy_table_name}
@@ -113,7 +113,7 @@ module ClosureTree
       end
 
       def find_all_by_generation(generation_level)
-        s = joins(<<-SQL.strip_heredoc)
+        s = joins(<<-SQL.squish)
           INNER JOIN (
             SELECT #{primary_key} as root_id
             FROM #{_ct.quoted_table_name}
@@ -143,7 +143,7 @@ module ClosureTree
         last_joined_table = _ct.table_name
         path.reverse.each_with_index do |ea, idx|
           next_joined_table = "p#{idx}"
-          scope = scope.joins(<<-SQL.strip_heredoc)
+          scope = scope.joins(<<-SQL.squish)
             INNER JOIN #{_ct.quoted_table_name} #{ _ct.t_alias_keyword } #{next_joined_table}
               ON #{next_joined_table}.#{_ct.quoted_id_column_name} =
  #{connection.quote_table_name(last_joined_table)}.#{_ct.quoted_parent_column_name}

data/lib/closure_tree/hash_tree_support.rb

@@ -4,7 +4,7 @@ module ClosureTree
         # Deepest generation, within limit, for each descendant
         # NOTE: Postgres requires HAVING clauses to always contains aggregate functions (!!)
         having_clause = limit_depth ? "HAVING MAX(generations) <= #{limit_depth - 1}" : ''
-        generation_depth = <<-SQL.strip_heredoc
+        generation_depth = <<-SQL.squish
           INNER JOIN (
             SELECT descendant_id, MAX(generations) as depth
             FROM #{quoted_hierarchy_table_name}

data/lib/closure_tree/hierarchy_maintenance.rb

@@ -67,7 +67,7 @@ module ClosureTree
         delete_hierarchy_references unless (defined? @was_new_record) && @was_new_record
         hierarchy_class.create!(:ancestor => self, :descendant => self, :generations => 0)
         unless root?
-          _ct.connection.execute <<-SQL.strip_heredoc
+          _ct.connection.execute <<-SQL.squish
             INSERT INTO #{_ct.quoted_hierarchy_table_name}
               (ancestor_id, descendant_id, generations)
             SELECT x.ancestor_id, #{_ct.quote(_ct_id)}, x.generations + 1
@@ -94,7 +94,7 @@ module ClosureTree
         # It shouldn't affect performance of postgresql.
         # See http://dev.mysql.com/doc/refman/5.0/en/subquery-errors.html
         # Also: PostgreSQL doesn't support INNER JOIN on DELETE, so we can't use that.
-        _ct.connection.execute <<-SQL.strip_heredoc
+        _ct.connection.execute <<-SQL.squish
           DELETE FROM #{_ct.quoted_hierarchy_table_name}
           WHERE descendant_id IN (
             SELECT DISTINCT descendant_id

data/lib/closure_tree/model.rb

@@ -6,7 +6,7 @@ module ClosureTree
 
     included do
 
-      belongs_to :parent, nil, *_ct.belongs_to_with_optional_option(
+      belongs_to :parent, nil, **_ct.belongs_to_with_optional_option(
         class_name: _ct.model_class.to_s,
         foreign_key: _ct.parent_column_name,
         inverse_of: :children,
@@ -15,11 +15,11 @@ module ClosureTree
 
       order_by_generations = -> { Arel.sql("#{_ct.quoted_hierarchy_table_name}.generations ASC") }
 
-      has_many :children, *_ct.has_many_with_order_option(
+      has_many :children, *_ct.has_many_order_with_option, **{
         class_name: _ct.model_class.to_s,
         foreign_key: _ct.parent_column_name,
         dependent: _ct.options[:dependent],
-        inverse_of: :parent) do
+        inverse_of: :parent } do
           # We have to redefine hash_tree because the activerecord relation is already scoped to parent_id.
           def hash_tree(options = {})
             # we want limit_depth + 1 because we don't do self_and_descendants.
@@ -28,25 +28,21 @@ module ClosureTree
           end
         end
 
-      has_many :ancestor_hierarchies, *_ct.has_many_without_order_option(
+      has_many :ancestor_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
         class_name: _ct.hierarchy_class_name,
-        foreign_key: 'descendant_id',
-        order: order_by_generations)
+        foreign_key: 'descendant_id'
 
-      has_many :self_and_ancestors, *_ct.has_many_without_order_option(
+      has_many :self_and_ancestors, *_ct.has_many_order_without_option(order_by_generations),
         through: :ancestor_hierarchies,
-        source: :ancestor,
-        order: order_by_generations)
+        source: :ancestor
 
-      has_many :descendant_hierarchies, *_ct.has_many_without_order_option(
+      has_many :descendant_hierarchies, *_ct.has_many_order_without_option(order_by_generations),
         class_name: _ct.hierarchy_class_name,
-        foreign_key: 'ancestor_id',
-        order: order_by_generations)
+        foreign_key: 'ancestor_id'
 
-      has_many :self_and_descendants, *_ct.has_many_with_order_option(
+      has_many :self_and_descendants, *_ct.has_many_order_with_option(order_by_generations),
         through: :descendant_hierarchies,
-        source: :descendant,
-        order: order_by_generations)
+        source: :descendant
     end
 
     # Delegate to the Support instance on the class:

data/lib/closure_tree/numeric_deterministic_ordering.rb

@@ -51,7 +51,7 @@ module ClosureTree
 
       # If node is nil, order the whole tree.
       def _ct_sum_order_by(node = nil)
-        stats_sql = <<-SQL.strip_heredoc
+        stats_sql = <<-SQL.squish
           SELECT
             count(*) as total_descendants,
             max(generations) as max_depth
@@ -74,7 +74,7 @@ module ClosureTree
           raise ClosureTree::RootOrderingDisabledError.new("Root ordering is disabled on this model")
         end
 
-        join_sql = <<-SQL.strip_heredoc
+        join_sql = <<-SQL.squish
           JOIN #{_ct.quoted_hierarchy_table_name} anc_hier
             ON anc_hier.descendant_id = #{_ct.quoted_table_name}.#{_ct.quoted_id_column_name}
           JOIN #{_ct.quoted_table_name} anc

data/lib/closure_tree/numeric_order_support.rb

@@ -21,7 +21,7 @@ module ClosureTree
           ""
         end
         connection.execute 'SET @i = 0'
-        connection.execute <<-SQL.strip_heredoc
+        connection.execute <<-SQL.squish
           UPDATE #{quoted_table_name}
             SET #{quoted_order_column} = (@i := @i + 1) + #{minimum_sort_order_value.to_i - 1}
           WHERE #{where_eq(parent_column_name, parent_id)} #{min_where}
@@ -38,7 +38,7 @@ module ClosureTree
         else
           ""
         end
-        connection.execute <<-SQL.strip_heredoc
+        connection.execute <<-SQL.squish
           UPDATE #{quoted_table_name}
           SET #{quoted_order_column(false)} = t.seq + #{minimum_sort_order_value.to_i - 1}
           FROM (

data/lib/closure_tree/support.rb

@@ -80,20 +80,20 @@ module ClosureTree
     end
 
     def belongs_to_with_optional_option(opts)
-      [ActiveRecord::VERSION::MAJOR < 5 ? opts.except(:optional) : opts]
+      ActiveRecord::VERSION::MAJOR < 5 ? opts.except(:optional) : opts
     end
 
     # lambda-ize the order, but don't apply the default order_option
-    def has_many_without_order_option(opts)
-      [lambda { order(opts[:order].call) }, opts.except(:order)]
+    def has_many_order_without_option(order_by_opt)
+      [lambda { order(order_by_opt.call) }]
     end
 
-    def has_many_with_order_option(opts)
-      order_options = [opts[:order], order_by].compact
+    def has_many_order_with_option(order_by_opt=nil)
+      order_options = [order_by_opt, order_by].compact
       [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

@@ -80,7 +80,7 @@ module ClosureTree
     end
 
     def nulls_last_order_by
-      "-#{quoted_order_column} #{order_by_order(true)}"
+      Arel.sql "-#{quoted_order_column} #{order_by_order(true)}"
     end
 
     def order_by_order(reverse = false)

data/lib/closure_tree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure_tree
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Matthew McEachen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord