forester 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4bb170effc47626daaea911274299fb1ad6dcb
-  data.tar.gz: f16441506f8ef3111ba831e3ec487088c3e44e6d
+  metadata.gz: 074b7d10b4541bc5b2e70d3013990b687ad32e7c
+  data.tar.gz: 99fd514939cd284d71b6388f167d7bc5226a2ce0
 SHA512:
-  metadata.gz: f38b5a46f316eb0fa0be20d350159cba296db9f1a7a8a1cfd52299ff7b88ca3333e5789719c4f9dd6f2964f1196752dd7d452f941a8ff1fb581d3a2fa8cfa4c7
-  data.tar.gz: 045cb745b6d6a868a9689f04764494cbc52e1babe42ea8eed2e33933c5aa9a79dabad37642fc9d06d77bc7c6a2b7b0e9f73b46f0d91273acbcb7b42d3f9902d1
+  metadata.gz: 19320bf3a2d4dbe72f192d0ad370cb0f082206e572371e8013ce036e0f645062025300420ae10e25ab1e368300bf45ced1223dfc973e040f53d759be1b5d025f
+  data.tar.gz: 202fe5a6556f0df1fe6f12b9c547da61d835151ca23e0bbfb5261aa1505828a6a4fe0feb09dfb42341ff7769f1213cbc5e38f602a6980144ebe2c32cda8ddb24

data/forester.gemspec

@@ -6,12 +6,12 @@ require 'forester/version'
 Gem::Specification.new do |s|
   s.name        = 'forester'
   s.version     = Forester::Version
-  s.date        = '2016-10-01'
+  s.date        = '2017-02-26'
   s.summary     = "A gem to represent and interact with tree data structures"
   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'
+  s.homepage    = 'https://github.com/eugeniobruno/forester'
   s.license     = 'MIT'
 
   s.files         = `git ls-files`.split($/)

data/lib/forester/tree_factory.rb

@@ -4,21 +4,10 @@ module Forester
     class << self
 
       def from_yaml_file(file, options = {})
-        default_options = {
-          max_level: :last
-        }
-        options = default_options.merge(options)
-
-        from_hash_with_root_key(YAML.load_file(file))
+        from_hash_with_root_key(YAML.load_file(file), options)
       end
 
       def from_root_hash(hash, options = {})
-        default_options = {
-          max_level:    :last,
-          children_key: :children
-        }
-        options = default_options.merge(options)
-
         from_hash_with_root_key({ root: hash }, options)
       end
 

data/lib/forester/tree_node.rb

@@ -46,10 +46,6 @@ module Forester
       end
     end
 
-    def name
-      content.get(:name, super)
-    end
-
     def contents
       each_node.map(&:content)
     end
@@ -65,5 +61,11 @@ module Forester
       true
     end
 
+    protected
+
+    def as_array(object)
+      [object].flatten(1)
+    end
+
   end
 end

data/lib/forester/tree_node_ext/aggregators.rb

@@ -4,7 +4,7 @@ module Forester
     def own_and_descendants(field, &if_missing)
       if_missing = -> (node) { [] } unless block_given?
 
-      flat_map { |node| Array(node.get(field, &if_missing)) }
+      flat_map { |node| as_array(node.get(field, &if_missing)) }
     end
 
     def nodes_with(field, values, options = {})
@@ -15,10 +15,10 @@ module Forester
 
       method = options[:single] ? :find : :select
       found_nodes = each_node.public_send(method) do |node|
-        not ( Array(node.get(field) { :no_match }) & Array(values) ).empty?
+        not ( as_array(node.get(field) { :no_match }) & as_array(values) ).empty?
       end
 
-      Array(found_nodes)
+      as_array(found_nodes)
     end
 
     def with_ancestry(options = {})
@@ -29,9 +29,9 @@ module Forester
       }
       options = default_options.merge(options)
 
-      ancestors = self.parentage           || []
-      ancestors = ancestors[0...-1]        unless options[:include_root]
-      ancestors = ancestors.unshift(self)  if     options[:include_self]
+      ancestors = self.parentage          || []
+      ancestors = ancestors[0...-1]       unless options[:include_root]
+      ancestors = ancestors.unshift(self) if     options[:include_self]
 
       options[:descending] ? ancestors.reverse : ancestors
     end
@@ -46,12 +46,12 @@ module Forester
       }
       options = default_options.merge(options)
 
-      found_nodes = nodes_with(options[:by_field], options[:keywords], { single: options[:single_node] } )
+      found_nodes = nodes_with(options[:by_field], options[:keywords], single: options[:single_node] )
 
       return found_nodes if options[:then_get] == :nodes
 
       found_nodes.flat_map do |node|
-        node.get(options[:then_get], { subtree: options[:subtree] })
+        node.get(options[:then_get], subtree: options[:subtree])
       end
     end
 
@@ -69,7 +69,7 @@ module Forester
       nodes_of_level(options[:level]).each_with_object({}) do |node, hash|
         key =
           if options[:ancestry_in_keys]
-            nodes_for_key = node.with_ancestry({ include_root: options[:with_root] })
+            nodes_for_key = node.with_ancestry(include_root: options[:with_root])
             nodes_for_key.map { |n| get_or_id(n, options[:group_field]) }
           else
             get_or_id(node, options[:group_field])

data/lib/forester/tree_node_ext/mutators.rb

@@ -44,9 +44,9 @@ module Forester
 
       new_value =
         if percolate
-          current_value & Array(values)
+          current_value & as_array(values)
         else
-          current_value - Array(values)
+          current_value - as_array(values)
         end
 
       put!(field, new_value)

data/lib/forester/tree_node_ext/views.rb

@@ -23,7 +23,7 @@ module Forester
         if max_level == 0
           []
         else
-          next_options = options.merge({ max_level: max_level - 1 })
+          next_options = options.merge(max_level: max_level - 1)
           children.map { |node| node.as_root_hash(next_options) }
         end
 

data/lib/forester/version.rb

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

data/test/test_tree_factory.rb

@@ -27,7 +27,7 @@ class TestTreeFactory < Minitest::Test
   protected
 
   def new_with_max_level(hash, max_level)
-    Forester::TreeFactory.from_root_hash(hash['root'], { max_level: max_level })
+    Forester::TreeFactory.from_root_hash(hash['root'], max_level: max_level)
   end
 
 end

data/test/test_tree_node.rb

@@ -19,13 +19,13 @@ class TestTreeNode < Minitest::Test
 
     assert_equal expected, actual
 
-    assert_equal values, @@tree.get('value', { subtree: true })
+    assert_equal values, @@tree.get('value', subtree: true)
   end
 
   def test_missing_values
     assert_equal 0,    @@tree.get('value')
-    assert_equal 'no', @@tree.get('whatever', { default: 'no' })
-    assert_equal 'no', @@tree.get('whatever', { default: 'missing' }) { 'no' }
+    assert_equal 'no', @@tree.get('whatever', default: 'no')
+    assert_equal 'no', @@tree.get('whatever', default: 'missing') { 'no' }
     assert_equal 'no', @@tree.get('whatever') { 'no' }
     assert_equal 'no', @@tree.get('whatever') { |n| 'no' }
     assert_equal 1,    @@tree.get('whatever') { |n| n.get('value') + 1 }

data/test/test_views.rb

@@ -12,7 +12,7 @@ class TestViews < Minitest::Test
     add_empty_children_keys(hash['root'])
 
     expected = hash['root']
-    actual   = @@tree.as_root_hash({ stringify_keys: true })
+    actual   = @@tree.as_root_hash(stringify_keys: true)
 
     assert_equal expected, actual
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forester
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Eugenio Bruno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-01 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree
@@ -28,42 +28,42 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '11.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.9'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 description: Based on rubytree, this gem lets you build trees and run queries against
@@ -98,7 +98,7 @@ files:
 - test/test_validators.rb
 - test/test_views.rb
 - test/trees/simple_tree.yml
-homepage: http://rubygems.org/gems/forester
+homepage: https://github.com/eugeniobruno/forester
 licenses:
 - MIT
 metadata: {}
@@ -108,17 +108,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A gem to represent and interact with tree data structures