awesome_nested_set 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ecf7f786a6b917601a6818b9ea57db89a2ed41f74e5053455ce1cb7f121229
-  data.tar.gz: 31ffd151ff36b304e8c89cdcb129bc52a63b8a500577adf775df4eb11ef216f5
+  metadata.gz: 70956fe8d08167ab96e67894222f423188919dcb05a5a607f33d3372b5c909db
+  data.tar.gz: cd34dc69edd00532c4cf8315263fb5f4b81c65ce02057600b514cf650bc5ff91
 SHA512:
-  metadata.gz: b64fdc6283aa35df65896df891124c89d305eb38e47f02fe151ff698dc4653570497839464205c74300ec05821107b5c2a6f04c48c5cb103b4df598609d8b606
-  data.tar.gz: 1f26c9f63c803266dbd07016a4bee0c3034af2b236b84a889dd9ee361e7f3bc3531dae49b7d474177e0fcc2cb782292d735625440d613b0f435506914a5ec227
+  metadata.gz: 60354ed14c223e08bdec1da6ed56c533d3247ffedc846bf11f5c54b6065e0f3ea886db0a19405eac0dfc30721dd417b8ae441e0a1432dea6eb5caa7dd45dab7f
+  data.tar.gz: 2ec0377f5fa405db532d6b7bb630d6225157d958e3cf868dabfcdec11536886ab83f809aa6443cfefa59c55f689cbe8ca123b78e845bd8cf233531a333f3bf31

data/CHANGELOG

@@ -1,3 +1,11 @@
+Unreleased version
+* [Compare to 3.2.1](https://github.com/collectiveidea/awesome_nested_set/compare/v3.2.1...master)
+
+3.2.1
+* Don't reload in after_save callback. [Petrik de Heus](https://github.com/p8)
+* Fix deprecation warning "Passing a range to `#in` is deprecated". [Konstantin Mochalov](https://github.com/kolen)
+* [Compare to 3.2.0](https://github.com/collectiveidea/awesome_nested_set/compare/v3.2.0...v3.2.1)
+
 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)

data/README.md

@@ -65,6 +65,7 @@ Run `rake rdoc` to generate the API docs and see [CollectiveIdea::Acts::NestedSe
 You can pass various options to `acts_as_nested_set` macro. Configuration options are:
 
 * `parent_column`: specifies the column name to use for keeping the position integer (default: parent_id)
+* `primary_column`: specifies the column name to use as the inverse of the parent column (default: id)
 * `left_column`: column name for left boundary data (default: lft)
 * `right_column`: column name for right boundary data (default: rgt)
 * `depth_column`: column name for the depth data default (default: depth)

data/lib/awesome_nested_set/awesome_nested_set.rb

@@ -25,8 +25,8 @@ module CollectiveIdea #:nodoc:
       #
       # * +:parent_column+ - specifies the column name to use for keeping the position integer (default: parent_id)
       # * +:primary_column+ - specifies the column name to use as the inverse of the parent column (default: id)
-      # * +:left_column+ - column name for left boundry data, default "lft"
-      # * +:right_column+ - column name for right boundry data, default "rgt"
+      # * +:left_column+ - column name for left boundary data, default "lft"
+      # * +:right_column+ - column name for right boundary data, default "rgt"
       # * +:depth_column+ - column name for the depth data, default "depth"
       # * +:scope+ - restricts what is to be considered a list. Given a symbol, it'll attach "_id"
       #   (if it hasn't been already) and use that as the foreign key restriction. You

data/lib/awesome_nested_set/model.rb

@@ -52,7 +52,7 @@ module CollectiveIdea #:nodoc:
 
           # Iterates over tree elements and determines the current level in the tree.
           # Only accepts default ordering, odering by an other column than lft
-          # does not work. This method is much more efficent than calling level
+          # does not work. This method is much more efficient than calling level
           # because it doesn't require any additional database queries.
           #
           # Example:
@@ -200,7 +200,6 @@ module CollectiveIdea #:nodoc:
           return unless has_depth_column?
 
           in_tenacious_transaction do
-            reload
             update_depth(level)
           end
         end

data/lib/awesome_nested_set/move.rb

@@ -41,9 +41,21 @@ module CollectiveIdea #:nodoc:
         delegate :base_class, :to => :instance_class, :prefix => :instance
 
         def where_statement(left_bound, right_bound)
-          instance_arel_table[left_column_name].in(left_bound..right_bound).
+          instance_arel_table[left_column_name].between(left_bound..right_bound).
+            or(instance_arel_table[right_column_name].between(left_bound..right_bound))
+        end
+
+        # Before Arel 6, there was 'in' method, which was replaced
+        # with 'between' in Arel 6 and now gives deprecation warnings
+        # in verbose mode. This is patch to support rails 4.0 (Arel 4)
+        # and 4.1 (Arel 5).
+        module LegacyWhereStatementExt
+          def where_statement(left_bound, right_bound)
+            instance_arel_table[left_column_name].in(left_bound..right_bound).
             or(instance_arel_table[right_column_name].in(left_bound..right_bound))
+          end
         end
+        prepend LegacyWhereStatementExt unless Arel::Predications.method_defined?(:between)
 
         def conditions(a, b, c, d)
           _conditions = case_condition_for_direction(:quoted_left_column_name) +

data/lib/awesome_nested_set/version.rb

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

metadata

@@ -1,16 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: awesome_nested_set
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Brandon Keepers
 - Daniel Morrison
 - Philip Arndt
-autorequire: 
+autorequire:
 bindir: bin
-cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+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: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -166,7 +192,7 @@ homepage: http://github.com/collectiveidea/awesome_nested_set
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -185,8 +211,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: An awesome nested set implementation for Active Record
 test_files: []