forester 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca08cece8313d3e3c8b20bae94f78163b81853cb
-  data.tar.gz: d6b07a8b064d28e35b302a9999f5c45b8a0bcdb2
+  metadata.gz: 0b068adf6d25cfadca224f86d1b64a7668fadf5d
+  data.tar.gz: 9d4494437e8bc4387b4254217e178a41890c2a3c
 SHA512:
-  metadata.gz: 696d7af03b121cba11c01a3fb75aea488edf4a56a415a266bf3c2971f8111358dac17e40a06a110aba00171fd838306034337bbe1b17f9b337c6c91f6676fcd8
-  data.tar.gz: 3ca6bd73015e51026f8aec700ce061affccea8540db8eedab15b6967ae0421931e5497145a59762c53734ac10502f617f38fb24bab4b9aba756a05f14f7070c1
+  metadata.gz: a0e0684ef70d37ddfd9e4751ecaad5a8fe3fcd03d06a33f0f05158882295e31192a09a9478b1dfdf0323f91934827a68c4b78c5dc3ad2624c6ad6e429b248c9a
+  data.tar.gz: b5619bcb98e2ca43789f8422cd33c38747997fc695c7dad7bdee14676d728f4cbaa152ea3b4b4b207c2ad53197a1a65e545e857d2febbb42e5e988a581165735

data/forester.gemspec

@@ -6,9 +6,9 @@ require 'forester/version'
 Gem::Specification.new do |s|
   s.name        = 'forester'
   s.version     = Forester::Version
-  s.date        = '2016-07-24'
+  s.date        = '2016-07-26'
   s.summary     = "A gem to represent and interact with tree data structures"
-  s.description = "Based on rubytree and enzymator, this gem lets you build trees and run queries against them."
+  s.description = "Based on rubytree, this gem lets you build trees and run queries against them."
   s.authors     = ["Eugenio Bruno"]
   s.email       = 'eugeniobruno@gmail.com'
   s.homepage    = 'http://rubygems.org/gems/forester'
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.0.0'
 
   s.add_runtime_dependency 'rubytree', ['0.9.7']
-  s.add_runtime_dependency 'enzymator', ['1.0.0']
 
   s.add_development_dependency 'rake', ['~> 11.2']
   s.add_development_dependency 'minitest', ['~> 5.9']

data/lib/forester/aggregators.rb

@@ -4,20 +4,41 @@ module Forester
     def own_and_descendants(options = {})
       default_options = {
         field: 'name',
-        if_field_missing: ->(c) { [] },
+        if_field_missing: -> (c) { [] },
       }
 
       options = default_options.merge(options)
 
-      Enzymator::Aggregations::MapReduce.new(
-        {
-          mapping:     ->(node) { Array(node.get(options[:field], &options[:if_field_missing])) },
-          #reduction:   ->(acum, values) { acum.concat(values) },
-          #empty: []
-          # automatically assumed
-        }
-      )
-      .run_on(self)
+      flat_map do |node|
+        Array(node.get(options[:field], &options[:if_field_missing]))
+      end
+    end
+
+    def values_by_field(options)
+      default_options = {
+        field_to_search:     'name',
+        search_keyword:      :missing_search_keyword,
+        values_key:          :missing_values_key,
+        include_descendants: false,
+        assume_uniqueness:   false
+      }
+      options = default_options.merge(options)
+
+      found_nodes = nodes_with(options[:field_to_search], options[:search_keyword])
+
+      # When assuming that node names are unique,
+      # if more than one node was found,
+      # discard all but the first one
+      found_nodes = found_nodes.slice(0, 1) if options[:assume_uniqueness]
+
+      found_nodes.flat_map do |node|
+        if options[:include_descendants]
+          node.own_and_descendants({ field: options[:values_key] })
+        else
+          node.get(options[:values_key])
+        end
+      end
+
     end
 
     def values_by_subtree_of_level(options = {})
@@ -25,40 +46,32 @@ module Forester
         level:                    1,
         group_field:              'name',
         aggregation_field:        'value',
-        if_field_missing:         ->(c) { [] },
+        if_field_missing:         -> (c) { [] },
         include_ancestry_in_keys: false, # if false, with_root is ignored
         with_root:                false,
       }
 
       options = default_options.merge(options)
 
-      input = nodes_of_level(options[:level])
-
-      Enzymator::Aggregations::MapReduce.new({
-        mapping: ->(node) {
-
-          key_nodes = if options[:include_ancestry_in_keys]
-                        node.ancestry(options[:with_root], true)
-                      else
-                        [node]
-                      end
-
-          key = key_nodes.map { |kn| kn.get(options[:group_field]) { |n| n.object_id } }
-          key = key.first if key.one?
-
-          value = node.own_and_descendants(
-            {
-              field: options[:aggregation_field],
-              if_field_missing: options[:if_field_missing]
-            }
-          )
-
-          { key => value }
-        },
-        # reduction: ->(acum, hash) { acum.merge(hash) }
-        # empty: {}
-        # automatically assumed
-      }).run_on(input)
+      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)
+                    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]
+          }
+        )
+
+        hash[key] = value
+      end
     end
 
   end

data/lib/forester/tree_node.rb

@@ -4,9 +4,9 @@ module Forester
     include Aggregators
 
     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
+      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
 
@@ -28,33 +28,6 @@ module Forester
       end
     end
 
-    def values_by_field(options)
-      default_options = {
-        field_to_search: 'name',
-        search_keyword: :missing_search_keyword,
-        values_key: :missing_values_key,
-        include_descendants: false,
-        assume_uniqueness: false
-      }
-      options = default_options.merge(options)
-
-      found_nodes = nodes_with(options[:field_to_search], options[:search_keyword])
-
-      # When assuming that node names are unique,
-      # if more than one node was found,
-      # discard all but the first one
-      found_nodes = found_nodes.slice(0, 1) if options[:assume_uniqueness]
-
-      found_nodes.flat_map do |node|
-        if options[:include_descendants]
-          node.own_and_descendants({ field: options[:values_key] })
-        else
-          node.get(options[:values_key])
-        end
-      end
-
-    end
-
     def nodes_with(content_key, content_value)
       each_node.select { |node| Array(node.get(content_key) { :no_match }).include? content_value }
     end

data/lib/forester/version.rb

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

data/lib/forester.rb

@@ -1,5 +1,4 @@
 require 'tree'
-require 'enzymator'
 require 'securerandom'
 require 'yaml'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forester
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Eugenio Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree
@@ -24,20 +24,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.7
-- !ruby/object:Gem::Dependency
-  name: enzymator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +66,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: Based on rubytree and enzymator, this gem lets you build trees and run
-  queries against them.
+description: Based on rubytree, this gem lets you build trees and run queries against
+  them.
 email: eugeniobruno@gmail.com
 executables: []
 extensions: []