tukey 0.9.1RC → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa5c9361b807e12f7e5c3c9d49de09213934977
-  data.tar.gz: c24ac668997f801c79cdd68f53fe97b5628d42ee
+  metadata.gz: d8a8ef46adf65742612a80840d3efb68edc3e3c8
+  data.tar.gz: cbc2848c54ad1f31aea26470ef20ef96177f0f7c
 SHA512:
-  metadata.gz: 0405c68516dbf803716d8909e8c50a4e9f8567df0c6067be68f28b768143a90030aea594b5d3c66787b7d8a51f443b3a3bb4a4b3dfc15572abe115967668a185
-  data.tar.gz: 5b4ab185832e2acec89a4cf7b4b55062bd825ef97795454002fa32ea6d61fbec8ed1e68d663287e3d7fc3621b36555293191a5f2917ad8516090123eab881c2a
+  metadata.gz: 2ac224235943f1e3cd63575bb1d0098cd6f86dee0d1f7e6fe2bfcfe41986d404a8fd28b8a11d751f6165adf757175d3aaa51a2098f5a7580b766334c03989c4c
+  data.tar.gz: 4a4bbaf6322b6382e09a880871be262e92e4b7dc4c6ce05ee0672e5b9f5690c0f3d9a3dabb9e1ee110cb0f13f07489aa65c3385d0ec5b9a992b3cf585792b5b6

data/lib/tukey/data_set.rb

@@ -121,17 +121,37 @@ class DataSet
     end
   end
 
-  def find(subtree_id)
-    if id == subtree_id
-      self
-    elsif data_array?
-      data.each do |child|
-        match = child.find(subtree_id)
-        return match if match
-      end
+  def find(subtree_id = nil, &block)
+    return super if block_given?
+    return self if id == subtree_id
+    return nil unless data_array?
+    data.each do |child|
+      match = child.find(subtree_id)
+      return match if match
+    end
+    nil
+  end
+
+  def find_by(query)
+    return find { |s| s.to_comparable_h.deep_merge(query) == s.to_comparable_h }
+  end
 
-      nil
+  def to_comparable_h
+    ch = {
+      id: self.id,
+    }
+
+    ch[:data] = data unless data_array?
+
+    if label
+      ch[:label] = {
+        id: label.id,
+        name: label.name,
+        meta: label.meta.to_h,
+      }
     end
+
+    ch
   end
 
   def <=>(other)

data/lib/tukey/version.rb

@@ -1,3 +1,3 @@
 module Tukey
-  VERSION = "0.9.1RC"
+  VERSION = "1.0.0"
 end

data/lib/tukey.rb

@@ -1,2 +1,3 @@
+require File.join(File.dirname(__FILE__), "vendor", "hash")
 require File.join(File.dirname(__FILE__), "tukey", "version")
 require File.join(File.dirname(__FILE__), "tukey", "data_set")

data/lib/vendor/hash.rb

@@ -0,0 +1,59 @@
+# Copyright (c) 2005-2014 David Heinemeier Hansson
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Hash
+  # Returns a new hash with +self+ and +other_hash+ merged recursively.
+  #
+  #   h1 = { a: true, b: { c: [1, 2, 3] } }
+  #   h2 = { a: false, b: { x: [3, 4, 5] } }
+  #
+  #   h1.deep_merge(h2) # => { a: false, b: { c: [1, 2, 3], x: [3, 4, 5] } }
+  #
+  # Like with Hash#merge in the standard library, a block can be provided
+  # to merge values:
+  #
+  #   h1 = { a: 100, b: 200, c: { c1: 100 } }
+  #   h2 = { b: 250, c: { c1: 200 } }
+  #   h1.deep_merge(h2) { |key, this_val, other_val| this_val + other_val }
+  #   # => { a: 100, b: 450, c: { c1: 300 } }
+  def deep_merge(other_hash, &block)
+    dup.deep_merge!(other_hash, &block)
+  end
+
+  # Same as +deep_merge+, but modifies +self+.
+  def deep_merge!(other_hash, &block)
+    other_hash.each_pair do |current_key, other_value|
+      this_value = self[current_key]
+
+      self[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
+        this_value.deep_merge(other_value, &block)
+      else
+        if block_given? && key?(current_key)
+          block.call(current_key, this_value, other_value)
+        else
+          other_value
+        end
+      end
+    end
+
+    self
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tukey
 version: !ruby/object:Gem::Version
-  version: 0.9.1RC
+  version: 1.0.0
 platform: ruby
 authors:
 - Achilleas Buisman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,6 +76,7 @@ files:
 - lib/tukey/data_set.rb
 - lib/tukey/data_set/label.rb
 - lib/tukey/version.rb
+- lib/vendor/hash.rb
 - tukey.gemspec
 homepage: https://github.com/abuisman/tukey
 licenses:
@@ -92,9 +93,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1