ancestry 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1ae94346d7ad0aa07830437239dc7f13dda73408c61a118e60f53ef21e6282
-  data.tar.gz: 1eb3e39a50b257dddc13559d52b03955c8174682f990a723614ca9e2e3dc6945
+  metadata.gz: d7d01ac0d4c8faa7ad66a0a8e5454625d723fc9226a7e0eb84b358fd25003148
+  data.tar.gz: e27cf882086e2c674972251bf35a52eca003d601dcf5d9ba390c1785f8900033
 SHA512:
-  metadata.gz: 87a3c689530416fd20fa4064bb7c610e8e9e3b013324776e5a7c96ad7cb0a8f1a136dfbe71ada9e53b5116ef41602dab7d2d7664e2fc047e8a31f7a6598e2238
-  data.tar.gz: f420ad732aca06c42116a97db60898db8712163aae660d13b8f0d32b806eaa6e81edac4ba2eb167986456995859cfd52da829abbbdf7d3377177b9f9049b73d5
+  metadata.gz: b2b1a7a69fa27d6f40f1c39a700c5926d3fa1b5da4637800b87d1ad274458cb0ca39a497d505f2b6224031914a484349cef8c433b191ba131e1396431fce767d
+  data.tar.gz: 9fd95019be895afcc8eeee14be8a7776a90a29ded86d25a3cb82a92097cfa7a141f8a765a062e4ac6f5665e6bf7656d8e9fbde030329b713f286f9d96fa179b7

data/CHANGELOG.md

@@ -3,15 +3,22 @@
 Doing our best at supporting [SemVer](http://semver.org/) with
 a nice looking [Changelog](http://keepachangelog.com).
 
-## Version [HEAD] <small>now</small>
+## Version [HEAD] <sub><sup>now</sub></sup>
 
-* dropped support for rails 4.2 and 5.0
+## Version [4.0.0] <sub><sup>2021-04-12</sub></sup>
 
-## Versions [3.2.1] <small>2020-09-23</small>
+* dropped support for rails 4.2 and 5.0 (thx @d-m-u)
+* better documentation counter cache option (thx @pustomytnyk)
+* clean up code (thx @amatsuda @d-m-u)
+* fixed rails 6.1 support (thx @cmr119 @d-staehler @danini-the-panini )
+* phasing out `parent_id?`, `ancestors?` and using `has_parent?` instead
+* fixed postgres order bug on rails 6.2 and higher (thx @smoyt)
+
+## Version [3.2.1] <sub><sup>2020-09-23</sub></sup>
 
 * fixed gemspec to include locales and pg (thx @HectorMF)
 
-## Versions [3.2.0] <small>2020-09-23</small>
+## Version [3.2.0] <sub><sup>2020-09-23</sub></sup>
 
 * introduce i18n
 * pg sql optimization for ancestry changes (thx @suonlight and @geis)
@@ -20,7 +27,7 @@ a nice looking [Changelog](http://keepachangelog.com).
 * able to convert to ancestry from a parent_id column with a different name
 * documentation fixes for better diagrams and grammar (thx @dtamais, @d-m-u, and @CamilleDrapier)
 
-## Versions [3.1.0] <small>2020-08-03</small>
+## Version [3.1.0] <sub><sup>2020-08-03</sub></sup>
 
 * `:primary_key_format` method lets you change syntax. good for uuids.
 * changed code from being `ancestry` string to `ancestry_ids` focused. May break monkey patches.
@@ -29,16 +36,16 @@ a nice looking [Changelog](http://keepachangelog.com).
 * Better documentation for relationships (thnx @dtamai and @d-m-u)
 * Fix creating children in `after_*` callbacks (thx @jstirk)
 
-## Version [3.0.7] <small>2018-11-06</small>
+## Version [3.0.7] <sub><sup>2018-11-06</sub></sup>
 
 * Fixed rails 5.1 change detection (thx @jrafanie)
 * Introduce counter cache (thx @hw676018683)
 
-## Version [3.0.6] <small>2018-11-06</small>
+## Version [3.0.6] <sub><sup>2018-11-06</sub></sup>
 
 * Fixed rails 4.1 version check (thx @myxoh)
 
-## Version [3.0.5] <small>2018-11-06</small>
+## Version [3.0.5] <sub><sup>2018-11-06</sub></sup>
 
 ## Changed
 
@@ -49,14 +56,14 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 * Reduced memory footprint of parsing ancestry column (thx @NickLaMuro)
 
-## Version [3.0.4] <small>2018-10-27</small>
+## Version [3.0.4] <sub><sup>2018-10-27</sub></sup>
 
 ## Fixes
 
 * Properly detects non-integer columns (thx @adam101)
 * Arrange no longer drops nodes due to missing parents (thx @trafium)
 
-## Version [3.0.3] <small>2018-10-23</small>
+## Version [3.0.3] <sub><sup>2018-10-23</sub></sup>
 
 This branch (3.x) should still be compatible with rails 3 and 4.
 Rails 5.1 and 5.2 support were introduced in this version, but ongoing support
@@ -72,7 +79,7 @@ has been moved to ancestry 4.0
 * Dropped builds for ruby 1.9.3, 2.0, 2.1, and 2.2
 * Dropped builds for Rails 3.x and 4.x (will use Active Record `or` syntax)
 
-## Version [3.0.2] <small>2018-04-24</small>
+## Version [3.0.2] <sub><sup>2018-04-24</sub></sup>
 
 ## Fixes
 
@@ -82,7 +89,7 @@ has been moved to ancestry 4.0
 * added missing `Ancestry::version`
 * added Rails 5.2 support (thx @jjuliano)
 
-## Version [3.0.1] <small>2017-07-05</small>
+## Version [3.0.1] <sub><sup>2017-07-05</sub></sup>
 
 ## Fixes
 
@@ -93,7 +100,7 @@ has been moved to ancestry 4.0
 * fixed tests on mysql 5.7 and rails 3.2
 * Dropped 3.1 scope changes
 
-## Version [3.0.0] <small>2017-05-18</small>
+## Version [3.0.0] <sub><sup>2017-05-18</sub></sup>
 
 ## Changed
 
@@ -109,7 +116,7 @@ has been moved to ancestry 4.0
 * Properly touches parents when different class for STI (thx @samtgarson)
 * Fixed issues with parent_id (only present on master) (thx @domcleal)
 
-## Version [2.2.2] <small>2016-11-01</small>
+## Version [2.2.2] <sub><sup>2016-11-01</sub></sup>
 
 ### Changed
 
@@ -117,7 +124,7 @@ has been moved to ancestry 4.0
 * Fixed bug with explicit order clauses (introduced in 2.2.0)
 * No longer load schema on `has_ancestry` load (thx @ledermann)
 
-## Version [2.2.1] <small>2016-10-25</small>
+## Version [2.2.1] <sub><sup>2016-10-25</sub></sup>
 
 Sorry for blip, local master got out of sync with upstream master.
 Missed 2 commits (which are feature adds)
@@ -126,7 +133,7 @@ Missed 2 commits (which are feature adds)
 * Use like (vs ilike) for rails 5.0 (performance enhancement)
 * Use `COALESCE` for sorting on pg, mysql, and sqlite vs `CASE`
 
-## Version [2.2.0] <small>2016-10-25</small>
+## Version [2.2.0] <sub><sup>2016-10-25</sub></sup>
 
 ### Added
 * Predicates for scopes: e.g.: `ancestor_of?`, `parent_of?` (thx @neglectedvalue)
@@ -141,7 +148,7 @@ Missed 2 commits (which are feature adds)
 * Upgrading tests for ruby versions (thx @brocktimus, @fryguy, @yui-knk)
 * Fix non-default ancestry not getting used properly (thx @javiyu)
 
-## Version [2.1.0]  <small>2014-04-16</small>
+## Version [2.1.0] <sub><sup>2014-04-16</sub></sup>
 * Added arrange_serializable (thx @krishandley, @chicagogrrl)
 * Add the :touch to update ancestors on save (thx @adammck)
 * Change conditions into arel (thx @mlitwiniuk)
@@ -150,7 +157,7 @@ Missed 2 commits (which are feature adds)
 * Performance tweak (thx @mjc)
 * Improvements to organization (thx @xsuchy, @ryakh)
 
-## Version [2.0.0] <small>2013-05-17</small>
+## Version [2.0.0] <sub><sup>2013-05-17</sub></sup>
 * Removed rails 2 compatibility
 * Added table name to condition constructing methods (thx @aflatter)
 * Fix depth_cache not being updated when moving up to ancestors (thx @scottatron)
@@ -162,31 +169,31 @@ Missed 2 commits (which are feature adds)
 * New adopt strategy (thx unknown)
 * Many more improvements
 
-## Version [1.3.0] <small>2012-05-04</small>
+## Version [1.3.0] <sub><sup>2012-05-04</sub></sup>
 * Ancestry now ignores default scopes when moving or destroying nodes, ensuring tree consistency
 * Changed ActiveRecord dependency to 2.3.14
 
-## Version [1.2.5] <small>2012-03-15</small>
+## Version [1.2.5] <sub><sup>2012-03-15</sub></sup>
 * Fixed warnings: "parenthesize argument(s) for future version"
 * Fixed a bug in the restore_ancestry_integrity! method (thx Arthur Holstvoogd)
 
-## Version [1.2.4] <small>2011-04-22</small>
+## Version [1.2.4] <sub><sup>2011-04-22</sub></sup>
 * Prepended table names to column names in queries (thx @raelik)
 * Better check to see if acts_as_tree can be overloaded (thx @jims)
 * Performance inprovements (thx @kueda)
 
-## Version [1.2.3] <small>2010-10-28</small>
+## Version [1.2.3] <sub><sup>2010-10-28</sub></sup>
 * Fixed error with determining ActiveRecord version
 * Added option to specify :primary_key_format (thx @rolftimmermans)
 
-## Version [1.2.2] <small>2010-10-24</small>
+## Version [1.2.2] <sub><sup>2010-10-24</sub></sup>
 * Fixed all deprecation warnings for rails 3.0.X
 * Added `:report` option to `check_ancestry_integrity!`
 * Changed ActiveRecord dependency to 2.2.2
 * Tested and fixed for ruby 1.8.7 and 1.9.2
 * Changed usage of `update_attributes` to `update_attribute` to allow ancestry column protection
 
-## Version [1.2.0] <small>2009-11-07</small>
+## Version [1.2.0] <sub><sup>2009-11-07</sub></sup>
 * Removed some duplication in has_ancestry
 * Cleaned up plugin pattern according to http://yehudakatz.com/2009/11/12/better-ruby-idioms/
 * Moved parts of ancestry into seperate files
@@ -197,23 +204,23 @@ Missed 2 commits (which are feature adds)
 * Updated ordered_by_ancestry scope to support Microsoft SQL Server
 * Added empty hash as parameter to exists? calls for older ActiveRecord versions
 
-## Version [1.1.4] <small>2009-11-07</small>
+## Version [1.1.4] <sub><sup>2009-11-07</sub></sup>
 * Thanks to a patch from tom taylor, Ancestry now works with different primary keys
 
-## Version [1.1.3] <small>2009-11-01</small>
+## Version [1.1.3] <sub><sup>2009-11-01</sub></sup>
 * Fixed a pretty bad bug where several operations took far too many queries
 
-## Version [1.1.2] <small>2009-10-29</small>
+## Version [1.1.2] <sub><sup>2009-10-29</sub></sup>
 * Added validation for depth cache column
 * Added STI support (reported broken)
 
-## Version [1.1.1] <small>2009-10-28</small>
+## Version [1.1.1] <sub><sup>2009-10-28</sub></sup>
 * Fixed some parentheses warnings that where reported
 * Fixed a reported issue with arrangement
 * Fixed issues with ancestors and path order on postgres
 * Added ordered_by_ancestry scope (needed to fix issues)
 
-## Version [1.1.0] <small>2009-10-22</small>
+## Version [1.1.0] <sub><sup>2009-10-22</sub></sup>
 * Depth caching (and cache rebuilding)
 * Depth method for nodes
 * Named scopes for selecting by depth
@@ -236,7 +243,7 @@ Missed 2 commits (which are feature adds)
 * Removed rails specific init
 * Removed uninstall script
 
-## Version 1.0.0 <small>2009-10-16</small>
+## Version 1.0.0 <sub><sup>2009-10-16</sub></sup>
 * Initial version
 * Tree building
 * Tree navigation
@@ -248,8 +255,10 @@ Missed 2 commits (which are feature adds)
 * Validations
 
 
-[HEAD]: https://github.com/stefankroes/ancestry/compare/v3.2.0...HEAD
-[3.1.0]: https://github.com/stefankroes/ancestry/compare/v3.1.0...v3.2.0
+[HEAD]: https://github.com/stefankroes/ancestry/compare/v4.0.0...HEAD
+[4.0.0]: https://github.com/stefankroes/ancestry/compare/v3.2.1...v4.0.0
+[3.2.1]: https://github.com/stefankroes/ancestry/compare/v3.2.0...v3.2.1
+[3.2.0]: https://github.com/stefankroes/ancestry/compare/v3.1.0...v3.2.0
 [3.1.0]: https://github.com/stefankroes/ancestry/compare/v3.0.7...v3.1.0
 [3.0.7]: https://github.com/stefankroes/ancestry/compare/v3.0.6...v3.0.7
 [3.0.6]: https://github.com/stefankroes/ancestry/compare/v3.0.5...v3.0.6

data/README.md

@@ -132,6 +132,9 @@ The has_ancestry method supports the following options:
                            By default, primary keys only match integers ([0-9]+)
     :touch                 Instruct Ancestry to touch the ancestors of a node when it changes, to
                            invalidate nested key-based caches. (default: false)
+    :counter_cache         Boolean whether to create counter cache column accessor. 
+                           Default column name is `children_count`. 
+                           Pass symbol to use different column name (default: false)
 
 # (Named) Scopes
 

data/lib/ancestry/class_methods.rb

@@ -16,7 +16,7 @@ module Ancestry
         if [:before_depth, :to_depth, :at_depth, :from_depth, :after_depth].include? scope_name
           scope.send scope_name, depth + relative_depth
         else
-          raise Ancestry::AncestryException.new(I18n.t("ancestry.unknown_depth_option", {:scope_name => scope_name}))
+          raise Ancestry::AncestryException.new(I18n.t("ancestry.unknown_depth_option", scope_name: scope_name))
         end
       end
     end
@@ -217,31 +217,15 @@ module Ancestry
     end
 
     def unscoped_where
-      if ActiveRecord::VERSION::MAJOR < 4
-        self.ancestry_base_class.unscoped do
-          yield self.ancestry_base_class
-        end
-      else
-        yield self.ancestry_base_class.unscope(:where)
-      end
+      yield self.ancestry_base_class.default_scoped.unscope(:where)
     end
 
     ANCESTRY_UNCAST_TYPES = [:string, :uuid, :text].freeze
-    if ActiveSupport::VERSION::STRING < "4.2"
-      def primary_key_is_an_integer?
-        if defined?(@primary_key_is_an_integer)
-          @primary_key_is_an_integer
-        else
-          @primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(columns_hash[primary_key.to_s].type)
-        end
-      end
-    else
-      def primary_key_is_an_integer?
-        if defined?(@primary_key_is_an_integer)
-          @primary_key_is_an_integer
-        else
-          @primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(type_for_attribute(primary_key).type)
-        end
+    def primary_key_is_an_integer?
+      if defined?(@primary_key_is_an_integer)
+        @primary_key_is_an_integer
+      else
+        @primary_key_is_an_integer = !ANCESTRY_UNCAST_TYPES.include?(type_for_attribute(primary_key).type)
       end
     end
   end

data/lib/ancestry/has_ancestry.rb

@@ -5,7 +5,7 @@ module Ancestry
       raise Ancestry::AncestryException.new(I18n.t("ancestry.option_must_be_hash")) unless options.is_a? Hash
       options.each do |key, value|
         unless [:ancestry_column, :orphan_strategy, :cache_depth, :depth_cache_column, :touch, :counter_cache, :primary_key_format, :update_strategy].include? key
-          raise Ancestry::AncestryException.new(I18n.t("ancestry.unknown_option", {:key => key.inspect, :value => value.inspect}))
+          raise Ancestry::AncestryException.new(I18n.t("ancestry.unknown_option", key: key.inspect, value: value.inspect))
         end
       end
 
@@ -87,12 +87,7 @@ module Ancestry
 
       after_touch :touch_ancestors_callback
       after_destroy :touch_ancestors_callback
-
-      if ActiveRecord::VERSION::STRING >= '5.1.0'
-        after_save :touch_ancestors_callback, if: :saved_changes?
-      else
-        after_save :touch_ancestors_callback, if: :changed?
-      end
+      after_save :touch_ancestors_callback, if: :saved_changes?
     end
 
     def acts_as_tree(*args)
@@ -115,5 +110,5 @@ module Ancestry
 end
 
 ActiveSupport.on_load :active_record do
-  send :extend, Ancestry::HasAncestry
+  extend Ancestry::HasAncestry
 end

data/lib/ancestry/instance_methods.rb

@@ -2,7 +2,7 @@ module Ancestry
   module InstanceMethods
     # Validate that the ancestors don't include itself
     def ancestry_exclude_self
-      errors.add(:base, I18n.t("ancestry.exclude_self", {:class_name => self.class.name.humanize})) if ancestor_ids.include? self.id
+      errors.add(:base, I18n.t("ancestry.exclude_self", class_name: self.class.name.humanize)) if ancestor_ids.include? self.id
     end
 
     # Update descendants with new ancestry (before save)
@@ -39,7 +39,7 @@ module Ancestry
         when :adopt # make child elements of this node, child of its parent
           descendants.each do |descendant|
             descendant.without_ancestry_callbacks do
-              descendant.update_attribute :ancestor_ids, descendant.ancestor_ids.delete_if { |x| x == self.id }
+              descendant.update_attribute :ancestor_ids, (descendant.ancestor_ids.delete_if { |x| x == self.id })
             end
           end
         when :restrict # throw an exception if it has children
@@ -78,12 +78,7 @@ module Ancestry
     end
 
     def update_parent_counter_cache
-      changed =
-        if ActiveRecord::VERSION::STRING >= '5.1.0'
-          saved_change_to_attribute?(self.ancestry_base_class.ancestry_column)
-        else
-          ancestry_changed?
-        end
+      changed = saved_change_to_attribute?(self.ancestry_base_class.ancestry_column)
 
       return unless changed
 
@@ -100,20 +95,16 @@ module Ancestry
 
     # Ancestors
 
-    def ancestors?
+    def has_parent?
       ancestor_ids.present?
     end
-    alias :has_parent? :ancestors?
+    alias :ancestors? :has_parent?
 
     def ancestry_changed?
       column = self.ancestry_base_class.ancestry_column.to_s
-      if ActiveRecord::VERSION::STRING >= '5.1.0'
         # These methods return nil if there are no changes.
         # This was fixed in a refactoring in rails 6.0: https://github.com/rails/rails/pull/35933
         !!(will_save_change_to_attribute?(column) || saved_change_to_attribute?(column))
-      else
-        changed.include?(column)
-      end
     end
 
     def sane_ancestor_ids?
@@ -121,7 +112,7 @@ module Ancestry
     end
 
     def ancestors depth_options = {}
-      return self.ancestry_base_class.none unless ancestors?
+      return self.ancestry_base_class.none unless has_parent?
       self.ancestry_base_class.scope_depth(depth_options, depth).ordered_by_ancestry.ancestors_of(self)
     end
 
@@ -162,12 +153,12 @@ module Ancestry
     end
 
     def parent_id
-      ancestor_ids.last if ancestors?
+      ancestor_ids.last if has_parent?
     end
     alias :parent_id? :ancestors?
 
     def parent
-      unscoped_find(parent_id) if ancestors?
+      unscoped_find(parent_id) if has_parent?
     end
 
     def parent_of?(node)
@@ -177,15 +168,15 @@ module Ancestry
     # Root
 
     def root_id
-      ancestors? ? ancestor_ids.first : id
+      has_parent? ? ancestor_ids.first : id
     end
 
     def root
-      ancestors? ? unscoped_find(root_id) : self
+      has_parent? ? unscoped_find(root_id) : self
     end
 
     def is_root?
-      !ancestors?
+      !has_parent?
     end
     alias :root? :is_root?
 

data/lib/ancestry/materialized_path.rb

@@ -1,7 +1,7 @@
 module Ancestry
   module MaterializedPath
-    BEFORE_LAST_SAVE_SUFFIX = ActiveRecord::VERSION::STRING >= '5.1.0' ? '_before_last_save'.freeze : '_was'.freeze
-    IN_DATABASE_SUFFIX = ActiveRecord::VERSION::STRING >= '5.1.0' ? '_in_database'.freeze : '_was'.freeze
+    BEFORE_LAST_SAVE_SUFFIX = '_before_last_save'.freeze
+    IN_DATABASE_SUFFIX = '_in_database'.freeze
     ANCESTRY_DELIMITER='/'.freeze
 
     def self.extended(base)
@@ -38,12 +38,7 @@ module Ancestry
     def indirects_of(object)
       t = arel_table
       node = to_node(object)
-      # rails has case sensitive matching.
-      if ActiveRecord::VERSION::MAJOR >= 5
-        where(t[ancestry_column].matches("#{node.child_ancestry}/%", nil, true))
-      else
-        where(t[ancestry_column].matches("#{node.child_ancestry}/%"))
-      end
+      where(t[ancestry_column].matches("#{node.child_ancestry}/%", nil, true))
     end
 
     def descendants_of(object)
@@ -54,12 +49,7 @@ module Ancestry
     def descendant_conditions(object)
       t = arel_table
       node = to_node(object)
-      # rails has case sensitive matching.
-      if ActiveRecord::VERSION::MAJOR >= 5
-        t[ancestry_column].matches("#{node.child_ancestry}/%", nil, true).or(t[ancestry_column].eq(node.child_ancestry))
-      else
-        t[ancestry_column].matches("#{node.child_ancestry}/%").or(t[ancestry_column].eq(node.child_ancestry))
-      end
+      t[ancestry_column].matches("#{node.child_ancestry}/%", nil, true).or(t[ancestry_column].eq(node.child_ancestry))
     end
 
     def subtree_of(object)
@@ -78,7 +68,7 @@ module Ancestry
       if %w(mysql mysql2 sqlite sqlite3).include?(connection.adapter_name.downcase)
         reorder(arel_table[ancestry_column], order)
       elsif %w(postgresql).include?(connection.adapter_name.downcase) && ActiveRecord::VERSION::STRING >= "6.1"
-        reorder(Arel::Nodes::Ascending.new(arel_table[ancestry_column]).nulls_first)
+        reorder(Arel::Nodes::Ascending.new(arel_table[ancestry_column]).nulls_first, order)
       else
         reorder(
           Arel::Nodes::Ascending.new(Arel::Nodes::NamedFunction.new('COALESCE', [arel_table[ancestry_column], Arel.sql("''")])),

data/lib/ancestry/materialized_path_pg.rb

@@ -1,22 +1,22 @@
 module Ancestry
   module MaterializedPathPg
-      # Update descendants with new ancestry (before save)
-      def update_descendants_with_new_ancestry
-        # If enabled and node is existing and ancestry was updated and the new ancestry is sane ...
-        if !ancestry_callbacks_disabled? && !new_record? && ancestry_changed? && sane_ancestry?
-          ancestry_column = ancestry_base_class.ancestry_column
-          old_ancestry = path_ids_in_database.join(Ancestry::MaterializedPath::ANCESTRY_DELIMITER)
-          new_ancestry = path_ids.join(Ancestry::MaterializedPath::ANCESTRY_DELIMITER)
-          update_clause = [
-            "#{ancestry_column} = regexp_replace(#{ancestry_column}, '^#{old_ancestry}', '#{new_ancestry}')"
-          ]
+    # Update descendants with new ancestry (before save)
+    def update_descendants_with_new_ancestry
+      # If enabled and node is existing and ancestry was updated and the new ancestry is sane ...
+      if !ancestry_callbacks_disabled? && !new_record? && ancestry_changed? && sane_ancestry?
+        ancestry_column = ancestry_base_class.ancestry_column
+        old_ancestry = path_ids_in_database.join(Ancestry::MaterializedPath::ANCESTRY_DELIMITER)
+        new_ancestry = path_ids.join(Ancestry::MaterializedPath::ANCESTRY_DELIMITER)
+        update_clause = [
+          "#{ancestry_column} = regexp_replace(#{ancestry_column}, '^#{old_ancestry}', '#{new_ancestry}')"
+        ]
 
-          if ancestry_base_class.respond_to?(:depth_cache_column) && respond_to?(ancestry_base_class.depth_cache_column)
-            depth_cache_column = ancestry_base_class.depth_cache_column.to_s
-            update_clause << "#{depth_cache_column} = length(regexp_replace(regexp_replace(ancestry, '^#{old_ancestry}', '#{new_ancestry}'), '\\d', '', 'g')) + 1"
-          end
+        if ancestry_base_class.respond_to?(:depth_cache_column) && respond_to?(ancestry_base_class.depth_cache_column)
+          depth_cache_column = ancestry_base_class.depth_cache_column.to_s
+          update_clause << "#{depth_cache_column} = length(regexp_replace(regexp_replace(ancestry, '^#{old_ancestry}', '#{new_ancestry}'), '\\d', '', 'g')) + 1"
+        end
 
-          unscoped_descendants.update_all update_clause.join(', ')
+        unscoped_descendants.update_all update_clause.join(', ')
       end
     end
   end

data/lib/ancestry/version.rb

@@ -1,3 +1,3 @@
 module Ancestry
-  VERSION = "3.2.1"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.2.4.5
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -130,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Organize ActiveRecord model into a tree structure