fertile_forest 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263e9d58729f356db7ca3d5ce532a62c5d2468a7
-  data.tar.gz: 1fa08be22ffe24ecc0e61bfa7496810ee5c6fca3
+  metadata.gz: fc9b8f30c16e4ad778708dc87db3da5b24425ad5
+  data.tar.gz: 84f89968f7d3eaa000e664a7307c808c3b62ed42
 SHA512:
-  metadata.gz: fc6eb47c89edff5caff3725c5786135d46dc5646b2294c216ecdd46f6abc8ba52902a37a417045ea6622ac709abf225ad4d954b960864722ab518cfb2836feb5
-  data.tar.gz: 7f8016ba0e95f4e7d1b4564dc3594302b96edc561824055ab21cd7cb289fe024504a724507fe97bbf2b3e176ea43b8a193c7f10bd66dc878dc605720bf974e61
+  metadata.gz: c866ba297d69444e4a3a94f3e9fa94d0e2a88ec77a121b82ddcef0ecb2a7511d296749316f8b2a8f8e0538d37f1478bee0e8e82f5a115abb42e8b8c77be4391c
+  data.tar.gz: 42f61d1ac7b4a923732b7dc929bfba9dbd0839112a9d4df3847b58bac409dd43dafb32bb513861489f6b7ea27b7f30b1ba441f56020381a4dc157118f02675a4

data/lib/fertile_forest/modules/finders.rb

@@ -292,17 +292,123 @@ module StewEucen
               .where(@_ff_depth => base_node.ff_depth + grand_number)
           end
 
+          #
+          # Find any kind of kinship from base node.
+          #
+          # @param base_obj [Entity|Integer] Base node|id to find.
+          # @param next_branch [Integer] Branch distance of finding nodes from base nodes.
+          # @param level_offset [Integer] Offset of kinship level of finding nodes from base nodes.
+          # @param columns [Array] Columns for SELECT clause.
+          # @return [ActiveRecord::Relation] Basic query for finding kinship nodes.
+          # @return [nil] No kinship nodes.
+          # @since 1.1.0
+          #
+          def kinships(
+            base_obj,
+            next_branch = KINSHIPS_AS_SIBLING,
+            level_offset = KINSHIPS_SAME_LEVEL,
+            columns = nil
+          )
+            base_node = ff_resolve_nodes(base_obj)
+            return nil if base_node.blank?
+
+            aim_queue = base_node.ff_queue
+            aim_depth = base_node.ff_depth
+            aim_grove = base_node.ff_grove  # When no grove, nil
+
+            top_depth = aim_depth - next_branch
+
+            # Impossible to find.
+            return nil if top_depth < ROOT_DEPTH
+
+            ffqq = arel_table[@_ff_queue]
+            ffdd = arel_table[@_ff_depth]
+            ffgg = arel_table[@_ff_grove]
+
+            # create subquery
+            before_nodes_subquery = ff_usual_projection(aim_grove)
+                .project(ffqq.maximum.to_sql + " + 1 AS head_queue")
+                .where(ffqq.lt(aim_queue))
+                .where(ffdd.lt(top_depth))
+
+            after_nodes_subquery = ff_usual_projection(aim_grove)
+                .project(ffqq.minimum.to_sql + " - 1 AS tail_queue")
+                .where(ffqq.gt(aim_queue))
+                .where(ffdd.lt(top_depth))
+
+            func_maker = Arel::Nodes::NamedFunction
+
+            before_coalesce_condition = func_maker.new(
+                'COALESCE',
+                [before_nodes_subquery, 0]
+            )
+
+            after_coalesce_condition = func_maker.new(
+                'COALESCE',
+                [after_nodes_subquery, QUEUE_MAX_VALUE]
+            )
+
+            # find nodes by ancestor queues
+            ff_required_columns_scope()
+                .ff_usual_conditions_scope(aim_grove)
+                .ff_usual_order_scope()
+                .where(ffdd.eq(aim_depth + level_offset))
+                .where(ffqq.gteq(before_coalesce_condition))
+                .where(ffqq.lteq(after_coalesce_condition))
+                .select(ff_all_optional_columns(columns))
+          end
+
           #
           # Find sibling nodes from base node.
+          # Note: Results includes base node.
           #
           # @param base_obj [Entity|Integer] Base node|id to find.
           # @param columns [Array] Columns for SELECT clause.
           # @return [ActiveRecord::Relation] Basic query for finding sibling nodes.
           # @return [nil] No sibling nodes.
+          # @version 1.1.0 Replace to use kinships()
           #
           def siblings(base_obj, columns = nil)
-            parent_node = genitor(base_obj)
-            children(parent_node, columns)
+            kinships(base_obj, KINSHIPS_AS_SIBLING, KINSHIPS_SAME_LEVEL, columns)
+          end
+
+          #
+          # Find cousin nodes from base node.
+          # Note: Results includes siblngs nodes.
+          #
+          # @param base_obj [Entity|Integer] Base node|id to find.
+          # @param columns [Array] Columns for SELECT clause.
+          # @return [ActiveRecord::Relation] Basic query for finding cousin nodes.
+          # @return [nil] No cousin nodes.
+          # @since 1.1.0
+          def cousins(base_obj, columns = nil)
+            kinships(base_obj, KINSHIPS_AS_COUSIN, KINSHIPS_SAME_LEVEL, columns)
+          end
+
+          #
+          # Find aunt|uncle nodes from base node.
+          # Note: Results includes siblngs nodes.
+          # @param base_obj [Entity|Integer] Base node|id to find.
+          # @param columns [Array] Columns for SELECT clause.
+          # @return [ActiveRecord::Relation] Basic query for finding aunt|uncle nodes.
+          # @return [nil] No aunt|uncle nodes.
+          # @since 1.1.0
+          #
+          def piblings(base_obj, columns = nil)
+            kinships(base_obj, KINSHIPS_AS_COUSIN, KINSHIPS_PARENT_LEVEL, columns)
+          end
+
+          #
+          # Find nibling nodes from base node.
+          # Note: Results includes siblngs nodes.
+          # @param base_obj [Entity|Integer] Base node|id to find.
+          # @param columns [Array] Columns for SELECT clause.
+          # @return [ActiveRecord::Relation] Basic query for finding nibling nodes.
+          # @return [nil] No nibling nodes.
+          # @since 1.1.0
+          #
+          def niblings(base_obj, columns = nil)
+            kinships(base_obj, KINSHIPS_AS_SIBLING, KINSHIPS_CHILD_LEVEL, columns)
           end
 
           #
@@ -729,6 +835,18 @@ module StewEucen
                     :ff_queue_sorted_nodes,
 
                     :ff_sort_with_queue!
+
+          alias superiors  ancestors
+          alias forebears  ancestors
+          alias inferiors  descendants
+          alias afterbears descendants
+          alias externals leaves
+          alias terminals leaves
+          alias nephews niblings
+          alias nieces  niblings
+          alias auncles piblings
+          alias aunts   piblings
+          alias uncles  piblings
         end
       end
     end

data/lib/fertile_forest/modules/reconstructers.rb

@@ -444,7 +444,7 @@ module StewEucen
               aim_node = ff_resolve_nodes(node_obj)
               return false if aim_node.blank?
 
-              siblings_query = siblings_of(aim_node, [@_id])
+              siblings_query = siblings(aim_node, [@_id])
               return false if siblings_query.blank?
               sibling_nodes = siblings_query.all
 

data/lib/fertile_forest/modules/states.rb

@@ -25,7 +25,7 @@ module StewEucen
 
             # get id hash by nested information
             eldest_node = sibling_nodes.values.first
-            full_sibling_nodes = siblings_of(eldest_node, [@_id]).all
+            full_sibling_nodes = siblings(eldest_node, [@_id]).all
 
             child_hash = {}
             bingo_count = sibling_nodes.length

data/lib/fertile_forest/saplings.rb

@@ -37,12 +37,19 @@ module StewEucen
       DESCENDANTS_ALL        = 0
       DESCENDANTS_ONLY_CHILD = 1
 
-      PRUNE_DESCENDANTS_ONLY = false
-      PRUNE_WITH_TOP_NODE    = true
-
       SUBTREE_WITHOUT_TOP_NODE = false
       SUBTREE_WITH_TOP_NODE    = true
 
+      KINSHIPS_AS_SIBLING = 0   # Distance for finding sibling nodes In kinships().
+      KINSHIPS_AS_COUSIN  = 1   # Distance for finding cousin nodes In kinships().
+
+      KINSHIPS_SAME_LEVEL   = 0   # Same level to find kinships. (such as siblings, cousins.)
+      KINSHIPS_PARENT_LEVEL = -1  # Upper level to find kinships. (such as aunts|uncles)
+      KINSHIPS_CHILD_LEVEL  = 1   # Lower level to find kinships. (such as niblings.)
+
+      PRUNE_DESCENDANTS_ONLY = false
+      PRUNE_WITH_TOP_NODE    = true
+
       ORDER_BY_QUEUE_INDEX = false
       ORDER_BY_DEPTH_INDEX = true
 

data/lib/fertile_forest/version.rb

@@ -1,3 +1,3 @@
 module FertileForest
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fertile_forest
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Stew Eucen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,9 +25,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 description: Fertile Forest is the new model to store hierarchical data in a database.
-  Conventional models are "adjacency list", "route enumeration", "nested set" and
-  "closure table". Fertile Forest has some excellent features than each conventional
-  model.
+  Conventional models are "adjacency list", "path enumeration", "nested set" and "closure
+  table". Fertile Forest has some excellent features than each conventional model.
 email:
 - stew.eucen@gmail.com
 executables: []
@@ -70,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The new model to store hierarchical data in a database.