fertile_forest 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f605105d5db7a7769a308ee81c2f2643840f9ef
-  data.tar.gz: 915263e1161b69364dc04b0e31ff3399d5dab13a
+  metadata.gz: 2959088e37d7bebc2c2491b4a430a74954592e8c
+  data.tar.gz: 96c1da1805df91e0f9560543280a8e73af9b1b9b
 SHA512:
-  metadata.gz: f8eb476e94442c5525097baac81878594cfe7a280bfe99e12b656d816db113641d907421880600e96038dc6888ddc91a8b4fe4bc82857336a21f6f58fbec4255
-  data.tar.gz: 0f7fa37321ebc48a02837f450fa0749412cadfa4e50a1dd50fb72b5cd464b89929e3acaaae7d2ceceee8ed4442c2b3325818f82988fd159511abfda0fd88e0b2
+  metadata.gz: d29d0e9e2932973c5055f9115a8f772bbb67173d454196e15725312bd2935faca5ebf994631a16238e9635a13a0f6e8bab4496ef21c05ff340deef42b6cd8f0e
+  data.tar.gz: a12224e5b58ed393438e93f0293b83d1b0e7c29f833d3fda51124f232107b1b585b284ee3568015d0db0ccff89777ccfb0576742869fc450e203d18670b4d1ce

data/lib/fertile_forest/modules/finders.rb

@@ -357,8 +357,8 @@ module StewEucen
           # 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 branch_level [Integer] Branch distance of finding nodes from base nodes.
+          # @param depth_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.
@@ -366,8 +366,8 @@ module StewEucen
           #
           def kinships(
             base_obj,
-            next_branch = KINSHIPS_AS_SIBLING,
-            level_offset = KINSHIPS_SAME_LEVEL,
+            branch_level = KINSHIPS_BRANCH_LEVEL_ONE,
+            depth_offset = KINSHIPS_SAME_DEPTH,
             columns = nil
           )
             base_node = ff_resolve_nodes(base_obj)
@@ -377,11 +377,13 @@ module StewEucen
             aim_depth = base_node.ff_depth
             aim_grove = base_node.ff_grove  # When no grove, nil
 
-            top_depth = aim_depth - next_branch
+            top_depth = aim_depth - branch_level
 
             # Impossible to find.
             return nil if top_depth < ROOT_DEPTH
 
+            return nil if branch_level + depth_offset < 0
+
             ffqq = arel_table[@_ff_queue]
             ffdd = arel_table[@_ff_depth]
             ffgg = arel_table[@_ff_grove]
@@ -390,12 +392,12 @@ module StewEucen
             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))
+                .where(ffdd.lteq(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))
+                .where(ffdd.lteq(top_depth))
 
             func_maker = Arel::Nodes::NamedFunction
 
@@ -409,14 +411,80 @@ module StewEucen
                 [after_nodes_subquery, QUEUE_MAX_VALUE]
             )
 
+            #
+            # create column of ff_branch_level
+            #
+            increment_branch_level_case = ff_create_case_expression(
+              [ffqq.eq(aim_queue).to_sql, 0],
+              1
+            )
+
+            branch_for_level_subqueries = [increment_branch_level_case]
+            ((top_depth + 1) .. (aim_depth - 1)).each do |d|
+              before_nodes_branch_for_lavel_subquery = ff_usual_projection(aim_grove)
+                  .project("#{ffqq.maximum.to_sql} AS head_queue_#{d}")
+                  .where(ffqq.lt(aim_queue))
+                  .where(ffdd.lteq(d))
+
+              after_nodes_branch_far_level_subquery = ff_usual_projection(aim_grove)
+                  .project("#{ffqq.minimum.to_sql} - 1 AS tail_queue_#{d}")
+                  .where(ffqq.gt(aim_queue))
+                  .where(ffdd.lteq(d))
+
+              before_condition = func_maker.new(
+                  'COALESCE',
+                  [before_nodes_branch_for_lavel_subquery, 0]
+              )
+              after_condition = func_maker.new(
+                  'COALESCE',
+                  [after_nodes_branch_far_level_subquery, QUEUE_MAX_VALUE]
+              )
+
+              branch_for_level_subqueries << ff_create_case_expression(
+                [ffqq.lt(before_condition).to_sql, 1],
+                [ffqq.gt(after_condition).to_sql, 1],
+                0
+              )
+            end
+
+            ff_branch_level = branch_for_level_subqueries.join(' + ') + " AS #{@_ff_branch_level}";
+
+            #
+            # create columns
+            #
+            base_columns = ff_all_optional_columns(columns);
+            base_columns << ff_branch_level
+
             # 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(ffdd.eq(aim_depth + depth_offset))
                 .where(ffqq.gteq(before_coalesce_condition))
                 .where(ffqq.lteq(after_coalesce_condition))
-                .select(ff_all_optional_columns(columns))
+                .select(base_columns)
+          end
+
+          #
+          # create case Expression
+          # @param *cases [Array] Cases as:
+          #                      [[when, then], [when, then], ..., else]
+          #
+          def ff_create_case_expression(*cases)
+            when_hash = ['CASE']
+            cases.each do |the_case|
+              if the_case.instance_of?(Array)
+                when_hash << 'WHEN'
+                when_hash << the_case.shift
+                when_hash << 'THEN'
+                when_hash << the_case.shift
+              else
+                when_hash << "ELSE #{the_case}"
+              end
+            end
+            when_hash << 'END'
+
+            when_hash.join(' ')
           end
 
           #
@@ -430,7 +498,7 @@ module StewEucen
           # @version 1.1.0 Replace to use kinships()
           #
           def siblings(base_obj, columns = nil)
-            kinships(base_obj, KINSHIPS_AS_SIBLING, KINSHIPS_SAME_LEVEL, columns)
+            kinships(base_obj, KINSHIPS_BRANCH_LEVEL_ONE, KINSHIPS_SAME_DEPTH, columns)
           end
 
           #
@@ -443,7 +511,7 @@ module StewEucen
           # @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)
+            kinships(base_obj, KINSHIPS_BRANCH_LEVEL_TWO, KINSHIPS_SAME_DEPTH, columns)
           end
 
           #
@@ -456,7 +524,7 @@ module StewEucen
           # @since 1.1.0
           #
           def piblings(base_obj, columns = nil)
-            kinships(base_obj, KINSHIPS_AS_COUSIN, KINSHIPS_PARENT_LEVEL, columns)
+            kinships(base_obj, KINSHIPS_BRANCH_LEVEL_TWO, KINSHIPS_PARENT_DEPTH, columns)
           end
 
           #
@@ -469,7 +537,7 @@ module StewEucen
           # @since 1.1.0
           #
           def niblings(base_obj, columns = nil)
-            kinships(base_obj, KINSHIPS_AS_SIBLING, KINSHIPS_CHILD_LEVEL, columns)
+            kinships(base_obj, KINSHIPS_BRANCH_LEVEL_ONE, KINSHIPS_CHILD_DEPTH, columns)
           end
 
           #
@@ -895,7 +963,8 @@ module StewEucen
                     :ff_get_previous_queue,
                     :ff_queue_sorted_nodes,
 
-                    :ff_sort_with_queue!
+                    :ff_sort_with_queue!,
+                    :ff_create_case_expression
 
           alias superiors  ancestors
           alias forebears  ancestors

data/lib/fertile_forest/saplings.rb

@@ -40,12 +40,12 @@ module StewEucen
       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_BRANCH_LEVEL_ONE = 1   # Distance for finding sibling nodes In kinships().
+      KINSHIPS_BRANCH_LEVEL_TWO = 2   # 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.)
+      KINSHIPS_SAME_DEPTH   = 0   # Same level to find kinships. (such as siblings, cousins.)
+      KINSHIPS_PARENT_DEPTH = -1  # Upper level to find kinships. (such as aunts|uncles)
+      KINSHIPS_CHILD_DEPTH  = 1   # Lower level to find kinships. (such as niblings.)
 
       PRUNE_DESCENDANTS_ONLY = false
       PRUNE_WITH_TOP_NODE    = true
@@ -144,6 +144,7 @@ module StewEucen
               'ff_depth',
               'ff_queue',
               'ff_soft_delete',
+              'ff_branch_level',
             ]
 
             ff_required_columns.each do |key|

data/lib/fertile_forest/version.rb

@@ -1,3 +1,3 @@
 module FertileForest
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fertile_forest
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Stew Eucen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails