ancestry 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d01ac0d4c8faa7ad66a0a8e5454625d723fc9226a7e0eb84b358fd25003148
-  data.tar.gz: e27cf882086e2c674972251bf35a52eca003d601dcf5d9ba390c1785f8900033
+  metadata.gz: 236bf763182abf156d175085f58ec757d196523e4b6f388cfbd4830768194adb
+  data.tar.gz: b69ba3c642ee2ea03f46c62c23e7f45207d366f57ccfce2e77d0040fe3286a00
 SHA512:
-  metadata.gz: b2b1a7a69fa27d6f40f1c39a700c5926d3fa1b5da4637800b87d1ad274458cb0ca39a497d505f2b6224031914a484349cef8c433b191ba131e1396431fce767d
-  data.tar.gz: 9fd95019be895afcc8eeee14be8a7776a90a29ded86d25a3cb82a92097cfa7a141f8a765a062e4ac6f5665e6bf7656d8e9fbde030329b713f286f9d96fa179b7
+  metadata.gz: 0a29628a71c79f4d2889620833f91c25266bf491e0925edf8cdf38a74f0ee813f186ffc9dd1beb4d134ea0bcdb091a619f00fafcd557305a797468f4601cd75c
+  data.tar.gz: 9cbe99bad12c8b2a6a8a6f09b003d5ce17530e668f2dcf17be9502053606d26bf4f9b7ee7493a13a7b4d9fc44df8cd5d450477604fdbfa1aafbd2877193dc894

data/CHANGELOG.md

@@ -5,6 +5,14 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [HEAD] <sub><sup>now</sub></sup>
 
+## Version [4.1.0] <sub><sup>2021-06-25</sub></sup>
+
+* `parent` with an invalid id now returns nil (thx @vanboom)
+* `root` returns self if ancestry is invalid (thx @vanboom)
+* fix case where invalid object prevented ancestry updates (thx @d-m-u)
+* oracleenhanced uses nulls first for sorting (thx @lual)
+* fix counter cache and STI (thx @mattvague)
+
 ## Version [4.0.0] <sub><sup>2021-04-12</sub></sup>
 
 * dropped support for rails 4.2 and 5.0 (thx @d-m-u)
@@ -255,7 +263,8 @@ Missed 2 commits (which are feature adds)
 * Validations
 
 
-[HEAD]: https://github.com/stefankroes/ancestry/compare/v4.0.0...HEAD
+[HEAD]: https://github.com/stefankroes/ancestry/compare/v4.1.0...HEAD
+[4.1.0]: https://github.com/stefankroes/ancestry/compare/v4.0.0...v4.1.0
 [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

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/stefankroes/ancestry.svg?branch=master)](https://travis-ci.org/stefankroes/ancestry) [![Coverage Status](https://coveralls.io/repos/stefankroes/ancestry/badge.svg)](https://coveralls.io/r/stefankroes/ancestry) [![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/stefankroes/ancestry?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Security](https://hakiri.io/github/stefankroes/ancestry/master.svg)](https://hakiri.io/github/stefankroes/ancestry/master)
+[![Gitter](https://badges.gitter.im/Join+Chat.svg)](https://gitter.im/stefankroes/ancestry?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Security](https://hakiri.io/github/stefankroes/ancestry/master.svg)](https://hakiri.io/github/stefankroes/ancestry/master)
 
 # Ancestry
 
@@ -52,6 +52,17 @@ $ rails g migration add_ancestry_to_[table] ancestry:string:index
 $ rake db:migrate
 ```
 
+Depending upon your comfort with databases, you may want to create the column
+with `C` or `POSIX` encoding. This is a more primitive encoding and just compares
+bytes. Since this column will just contains numbers and slashes, it works much
+better. It also works better for the uuid case as well.
+
+
+If you opt out of this, and are trying to run tests on postgres, you may need to
+set the environment variable `COLLATE_SYMBOLS=false`. Sorry to say that a discussion
+on this topic is out of scope. The important take away is postgres sort order is
+not consistent across operating systems but other databases do not have this same
+issue.
 
 ## Add ancestry to your model
 * Add to app/models/[model.rb]:

data/lib/ancestry/instance_methods.rb

@@ -8,7 +8,7 @@ module 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?
+      if !ancestry_callbacks_disabled? && !new_record? && ancestry_changed? && sane_ancestor_ids?
         # ... for each descendant ...
         unscoped_descendants.each do |descendant|
           # ... replace old ancestry with new ancestry
@@ -62,7 +62,7 @@ module Ancestry
 
     # Counter Cache
     def increase_parent_counter_cache
-      self.class.increment_counter _counter_cache_column, parent_id
+      self.ancestry_base_class.increment_counter _counter_cache_column, parent_id
     end
 
     def decrease_parent_counter_cache
@@ -74,7 +74,7 @@ module Ancestry
       return if defined?(@_trigger_destroy_callback) && !@_trigger_destroy_callback
       return if ancestry_callbacks_disabled?
 
-      self.class.decrement_counter _counter_cache_column, parent_id
+      self.ancestry_base_class.decrement_counter _counter_cache_column, parent_id
     end
 
     def update_parent_counter_cache
@@ -83,10 +83,10 @@ module Ancestry
       return unless changed
 
       if parent_id_was = parent_id_before_last_save
-        self.class.decrement_counter _counter_cache_column, parent_id_was
+        self.ancestry_base_class.decrement_counter _counter_cache_column, parent_id_was
       end
 
-      parent_id && self.class.increment_counter(_counter_cache_column, parent_id)
+      parent_id && self.ancestry_base_class.increment_counter(_counter_cache_column, parent_id)
     end
 
     def _counter_cache_column
@@ -108,7 +108,20 @@ module Ancestry
     end
 
     def sane_ancestor_ids?
-      valid? || errors[self.ancestry_base_class.ancestry_column].blank?
+      current_context, self.validation_context = validation_context, nil
+      errors.clear
+
+      attribute = ancestry_base_class.ancestry_column
+      ancestry_value = send(attribute)
+      return true unless ancestry_value
+
+      self.class.validators_on(attribute).each do |validator|
+        validator.validate_each(self, attribute, ancestry_value)
+      end
+      ancestry_exclude_self
+      errors.none?
+    ensure
+      self.validation_context = current_context
     end
 
     def ancestors depth_options = {}
@@ -158,7 +171,11 @@ module Ancestry
     alias :parent_id? :ancestors?
 
     def parent
-      unscoped_find(parent_id) if has_parent?
+      if has_parent?
+        unscoped_where do |scope|
+          scope.find_by id: parent_id
+        end
+      end
     end
 
     def parent_of?(node)
@@ -172,7 +189,11 @@ module Ancestry
     end
 
     def root
-      has_parent? ? unscoped_find(root_id) : self
+      if has_parent?
+        unscoped_where { |scope| scope.find_by(id: root_id) } || self
+      else
+        self
+      end
     end
 
     def is_root?

data/lib/ancestry/materialized_path.rb

@@ -67,7 +67,7 @@ module Ancestry
     def ordered_by_ancestry(order = nil)
       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"
+      elsif %w(postgresql oracleenhanced).include?(connection.adapter_name.downcase) && ActiveRecord::VERSION::STRING >= "6.1"
         reorder(Arel::Nodes::Ascending.new(arel_table[ancestry_column]).nulls_first, order)
       else
         reorder(
@@ -82,13 +82,6 @@ module Ancestry
     end
 
     module InstanceMethods
-
-      # Validates the ancestry, but can also be applied if validation is bypassed to determine if children should be affected
-      def sane_ancestry?
-        ancestry_value = read_attribute(self.ancestry_base_class.ancestry_column)
-        (ancestry_value.nil? || !ancestor_ids.include?(self.id)) && valid?
-      end
-
       # optimization - better to go directly to column and avoid parsing
       def ancestors?
         read_attribute(self.ancestry_base_class.ancestry_column).present?

data/lib/ancestry/materialized_path_pg.rb

@@ -3,7 +3,7 @@ module 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?
+      if !ancestry_callbacks_disabled? && !new_record? && ancestry_changed? && sane_ancestor_ids?
         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)

data/lib/ancestry/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4.5
+        version: 5.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4.5
+        version: 5.2.6
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -123,14 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: Organize ActiveRecord model into a tree structure