awesome_nested_set 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5145938ca7a83f2c7f17b21792d96b43fc7c3e7ad90827af1e54bfc69b67d455
-  data.tar.gz: a7c20bb47b946a37e4946ca73577f292679e85624aeb03f75762be7b1e3bc3d7
+  metadata.gz: 2c26151d6850942daadf3035ba6cbb20399efbe348ae4522cf897bb319e6f0de
+  data.tar.gz: 667d9b0cbd91b90b7b7e8075481ba400c4ecbbd344b204908b2301d2daf690d7
 SHA512:
-  metadata.gz: b5af92810fd9120cbc84f7ea9f70b444a9331c4ac532e80b03a7c88a506f63a72e80d84ee0b536dfa8f2691c3351d922d55812149188670d45c3945c91a8a651
-  data.tar.gz: 9abe2f9c68010fe4f8105949afc7ecb9941d0897d89bdc0e994920f7a4dec41b2ee1e372e52bc947cbce8395eedec18546d34ce873ba2e9694a53e4b6ab7ea95
+  metadata.gz: 38de65793aacc7b68c542b16018a36bcfa9d65af9158d4126bc4ff25c0759531f8b9af605b2bf31894097935be97c15c6eee7ae72616ab56c6388844138558a3
+  data.tar.gz: 319065889f794e1eec94cb8b1e0113dce515da6430401a20910479e1dd763bce238a31ae36cd957f690564bd42458877367b2dd45c3dbe2c2689c2ae550187df

data/CHANGELOG

@@ -1,11 +1,19 @@
 Unreleased version
 
-* [Compare to 3.4.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.4.0...master)
+3.6.0
+* Support Rails 7.1 [Harshal Bhakta](https://github.com/harshalbhakta)
+* Improve ImpossibleMove error message [AlejandroFernandesAntunes](https://github.com/AlejandroFernandesAntunes)
+
+3.5.0
+* Support Rails 7.0.0 [Peter Berkenbosch](https://github.com/peterberkenbosch) and [Andrew Hampton](https://github.com/andrewhampton)
+* Make `order_column` option more flexible by removing explicit `=> :asc` [Regis Millet](https://github.com/Kulgar)
+* Updated README to use latest migration syntax [Justin MacCarthy](https://github.com/macarthy)
+* [Compare to 3.4.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.4.0...v3.5.0)
 
 3.4.0
 * Keep current scope when calling `roots` [Petrik de Heus](https://github.com/p8)
 * STI record now can update counter cache correctly [Issei Murasawa](http://github.com/issei-m)
-* [Compare to 3.3.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.3.1...master)
+* [Compare to 3.3.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.3.1...v3.4.0)
 
 3.3.1
 * Add belongs_to :polymorphic key option only when used [Filippo Liverani](https://github.com/filippoliverani)

data/README.md

@@ -1,12 +1,12 @@
 # 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) [![Security](https://hakiri.io/github/collectiveidea/awesome_nested_set/master.svg)](https://hakiri.io/github/collectiveidea/awesome_nested_set/master)
+[![CI](https://github.com/collectiveidea/awesome_nested_set/actions/workflows/ci.yml/badge.svg)](https://github.com/collectiveidea/awesome_nested_set/actions/workflows/ci.yml) [![Code Climate](https://codeclimate.com/github/collectiveidea/awesome_nested_set.svg)](https://codeclimate.com/github/collectiveidea/awesome_nested_set)
 
 
 Awesome Nested Set is an implementation of the nested set pattern for ActiveRecord models.
 It is a replacement for acts_as_nested_set and BetterNestedSet, but more awesome.
 
-Version 3.2 supports Rails 6, 3.1 supports Rails 5 & 4. Version 2 supports Rails 3. 
+Older versions: Version 3.2 supports Rails 6, 3.1 supports Rails 5 & 4. Version 2 supports Rails 3. 
 Gem versions prior to 2.0 support Rails 2.
 
 ## What makes this so awesome?
@@ -32,22 +32,19 @@ function properly.
 
 ```ruby
 class CreateCategories < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :categories do |t|
       t.string :name
-      t.integer :parent_id, :null => true, :index => true
-      t.integer :lft, :null => false, :index => true
-      t.integer :rgt, :null => false, :index => true
+      t.integer :parent_id, null: true, index: true
+      t.integer :lft, null: false, index: true
+      t.integer :rgt, null: false, index: true
 
       # optional fields
-      t.integer :depth, :null => false, :default => 0
-      t.integer :children_count, :null => false, :default => 0
+      t.integer :depth, null: false, default: 0
+      t.integer :children_count, null: false, default: 0
+      t.timestamps
     end
   end
-
-  def self.down
-    drop_table :categories
-  end
 end
 ```
 

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -87,7 +87,7 @@ module CollectiveIdea #:nodoc:
           ) if acts_as_nested_set_options[ar_callback]
         end
 
-        has_many :children, -> { order(order_column_name => :asc) },
+        has_many :children, -> { order(order_column_name) },
                  **has_many_children_options
       end
 

data/lib/awesome_nested_set/helper.rb

@@ -12,8 +12,8 @@ module CollectiveIdea #:nodoc:
         #
         # == Params
         #  * +class_or_item+ - Class name or top level times
-        #  * +mover+ - The item that is being move, used to exlude impossible moves
-        #  * +&block+ - a block that will be used to display: { |item| ... item.name }
+        #  * +mover+ - The item that is being move, used to exclude impossible moves
+        #  * +&block+ - a block that will be used to display: { |item| ... item.name }
         #
         # == Usage
         #

data/lib/awesome_nested_set/model/prunable.rb

@@ -47,8 +47,13 @@ module CollectiveIdea #:nodoc:
             elsif acts_as_nested_set_options[:dependent] == :restrict_with_error
               unless leaf?
                 record = self.class.human_attribute_name(:children).downcase
-                errors.add(:base, :"restrict_dependent_destroy.#{Rails::VERSION::MAJOR < 5 ? 'many' : 'has_many'}", record: record)
-                return false
+                if Rails::VERSION::MAJOR < 5
+                  errors.add(:base, :"restrict_dependent_destroy.many", record: record)
+                  return false
+                else
+                  errors.add(:base, :"restrict_dependent_destroy.has_many", record: record)
+                  throw :abort
+                end
               end
               return true
              elsif acts_as_nested_set_options[:dependent] == :nullify

data/lib/awesome_nested_set/model.rb

@@ -98,7 +98,7 @@ module CollectiveIdea #:nodoc:
           private
 
           def scope_order_from_options(options)
-            options.fetch(:order, { order_column_name => :asc })
+            options.fetch(:order, order_column_name)
           end
         end # end class methods
 

data/lib/awesome_nested_set/move.rb

@@ -129,7 +129,9 @@ module CollectiveIdea #:nodoc:
 
         def prevent_impossible_move
           if !root && !instance.move_possible?(target)
-            raise ImpossibleMove, "Impossible move, target node cannot be inside moved tree."
+            error_msg = "Impossible move, target node (#{target.class.name},ID: #{target.id}) 
+              cannot be inside moved tree (#{instance.class.name},ID: #{instance.id})."
+            raise ImpossibleMove, error_msg
           end
         end
 

data/lib/awesome_nested_set/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AwesomeNestedSet
-  VERSION = '3.4.0' unless defined?(::AwesomeNestedSet::VERSION)
+  VERSION = '3.6.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.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -9,34 +9,8 @@ authors:
 - Philip Arndt
 autorequire:
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
-  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMjAwNTEwMjIxOTQ2WhcNMjEwNTEwMjIx
-  OTQ2WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
-  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDT+JzHYPGMYJt9ct2DCsbIymn1uJJp
-  HnDkQESfsGe40jTC90oF2iVbVOkaacNc1N3CSWUZvZjuygUuS86P6/kpBILGdO2+
-  bkXXKtfGC2YGGx9TdNLpCb4925vQHvdFeKXGpQDZdDw1SNC6zraZou47CvOE1cl2
-  Bp+1QMZuGRZ4+5CzOEWDWurjqce3O1jUEbyBB7z5H0h/YEaxfXipxhL1Dhi0sgkH
-  qP/e6SxzifdifdZCksJFQ06a1ji9hJY6eM23qbv/aaluVHAZSVBAQBS7rYniLo+N
-  G4vpFhoubQO5u8UluUtCaPUpI/qOvVcSaZn3ZkzlMwC8b1RwAeXBQmtFE2wnrv2i
-  ovTwoN7rHchwhgaHbkuFh4Wr92wGbrWL7J+X8rWKk1f8RF4kvtNE/NA6YrkxTpVh
-  QMyDmekt7rTxvcq2NneLGroWIUVCx/JID+Jw492LKQ6Sl1/P2TRzdEDtqZAZL0gt
-  xlWeMUfGG2D/gLnhs5qnaFaWQwGTmBnTgHcCAwEAAaNxMG8wCQYDVR0TBAIwADAL
-  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEqtAyQVxPgKsrgoTQ1YmaIu/fmvMBoGA1Ud
-  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
-  aW8wDQYJKoZIhvcNAQELBQADggGBALu2HM50B8xqlAXkCwavJDvWWtV9pG1igFUg
-  friZRWprUQ5nTaNmAd8p8qbJQwaIK2gt+DfYWfB9LtKnQTfbhLRBbmJ7zYw8LjKY
-  PwCs4RWjDAiuyCO3ppfsz+1bsMUXPLgWlaUkXsUy3nr2NruEFTO9zu3wGYQQ93Tt
-  vYSHOnP35UB4QjsjNrOO7FBaQfy6O909PP+GnVcJ62s9c26voJz63RSolwY7Jydw
-  XUlG68jjJKSoDHRzVTmNB7sX8rs8P2kvYkpIUXPHyls3mWBWjBWbdEYWESZrxI2x
-  dS7jY3AnfqhvsWra2pSREb2IDqPnJrHVOejnEI/zuuufUxLwDx3AC6SMdsyWkZ7V
-  9OmLt2rg75Sct6h2220lO5ySqYtqAXuOMBDGv5L0zLalx1g8LACA7uILTKVWh8B8
-  Hsej0MQ3drCB1eA4c9OXdCUQJnY2aLTq3uNvTbZvoTgWK55eq3KLBJ4zzoKZ4tBX
-  /HIFI/fEwYlI1Ji3oikUrHkc4rWgaQ==
-  -----END CERTIFICATE-----
-date: 2021-02-22 00:00:00.000000000 Z
+cert_chain: []
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -47,7 +21,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +31,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -72,26 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        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.5.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +94,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -188,7 +142,7 @@ files:
 - lib/awesome_nested_set/set_validator.rb
 - lib/awesome_nested_set/tree.rb
 - lib/awesome_nested_set/version.rb
-homepage: http://github.com/collectiveidea/awesome_nested_set
+homepage: https://github.com/collectiveidea/awesome_nested_set
 licenses:
 - MIT
 metadata: {}
@@ -211,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
 summary: An awesome nested set implementation for Active Record

metadata.gz.sig

@@ -1,4 +0,0 @@
-~� �y���Z<v��R��C;�\����uy���;�kh����f�3����\l�S^�����=��Xu!�`�(9ʈ,&��q���nM1�H����wu3C��D��U&���,�>f�/�o�a�g
-�
-C�
-L+�!��l+FAy��o�V�R���O}b�ST��mx�|8;Jl�n����9�L!��\����o9{���L�F����z�xg�s��=M�3��_�`9+8X$~F�	zNz1����