tukey 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 983ed9bbc18f085f8b33609ff13c6794db8140e3
-  data.tar.gz: e08a4102017038fc28cb4205ab16cb74e14f271f
+SHA256:
+  metadata.gz: 7b7a7f474704898d007927e3ffee77173219edd492411ea0275db0225f7a2509
+  data.tar.gz: f4404b3ec404c3de2597ffff5d2759151d246c1263c4d73ae746adda7b454eca
 SHA512:
-  metadata.gz: 1f2f63eed3a6779330e6e5b3d6200100df1fd1046a8956d45215073ddf84b42b187c079452ac1b96aeb7bf5842c4a0aacbaadda25bdcc006348ffd39731c0667
-  data.tar.gz: 537c350faa79e346cbd2668dd4e1b68f0850d72b1bc8afc4178af9076d3659451d21e4bf3879291bd4461aaa37b3629ed0e03b3d82fcd9495776e80b031ace5d
+  metadata.gz: 8269e1e0bf6649ad7a2dc01b10031a1fd144b13edd861a542347a7adbd144fd01b8dcae3ec41118fafe8b0d9284b002d6c05cbe2438fc464d144a321742f4549
+  data.tar.gz: 2046b5827342f80cbb7073dc0ba70d420abbbf99341210e7ec302405142f9d26ad5fde5265d26c4753233339fb5a38e5726a4c6735092d55083f7da549a952bf

data/.travis.yml

@@ -1,5 +1,4 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.13.6
+  - 2.6.2

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in tukey.gemspec
 gemspec
 
-gem 'pry', '~> 0.10.4'
+gem 'pry', '~> 0.12.2'
 gem 'pry-coolline', '~> 0.2.5'

data/lib/tukey/data_set.rb

@@ -46,6 +46,10 @@ class DataSet
     []
   end
 
+  def leafs
+    children.select(&:leaf?)
+  end
+
   def siblings
     return [] if parent.nil?
     parent.children.reject { |c| c == self }
@@ -69,7 +73,7 @@ class DataSet
   end
 
   def oneling?
-    siblings.none?
+    leaf? ? siblings.none? : siblings.reject(&:leaf?).none?
   end
 
   def root?
@@ -127,8 +131,10 @@ class DataSet
   #
   def filter(leaf_label_id = nil, keep_leafs: false, orphan_strategy: :destroy, &block)
     fail ArgumentError, 'No block and no leaf_label_id passed' if !block_given? && leaf_label_id.nil?
+    fail 'Cannot filter value DataSets' unless data_array?
+    return self.dup if self.data.empty?
 
-    self.data.each_with_object(DataSet.new(id: id, label: label.deep_dup)) do |set, parent_set|
+    self.data.each_with_object(DataSet.new(label: label.deep_dup, data: nil, parent: parent, id: id)) do |set, parent_set|
       if block_given?
         condition_met = yield(parent_set, set)
       else
@@ -145,7 +151,7 @@ class DataSet
         deep_filter_result = set_dup.filter(leaf_label_id, keep_leafs: keep_leafs, orphan_strategy: orphan_strategy, &block)
 
         # Here is where either the taking along or adopting of nodes happens
-        if deep_filter_result.data
+        if deep_filter_result.data && !deep_filter_result.data.empty?
           # Filtering underlying children and adding the potential filter result to parent.
           parent_set.add_item(deep_filter_result) if condition_met.nil?
 
@@ -156,13 +162,11 @@ class DataSet
       elsif condition_met.nil? && set.leaf?
         parent_set.add_item(set_dup) if keep_leafs
       end
-
-      parent_set
     end
   end
 
   def find(subtree_id = nil, &block)
-    return super if block_given?
+    return super if block_given? # It recursively searches descendants for data set matching block
     return self if id == subtree_id
     return nil unless data_array?
     data.each do |child|
@@ -198,9 +202,11 @@ class DataSet
     return 0 if data == other.data && label == other.label
     return 1 if data && other.data.nil?
     return -1 if data.nil? && other.data
-    return label.id <=> other.label.id if label.id <=> other.label.id
-    return data <=> other.data if data.is_a?(Numeric) && other.data.is_a?(Numeric)
-    data.size <=> other.data.size
+    return 1 if data_array? && !other.data_array?
+    return -1 if !data_array? && other.data_array?
+    return label.id <=> other.label.id if label && other.label && label.id <=> other.label.id
+    return data.size <=> other.data.size if data_array? && other.data_array?
+    data <=> other.data
   end
 
   # == is used for comparison of two instances directly
@@ -243,7 +249,10 @@ class DataSet
   end
 
   def sum
-    values = [reducable_values].flatten.compact
+    # Leafs are considered a sum of their underlying data_sets,
+    # therefore we can just sum the leafs if present.
+    return value == [] ? nil : value if leaf? # TODO: Make redundant by not allowing [] in `data` to begin with
+    values = (leafs.any? ? leafs.map(&:value) : children.map(&:sum)).compact
     return nil if values.empty?
     values.inject(&:+)
   end
@@ -260,16 +269,46 @@ class DataSet
     set.data
   end
 
-  def combine(other_data_set, operator)
-    combined_data_set = dup
-    if data_array? && other_data_set.data_array?
-      combined_data_set.data = combine_data_array(other_data_set.children, operator)
-    elsif !data_array? && !other_data_set.data_array?
-      combined_data_set.data = combine_data_value(other_data_set.value, operator)
+  def transform_labels!(&block)
+    self.label = yield(label, self)
+    data.each { |d| d.transform_labels!(&block) } if data_array?
+    self
+  end
+
+  def transform_values!(&block)
+    if data_array?
+      self.data = data.map { |d| d.transform_values!(&block) }
     else
-      fail ArgumentError, "Can't combine array DataSet with value DataSet"
+      self.data = yield(value, self)
     end
-    combined_data_set
+    self
+  end
+
+  def merge(other_data_set, &block)
+    merged_data_set = dup
+    if data_array? && other_data_set.data_array? # Merge sets
+      other_children = other_data_set.children.dup
+      merged_children = children.map do |child|
+        other_child = other_children.find { |ods| ods.label == child.label }
+        if other_child
+          other_children.delete(other_child)
+          child.merge(other_child, &block)
+        else
+          child
+        end
+      end
+      merged_children += other_children # The remaining other children (without matching child in this data set)
+      merged_data_set.data = merged_children
+    elsif !data_array? && !other_data_set.data_array? # Merge values
+      if block_given? # Combine data using block
+        merged_data_set.data = yield(label, value, other_data_set.value)
+      else # Simply overwrite data with other data
+        merged_data_set.data = other_data_set.value
+      end
+    else
+      fail ArgumentError, "Can't merge array DataSet with value DataSet"
+    end
+    merged_data_set
   end
 
   def data_array?
@@ -310,41 +349,6 @@ class DataSet
   def dup_value(value)
     value.is_a?(Numeric) ? value : value.dup
   end
-
-  def combine_data_array(other_children, operator)
-    other_children = other_children.dup
-    result = children.map do |child|
-      other_child = other_children.find { |ods| ods.label == child.label }
-      if other_child
-        other_children.delete(other_child)
-        child.combine(other_child, operator)
-      else
-        child
-      end
-    end
-    result += other_children # The remaining other children (without matching child in this data set)
-    result
-  end
-
-  def combine_data_value(other_value, operator)
-    own_value = value
-
-    # Always return nil if both values are nil (prevents summed data sets of being wrongly considered unempty and thus not hidden)
-    return nil if own_value.nil? && other_value.nil?
-
-    case operator.to_sym
-    when :+, :-
-      # When adding or subtracting treat nil (unknown) values as zero, instead of returning nil as summation result
-      own_value ||= 0.0
-      other_value ||= 0.0
-    when :/
-      # Prevent division by zero resulting in NaN/Infinity values
-      other_value = nil if other_value&.zero?
-    end
-
-    return nil if own_value.nil? || other_value.nil?
-    own_value.send(operator, other_value)
-  end
 end
 
 class CannotAddToNonEnumerableData < StandardError

data/lib/tukey/version.rb

@@ -1,3 +1,3 @@
 module Tukey
-  VERSION = "2.0.0"
+  VERSION = "2.2.0"
 end

data/tukey.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 1.17.2"
+  spec.add_development_dependency "rake", "~> 12.3.2"
+  spec.add_development_dependency "rspec", "~> 3.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tukey
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Achilleas Buisman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.8.0
 description: Tukey provides DataSets which can be put in a tree. This way you can
   store partial results of calculations or other data and, for example, create charts,
   tables or other presentations.
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: DataSets for putting data in a tree of sets