duct_tape 0.3.0 → 0.3.4

data/Rakefile

@@ -3,6 +3,7 @@ require 'rake'
 require 'jeweler'
 
 VERSION_FILE = File.expand_path("../VERSION", __FILE__)
+GEMSPEC_FILE = File.expand_path("../duct_tape.gemspec", __FILE__)
 VERSION_STRING = File.read(VERSION_FILE).strip
 Jeweler::Tasks.new do |gem|
   gem.name = "duct_tape"
@@ -111,7 +112,12 @@ namespace :version do
       f.write(VERSION_STRING.sub!(/^(\d+)\.(\d+)\.(\d+)$/) { |s| "#{$1}.#{$2}.#{$3.to_i + 1}" })
     end
     commit_msg = "New Version: #{VERSION_STRING}"
-    sh "git commit -m #{commit_msg.inspect} #{(VERSION_FILE).to_s.inspect}"
+    files = [VERSION_FILE.inspect]
+    if Rake::Task[:gemspec]
+      Rake::Task[:gemspec].invoke
+      files << GEMSPEC_FILE.inspect
+    end
+    sh "git commit -m #{commit_msg.inspect} #{files.join(" ")}"
     sh "git checkout -- #{(VERSION_FILE).to_s.inspect}"
   end
 
@@ -122,7 +128,12 @@ namespace :version do
       f.write(VERSION_STRING.sub!(/^(\d+)\.(\d+)\.(\d+)$/) { |s| "#{$1}.#{$2.to_i + 1}.0" })
     end
     commit_msg = "New Version: #{VERSION_STRING}"
-    sh "git commit -m #{commit_msg.inspect} #{(VERSION_FILE).to_s.inspect}"
+    files = [VERSION_FILE.inspect]
+    if Rake::Task[:gemspec]
+      Rake::Task[:gemspec].invoke
+      files << GEMSPEC_FILE.inspect
+    end
+    sh "git commit -m #{commit_msg.inspect} #{files.join(" ")}"
     sh "git checkout -- #{(VERSION_FILE).to_s.inspect}"
   end
 
@@ -133,7 +144,12 @@ namespace :version do
       f.write(VERSION_STRING.sub!(/^(\d+)\.(\d+)\.(\d+)$/) { |s| "#{$1.to_i + 1}.0.0" })
     end
     commit_msg = "New Version: #{VERSION_STRING}"
-    sh "git commit -m #{commit_msg.inspect} #{(VERSION_FILE).to_s.inspect}"
+    files = [VERSION_FILE.inspect]
+    if Rake::Task[:gemspec]
+      Rake::Task[:gemspec].invoke
+      files << GEMSPEC_FILE.inspect
+    end
+    sh "git commit -m #{commit_msg.inspect} #{files.join(" ")}"
     sh "git checkout -- #{(VERSION_FILE).to_s.inspect}"
   end
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.4

data/duct_tape.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "duct_tape"
-  s.version = "0.3.0"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Rodriguez"]
-  s.date = "2014-06-23"
+  s.date = "2014-06-25"
   s.description = "A general-purpose utility library for Ruby"
   s.email = ["tw.rodriguez@gmail.com"]
   s.extensions = ["ext/mkrf_conf.rb"]
@@ -111,3 +111,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
+

data/lib/duct_tape/fuzzy_hash.rb

@@ -43,6 +43,21 @@ module Containers
       @hash.inspect
     end
 
+    def keys
+      @hash.keys
+    end
+
+    def values
+      @hash.values
+    end
+
+    # TODO
+    #def method_missing(*args, &block)
+    #  ret = @hash.__send__(*args, &block)
+    #  rebuild_hash
+    #  ret
+    #end
+
     def to_s
       @hash.to_s
     end

data/lib/ext/hash.rb

@@ -45,10 +45,14 @@ class Hash
   alias_method :&, :select_keys
 
   def select_keys!(other, &block)
-    type_assert(other, Array, Hash)
     unless block_given?
+      type_assert(other, Array, Hash, Regexp)
       other = other.keys if Hash === other
-      block = proc { |k| other.include?(k) }
+      if Regexp === other
+        block = proc { |k| other === k }
+      else
+        block = proc { |k| other.include?(k) }
+      end
     end
     self.reject! { |key,val| !block[key] }
   end
@@ -61,10 +65,14 @@ class Hash
   alias_method :-, :reject_keys
 
   def reject_keys!(other, &block)
-    type_assert(other, Array, Hash)
     unless block_given?
+      type_assert(other, Array, Hash, Regexp)
       other = other.keys if Hash === other
-      block = proc { |k| other.include?(k) }
+      if Regexp === other
+        block = proc { |k| other === k }
+      else
+        block = proc { |k| other.include?(k) }
+      end
     end
     self.reject! { |key,val| block[key] }
   end
@@ -80,4 +88,52 @@ class Hash
   def not_empty?(arg)
     !empty?
   end
+
+  def flatten_nested!(key_joiner="__")
+    changed = false
+    keys.each do |base_key|
+      if self[base_key].is_a?(Hash)
+        self[base_key].flatten_nested!(key_joiner)
+        self[base_key].each_pair do |k,v|
+          self["#{base_key}#{key_joiner}#{k}"] = v
+        end
+        delete(base_key)
+        changed = true
+      end
+    end
+    changed ? self : nil
+  end
+
+  def expand_nested!(key_joiner="__")
+    changed = false
+    keys.each do |base_key|
+      if base_key[key_joiner]
+        nested_keys = base_key.split(key_joiner)
+        hsh_ref = self
+        nested_keys.each_with_index do |key,idx|
+          if idx == nested_keys.size - 1
+            hsh_ref[key] = self[base_key]
+          else
+            hsh_ref[key] ||= {}
+            hsh_ref = hsh_ref[key]
+          end
+        end
+        delete(base_key)
+        changed = true
+      end
+    end
+    changed ? self : nil
+  end
+
+  def flatten_nested(key_joiner="__")
+    target = deep_dup
+    target.flatten_nested!(key_joiner)
+    target
+  end
+
+  def expand_nested(key_joiner="__")
+    target = deep_dup
+    target.expand_nested!(key_joiner)
+    target
+  end
 end

data/spec/ext/hash_spec.rb

@@ -103,3 +103,47 @@ describe Hash, "#to_h" do
     expect(a).to eq(b)
   end
 end
+
+#
+# Hash#flatten_nested
+#
+describe Hash, "#flatten_nested" do
+  it "should have the method defined" do
+    expect(Hash.method_defined?(:flatten_nested)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Hash#flatten_nested!
+#
+describe Hash, "#flatten_nested!" do
+  it "should have the method defined" do
+    expect(Hash.method_defined?(:flatten_nested!)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Hash#expand_nested
+#
+describe Hash, "#expand_nested" do
+  it "should have the method defined" do
+    expect(Hash.method_defined?(:expand_nested)).to be(true)
+  end
+
+  pending "More tests"
+end
+
+#
+# Hash#expand_nested!
+#
+describe Hash, "#expand_nested!" do
+  it "should have the method defined" do
+    expect(Hash.method_defined?(:expand_nested!)).to be(true)
+  end
+
+  pending "More tests"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duct_tape
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets