awesome_nested_set 3.1.3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 158eb30c327a8fa16c990178bf3a8b27b92df7f3
-  data.tar.gz: 6dc79c6c67d4d4a87615d1627a066aef746612e2
+SHA256:
+  metadata.gz: c3ecf7f786a6b917601a6818b9ea57db89a2ed41f74e5053455ce1cb7f121229
+  data.tar.gz: 31ffd151ff36b304e8c89cdcb129bc52a63b8a500577adf775df4eb11ef216f5
 SHA512:
-  metadata.gz: c6816a36e5be6882f655779572f8174fce473e82c8b2b47a23402c72522132a061a8b3a29ad3f2d980b82b87f2536c69042ab1aa130a81f3618138ec2b2ea7ce
-  data.tar.gz: 35c3cf5f2cb9583c7d7c605a2209d5f3a8e4ed6538f914ee55da323f4d9f9eadb27494dfc6b77e67788d4eba49ab0aa0e7741731bb9341a83e43b759a233c817
+  metadata.gz: b64fdc6283aa35df65896df891124c89d305eb38e47f02fe151ff698dc4653570497839464205c74300ec05821107b5c2a6f04c48c5cb103b4df598609d8b606
+  data.tar.gz: 1f26c9f63c803266dbd07016a4bee0c3034af2b236b84a889dd9ee361e7f3bc3531dae49b7d474177e0fcc2cb782292d735625440d613b0f435506914a5ec227

data/CHANGELOG

@@ -1,11 +1,22 @@
+3.2.0
+* Add support for Rails 6.0 [Stefan Andersen](https://github.com/stfnndrsn) and [Damian Legawiec](https://github.com/damianlegawiec) and [Jonathan Tapia](https://github.com/jtapia) and [Alex](https://github.com/a-ta-ta)
+* [Compare to 3.1.4](https://github.com/collectiveidea/awesome_nested_set/compare/v3.1.4...v3.2.0)
+
+3.1.4
+* Add support for Rails 5.2 [John Hawthorn](https://github.com/jhawthorn) and [marocchino](https://github.com/marocchino)
+* [Compare to 3.1.3](https://github.com/collectiveidea/awesome_nested_set/compare/v3.1.3...v3.1.4)
+
 3.1.3
-* Add Rails 5.1 support [John Hawthorn](https://github.com/jhawthorn)
+* Add support for Rails 5.1 [John Hawthorn](https://github.com/jhawthorn)
+* [Compare to 3.1.2](https://github.com/collectiveidea/awesome_nested_set/compare/v3.1.2...v3.1.3)
 
 3.1.2
 * Make belongs_to relation optional again [Jan Matusz](https://marahin.pl/)
+* [Compare to 3.0.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.1.1...v3.1.2)
 
 3.1.1
 * Fix a reloading bug when using default scope [Krzysztof Rybka](https://github.com/krzysiek1507)
+* [Compare to 3.1.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.1.0...v3.1.1)
 
 3.1.0
 * Ensure that nested_set queries respect the model's default_scope. [oesgalha](https://github.com/oesgalha)
@@ -13,10 +24,12 @@
 * Drop support for ruby 1.9.3 [Krzysztof Rybka](https://github.com/krzysiek1507)
 * Fix .all_roots_valid? method when model is ordered by default [Adam Hodowany](https://github.com/hodak)
 * Reuse the current model's connection when available [Tim Bugai] [#322](https://github.com/collectiveidea/awesome_nested_set/pull/322)
+* [Compare to 3.0.3](https://github.com/collectiveidea/awesome_nested_set/compare/v3.0.3...v3.1.0)
 
 3.0.3
 * Add :nullify option to :dependent functionality to orphan children rather
 than destroy them.
+* [Compare to 3.0.2](https://github.com/collectiveidea/awesome_nested_set/compare/v3.0.2...v3.0.3)
 
 3.0.2
 * Fix `dependent: :restrict_with_exception` not allowing a delete to occur. [Brendan Kilfoil]

data/README.md

@@ -1,6 +1,6 @@
 # Awesome Nested Set
 
-[![Build Status](https://travis-ci.org/collectiveidea/awesome_nested_set.svg?branch=master)](https://travis-ci.org/collectiveidea/awesome_nested_set) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.svg)](https://codeclimate.com/github/collectiveidea/awesome_nested_set) [![Dependency Status](https://gemnasium.com/collectiveidea/awesome_nested_set.svg)](https://gemnasium.com/collectiveidea/awesome_nested_set) [![Security](https://hakiri.io/github/collectiveidea/awesome_nested_set/master.svg)](https://hakiri.io/github/collectiveidea/awesome_nested_set/master)
+[![Build Status](https://travis-ci.org/collectiveidea/awesome_nested_set.svg?branch=master)](https://travis-ci.org/collectiveidea/awesome_nested_set) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.svg)](https://codeclimate.com/github/collectiveidea/awesome_nested_set) [![Security](https://hakiri.io/github/collectiveidea/awesome_nested_set/master.svg)](https://hakiri.io/github/collectiveidea/awesome_nested_set/master)
 
 
 Awesome Nested Set is an implementation of the nested set pattern for ActiveRecord models.
@@ -178,6 +178,7 @@ class AddNestedToCategories < ActiveRecord::Migration
     add_column :categories, :children_count, :integer
 
     # This is necessary to update :lft and :rgt columns
+    Category.reset_column_information
     Category.rebuild!
   end
 

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -5,7 +5,7 @@ module CollectiveIdea #:nodoc:
   module Acts #:nodoc:
     module NestedSet #:nodoc:
 
-      # This acts provides Nested Set functionality. Nested Set is a smart way to implement
+      # This provides Nested Set functionality. Nested Set is a smart way to implement
       # an _ordered_ tree, with the added feature that you can select the children and all of their
       # descendants with a single query. The drawback is that insertion or move need some complex
       # sql queries. But everything is done here by this module!
@@ -15,8 +15,8 @@ module CollectiveIdea #:nodoc:
       #
       # == API
       #
-      # Methods names are aligned with acts_as_tree as much as possible to make replacment from one
-      # by another easier.
+      # Methods names are aligned with acts_as_tree as much as possible to make transition from one
+      # to another easier.
       #
       #   item.children.create(:name => "child1")
       #
@@ -87,7 +87,7 @@ module CollectiveIdea #:nodoc:
           ) if acts_as_nested_set_options[ar_callback]
         end
 
-        has_many :children, -> { order(quoted_order_column_full_name) },
+        has_many :children, -> { order(order_column_name => :asc) },
                  has_many_children_options
       end
 

data/lib/awesome_nested_set/columns.rb

@@ -23,7 +23,7 @@ module CollectiveIdea #:nodoc:
           acts_as_nested_set_options[:primary_column]
         end
 
-        def order_column
+        def order_column_name
           acts_as_nested_set_options[:order_column] || left_column_name
         end
 
@@ -60,7 +60,7 @@ module CollectiveIdea #:nodoc:
         end
 
         def quoted_order_column_name
-          model_connection.quote_column_name(order_column)
+          model_connection.quote_column_name(order_column_name)
         end
 
         def quoted_primary_key_column_full_name

data/lib/awesome_nested_set/model.rb

@@ -79,7 +79,7 @@ module CollectiveIdea #:nodoc:
           end
 
           def nested_set_scope(options = {})
-            options = {:order => quoted_order_column_full_name}.merge(options)
+            options = {:order => { order_column_name => :asc }}.merge(options)
 
             where(options[:conditions]).order(options.delete(:order))
           end
@@ -183,7 +183,7 @@ module CollectiveIdea #:nodoc:
 
         def right_most_node
           @right_most_node ||= nested_set_scope_without_default_scope(
-            :order => "#{quoted_right_column_full_name} desc"
+            :order => {right_column_name => :desc}
           ).first
         end
 

data/lib/awesome_nested_set/model/prunable.rb

@@ -52,7 +52,7 @@ module CollectiveIdea #:nodoc:
               end
               return true
              elsif acts_as_nested_set_options[:dependent] == :nullify
-               descendants.update_all(parent_id: nil)
+               descendants.update_all(parent_column_name => nil)
              else
               descendants.delete_all
             end

data/lib/awesome_nested_set/model/rebuildable.rb

@@ -32,7 +32,11 @@ module CollectiveIdea
           end
 
           def order_for_rebuild
-            "#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, #{primary_key}"
+            {
+              left_column_name => :asc,
+              right_column_name => :asc,
+              primary_key => :asc
+            }
           end
         end
 

data/lib/awesome_nested_set/model/validatable.rb

@@ -20,7 +20,7 @@ module CollectiveIdea
               select("#{scope_string}#{column}, COUNT(#{column}) as _count").
                 group("#{scope_string}#{column}", quoted_primary_key_column_full_name).
                 having("COUNT(#{column}) > 1").
-                order(quoted_primary_key_column_full_name).
+                order(primary_column_name => :asc).
                 first.nil?
             end
           end

data/lib/awesome_nested_set/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AwesomeNestedSet
-  VERSION = '3.1.3' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.2.0' unless defined?(::AwesomeNestedSet::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +21,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -47,21 +47,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
-  name: pry-nav
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,67 +81,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
 description: An awesome nested set implementation for Active Record
 email: info@collectiveidea.com
 executables: []
@@ -185,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An awesome nested set implementation for Active Record