ancestry 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5bb7b7759117d88e5bec4658c6c4d691549f606
-  data.tar.gz: 0314da6d13466c30a6d21252083f37bbf5304bc5
+  metadata.gz: 441841ddcb84e00cdc685fe6bfc4ba8db2a184ae
+  data.tar.gz: d860eef74743307b1fae929ec652f8ec77474a10
 SHA512:
-  metadata.gz: 2bcd4bc5dcf11e3aab9242990a98aefb18bdbb6c7de506d501689de9514ed664467d008037f5699dde52ebe4c5e27e655682d243c6b6fbd394e48eb40766906f
-  data.tar.gz: 7eddc0d2e5e9a46e7e8404b7447681f0205c7fa7db4075a410c73301cd31ce99988e0087b217a3cd0d7491411c4457e83628d41baf39489038af5ae87a00ec54
+  metadata.gz: a75b3aceafbe2a286feff48f0bb8ec1fe4618ad45b80d24ee7c400fdedfcde0144dad477aeae119d7709861068237cd4c12a5d41429b3c7ff6f667b8da47c71f
+  data.tar.gz: a1abe3c0d18f3bddb7bf531a7a1a46d5f53a954da1eba0a46741f00b8f0aa4baae7802a172c676ed65afc1b843aea8fe4a7cdc6669241777f31debc8e4025d70

data/README.md

@@ -118,6 +118,8 @@ To navigate an Ancestry model, use the following instance methods:
 |`is_only_child?` <br/> `only_child?` |true if the record is the only child of its parent|
 |`descendants`      |direct and indirect children of the record|
 |`descendant_ids`   |direct and indirect children's ids of the record|
+|`indirects`        |indirect children of the record|
+|`indirect_ids`     |indirect children's ids of the record|
 |`subtree`          |the model on descendants and itself|
 |`subtree_ids`      |a list of all ids in the record's subtree|
 |`depth`            |the depth of the node, root nodes are at depth 0|
@@ -133,6 +135,8 @@ There are also instance methods to determine the relationship between 2 nodes:
 |`root_of?(node)`    | node's root is this record|
 |`ancestor_of?(node)`| node's ancestors include this record|
 |`child_of?(node)`   | node is record's parent|
+|`descendant_of?(node)` | node is one of this record's ancestors|
+|`indirect_of?(node)` | node is one of this record's ancestors but not a parent|
 
 # Options for `has_ancestry`
 
@@ -174,6 +178,7 @@ For convenience, a couple of named scopes are included at the class level:
     ancestors_of(node)      Ancestors of node, node can be either a record or an id
     children_of(node)       Children of node, node can be either a record or an id
     descendants_of(node)    Descendants of node, node can be either a record or an id
+    indirects_of(node)      Indirect children of node, node can be either a record or an id
     subtree_of(node)        Subtree of node, node can be either a record or an id
     siblings_of(node)       Siblings of node, node can be either a record or an id
 

data/lib/ancestry/has_ancestry.rb

@@ -41,6 +41,7 @@ module Ancestry
       scope :roots, lambda { where(root_conditions) }
       scope :ancestors_of, lambda { |object| where(ancestor_conditions(object)) }
       scope :children_of, lambda { |object| where(child_conditions(object)) }
+      scope :indirects_of, lambda { |object| where(indirect_conditions(object)) }
       scope :descendants_of, lambda { |object| where(descendant_conditions(object)) }
       scope :subtree_of, lambda { |object| where(subtree_conditions(object)) }
       scope :siblings_of, lambda { |object| where(sibling_conditions(object)) }

data/lib/ancestry/instance_methods.rb

@@ -275,6 +275,24 @@ module Ancestry
       ancestor_ids.include?(node.id)
     end
 
+    # Indirects
+
+    def indirect_conditions
+      self.ancestry_base_class.indirect_conditions(self)
+    end
+
+    def indirects depth_options = {}
+      self.ancestry_base_class.ordered_by_ancestry.scope_depth(depth_options, depth).where indirect_conditions
+    end
+
+    def indirect_ids depth_options = {}
+      indirects(depth_options).pluck(self.ancestry_base_class.primary_key)
+    end
+
+    def indirect_of?(node)
+      ancestor_ids[0..-2].include?(node.id)
+    end
+
     # Subtree
 
     def subtree_conditions
@@ -302,11 +320,12 @@ module Ancestry
     end
 
   private
+    ANCESTRY_DELIMITER = '/'.freeze
 
     def parse_ancestry_column obj
-      obj_ids = obj.to_s.split('/')
-      obj_ids.map!(&:to_i) if self.class.primary_key_is_an_integer?
-      obj_ids
+      return [] unless obj
+      obj_ids = obj.split(ANCESTRY_DELIMITER)
+      self.class.primary_key_is_an_integer? ? obj_ids.map!(&:to_i) : obj_ids
     end
 
     def unscoped_descendants

data/lib/ancestry/materialized_path.rb

@@ -27,6 +27,18 @@ module Ancestry
       t[ancestry_column].eq(node.child_ancestry)
     end
 
+    # indirect = anyone who is a descendant, but not a child
+    def indirect_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)
+      else
+        t[ancestry_column].matches("#{node.child_ancestry}/%")
+      end
+    end
+
     def descendant_conditions(object)
       t = arel_table
       node = to_node(object)

data/lib/ancestry/version.rb

@@ -1,3 +1,3 @@
 module Ancestry
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ancestry
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Stefan Kroes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord