forester 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 268ad2f30fdb06a9fbc2fe57e2f044a1a234639a
-  data.tar.gz: 008ea947763719e1d4c1ea5101a8d889979907f9
+  metadata.gz: a837fb2321275845b5c51622079d41896966145e
+  data.tar.gz: 5e1deb643c9233e5d376839948ac74a369bb5e13
 SHA512:
-  metadata.gz: 1fa2bd80e48031e9ccc8e269e20a3b60266252f4f857c046cfa2e53bbf7599eb6f5270b5c6724f628d8cecbe66f8d198f0c96f4e2dc660999c456326b2d6d047
-  data.tar.gz: ed777a43b80efdf961a89e7dd03010b432096e9236b6f48cf64a25b12cb96941f9eef1bfecec60664008630ecc40a7cd3098d8689956c5999d9c67471adfc618
+  metadata.gz: 9622068a5b9e8d56dddd96b87e7553d377390b7cfc25d14154dbe4255a30fc6f83f260cf2c8f038728aed4a77f893e161588e475b96de40dfd86f9f86e916ce8
+  data.tar.gz: 8b7b017668323e9c00544518944fdbf1cf7595cdb08b33986d119bf52add39da096cbf3372c73bd4c2b2f7c31631c90a330aa3e3946ce3e93930798eead421a6

data/lib/forester/aggregators.rb

@@ -1,16 +1,24 @@
 module Forester
   module Aggregators
 
-    def own_and_descendants(options = {})
+    def with_ancestry(options = {})
       default_options = {
-        field: :name,
-        if_field_missing: -> (c) { [] },
+        include_root: true,
+        include_self: true,
+        descending: true
       }
-
       options = default_options.merge(options)
 
+      ancestors = self.parentage           || []
+      ancestors = ancestors[0...-1]        unless options[:include_root]
+      ancestors = ancestors.unshift(self)  if     options[:include_self]
+      if options[:descending] then ancestors.reverse else ancestors end
+    end
+
+    def own_and_descendants(field_name, &if_field_missing)
+      if_field_missing = -> (node) { [] } unless block_given?
       flat_map do |node|
-        Array(node.get(options[:field], &options[:if_field_missing]))
+        Array(node.get(field_name, &if_field_missing))
       end
     end
 
@@ -33,7 +41,7 @@ module Forester
 
       found_nodes.flat_map do |node|
         if options[:include_descendants]
-          node.own_and_descendants({ field: options[:values_key] })
+          node.own_and_descendants(options[:values_key])
         else
           node.get(options[:values_key])
         end
@@ -46,29 +54,22 @@ module Forester
         level:                    1,
         group_field:              'name',
         aggregation_field:        'value',
-        if_field_missing:         -> (c) { [] },
+        if_field_missing:         -> (node) { [] },
         include_ancestry_in_keys: false, # if false, with_root is ignored
         with_root:                false,
       }
-
       options = default_options.merge(options)
 
       nodes_of_level(options[:level]).each_with_object({}) do |node, hash|
 
         key_nodes = if options[:include_ancestry_in_keys]
-                      node.ancestry(options[:with_root], true)
+                      node.with_ancestry({ include_root: options[:with_root] })
                     else
                       node
                     end
 
         key = key_nodes.map { |kn| kn.get(options[:group_field]) { |n| n.object_id } }
-
-        value = node.own_and_descendants(
-          {
-            field: options[:aggregation_field],
-            if_field_missing: options[:if_field_missing]
-          }
-        )
+        value = node.own_and_descendants(options[:aggregation_field], &options[:if_field_missing])
 
         hash[key] = value
       end

data/lib/forester/node_content.rb

@@ -21,9 +21,9 @@ module Forester
 
     def method_missing(name, *args, &block)
       if @hash.has_key?(name)
-        @hash.fetch(name)
+        @hash[name]
       elsif block_given?
-        yield self
+        yield args.fetch(0, {yield_to: self})[:yield_to]
       else
         raise ArgumentError.new("the node \"#{self.name}\" does not have any \"#{name}\"")
       end

data/lib/forester/tree_node.rb

@@ -5,13 +5,6 @@ module Forester
     include Mutators
     include Views
 
-    def ancestry(include_root = true, include_self = false, descending = true)
-      ancestors = self.parentage           || []
-      ancestors = ancestors[0...-1]        unless include_root
-      ancestors = ancestors.unshift(self)  if     include_self
-      if descending then ancestors.reverse else ancestors end
-    end
-
     def nodes_of_level(l)
       if l.between?(0, max_level) then each_level.take(l + 1).last else [] end
     end
@@ -35,7 +28,7 @@ module Forester
     alias_method :each_node, :breadth_each
 
     def get(field, &block)
-      content.public_send(field, &block)
+      content.public_send(field, { yield_to: self }, &block)
     end
 
     def field_names

data/lib/forester/version.rb

@@ -1,7 +1,7 @@
 module Forester
   class Version
-    MAJOR = 1
-    MINOR = 1
+    MAJOR = 2
+    MINOR = 0
     PATCH = 0
     PRE = nil
 

data/test/test_treenode.rb

@@ -64,9 +64,7 @@ class TestTreeNode < Minitest::Test
     assert_equal 1, found_nodes.length
 
     actual_names = found_nodes.flat_map do |node|
-      node.own_and_descendants({
-        field: 'strings'
-      })
+      node.own_and_descendants('strings')
     end
 
     assert_equal expected_names, actual_names

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forester
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Eugenio Bruno