awesome_nested_set 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 158eb30c327a8fa16c990178bf3a8b27b92df7f3
-  data.tar.gz: 6dc79c6c67d4d4a87615d1627a066aef746612e2
+  metadata.gz: 886dba55e5efcba602756917fdd82ae57c3e6942
+  data.tar.gz: 0f17ad95fef44901498f7b21b2767b0b0e0d0259
 SHA512:
-  metadata.gz: c6816a36e5be6882f655779572f8174fce473e82c8b2b47a23402c72522132a061a8b3a29ad3f2d980b82b87f2536c69042ab1aa130a81f3618138ec2b2ea7ce
-  data.tar.gz: 35c3cf5f2cb9583c7d7c605a2209d5f3a8e4ed6538f914ee55da323f4d9f9eadb27494dfc6b77e67788d4eba49ab0aa0e7741731bb9341a83e43b759a233c817
+  metadata.gz: e52c139d7f15f8a9428ec22967c50899e9f31cdcbb301b59cdc322f796b2ce6ad51fa30e28e16cd975c76e73bc48c32e869ba24df06bad0a8e2a6e87b58169f7
+  data.tar.gz: 610280af1b3026696fd3980f7f6bb49d206ad255c770a9be9f0ab3372af455fa62c610cc8de3c68cfb6c8dcbd06431383a8082f8f9449157f668a7c13da8a6a9

data/CHANGELOG

@@ -1,5 +1,8 @@
+3.1.4
+* Add support for Rails 5.2 [John Hawthorn](https://github.com/jhawthorn) and [marocchino](https://github.com/marocchino)
+
 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)
 
 3.1.2
 * Make belongs_to relation optional again [Jan Matusz](https://marahin.pl/)

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 => :asc) },
                  has_many_children_options
       end
 

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 => :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,3 @@
 module AwesomeNestedSet
-  VERSION = '3.1.3' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.1.4' 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.1.4
 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: 2018-02-03 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: '5.3'
   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: '5.3'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An awesome nested set implementation for Active Record