obfusk-util 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf7375bb3b37224db96e59696194cd81e6a1abc
-  data.tar.gz: d9c148f1ba2b5fefd2e93012ee18a1126a0db3a8
+  metadata.gz: 965ed408e2dc3fda80936c94b7ae17c89c4a5bfe
+  data.tar.gz: 794f55bedb6c351327c5e163cd22af9f4653eeb8
 SHA512:
-  metadata.gz: 8ee94a5abc89f7cfb162210ea6336cf9dbdc227ef52fb65075a1a126fd5b9bdbda777085a02766d01d551aa09ea8ee26066c1969534098d533c37c59fad4c928
-  data.tar.gz: dfc6216044f4b197ef8c527df107c2743b87f5145c450d46ccc08c0419ab6c2b5f6c71bce3b557058128f937e732855ee223eb9fa344dd2bdaf4d9c84c5d4b8f
+  metadata.gz: 9d9b1bec69b6340241e94a92b11c62ed3ef24d35c2b6497f858bd28e68cfbe7ff9b5c16f4e5fd8e73c06db187bcc07cf5464ab70eb6bee0be6a8645605c89bb3
+  data.tar.gz: c8b1c572997fb721fd67d17c5cb891d4c386bde6314fd77f0ad260a12805faf9acfa85e9b9b50b798e8f78736c933b07895a227179c260bfeb5c2a1c66cf8bfa

data/README.md

@@ -2,10 +2,10 @@
 
     File        : README.md
     Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-    Date        : 2014-02-20
+    Date        : 2014-03-03
 
     Copyright   : Copyright (C) 2014  Felix C. Stegerman
-    Version     : v0.5.0
+    Version     : v0.5.1
 
 []: }}}1
 
@@ -54,8 +54,22 @@ require 'obfusk/util/data'
 
 x = { x: { y: 0 }, z: [1,2,3] }
 Obfusk::Util.assoc(x, [:x,:y] => 1, [:z,1] => 99)
-x[:x][:y] == 1          # => true
-x[:z]     == [1,99,3]   # => true
+x[:x][:y] # => 1
+x[:z]     # => [1,99,3]
+
+Obfusk::Util.get_in({ x: { y: 1 } }, :x, :y)
+# => 1
+
+Obfusk::Util.symbolize_keys({ 'x' => 1, 'y' => 99 })
+# => { x: 1, y: 99 }
+
+Obfusk::Util.deep_stringify_keys({ x: { 2 => 99 } })
+# => { 'x' => { '2' => 99 } }
+
+h1  = { x: { y: 42      }, z: 11 }
+h2  = { x: { y: 1, q: 1 }, z: 1  }
+Obfusk::Util.deep_merge(h1, h2) { |k,o,n| o + n }
+# => { x: { y: 43, q: 1 }, z: 12 }
 
 y = Obfusk::Util.deepdup x
 Obfusk::Util.empty_as_nil(ENV['FOO']) || default

data/lib/obfusk/util/data.rb

@@ -2,7 +2,7 @@
 #
 # File        : obfusk/util/data.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2014-02-19
+# Date        : 2014-03-03
 #
 # Copyright   : Copyright (C) 2014  Felix C. Stegerman
 # Licence     : LGPLv3+
@@ -33,6 +33,77 @@ module Obfusk; module Util
     x
   end                                                         # }}}1
 
+  # get the value in a nested associative structure; returns the value
+  # (if found), the result of the block (if passed), or nil.
+  #
+  # ```
+  # get_in({ x: { y: 1 } }, :x, :y)
+  # # => 1
+  # ```
+  def self.get_in(x, *ks, &b)                                   # {{{1
+    if ks.length == 0
+      x
+    else
+      v = x.fetch(ks.first) { return b && b[] }
+      get_in v, *ks.drop(1), &b
+    end
+  end                                                           # }}}1
+
+  # --
+
+  # convert hash keys to strings
+  def self.stringify_keys(h)
+    transform_keys(h, &:to_s)
+  end
+
+  # convert hash keys to symbols
+  # @param always [Boolean] whether to always convert or ignore errors
+  def self.symbolize_keys(h, always = true)
+    transform_keys(h, &(always ? :to_sym : -> k { k.to_sym rescue k }))
+  end
+
+  # convert hash keys using block
+  def self.transform_keys(h, &b)
+    Hash[h.map { |k,v| [b[k],v] }]
+  end
+
+  # --
+
+  # convert nested hash keys to strings
+  def self.deep_stringify_keys(h)
+    deep_transform_keys(h, &:to_s)
+  end
+
+  # convert nested hash keys to symbols
+  # @param always [Boolean] whether to always convert or ignore errors
+  def self.deep_symbolize_keys(h, always = true)
+    deep_transform_keys(h, &(always ? :to_sym : -> k { k.to_sym rescue k }))
+  end
+
+  # convert nested hash keys using block
+  def self.deep_transform_keys(h, &b)
+    Hash[h.map { |k,v| [b[k], v.is_a?(Hash) ? deep_transform_keys(v,&b) : v] }]
+  end
+
+  # --
+
+  # merge hashes recursively
+  def self.deep_merge(h1, h2, &b)                               # {{{1
+    h1.merge(Hash[h2.map do |k,v2|
+      if h1.has_key?(k)
+        if (v1 = h1[k]).is_a?(Hash) && v2.is_a?(Hash)
+          [k, deep_merge(v1, v2, &b)]
+        else
+          [k, b ? b[k,h1[k],v2] : v2]
+        end
+      else
+        [k, v2]
+      end
+    end])
+  end                                                           # }}}1
+
+  # --
+
   # deep copy using Marshal
   def self.deepdup(obj)
     Marshal.load Marshal.dump obj

data/lib/obfusk/util/sh.rb

@@ -110,36 +110,36 @@ module Obfusk; module Util
 
   # --
 
-  # ohai + sh; requires `obfusk/util/message`
+  # onow + sh; requires `obfusk/util/message`
   def self.osh(*args)
-    ::Obfusk::Util.ohai _spawn_rm_opts(args)*' '; sh(*args)
+    ::Obfusk::Util.onow 'sh', *_spawn_rm_opts(args); sh(*args)
   end
 
-  # ohai + sh?; requires `obfusk/util/message`
+  # onow + sh?; requires `obfusk/util/message`
   def self.osh?(*args)
-    ::Obfusk::Util.ohai _spawn_rm_opts(args)*' '; sh?(*args)
+    ::Obfusk::Util.onow 'sh', *_spawn_rm_opts(args); sh?(*args)
   end
 
-  # ohai + sh!; requires `obfusk/util/message`
+  # onow + sh!; requires `obfusk/util/message`
   def self.osh!(*args)
-    ::Obfusk::Util.ohai _spawn_rm_opts(args)*' '; sh!(*args)
+    ::Obfusk::Util.onow 'sh', *_spawn_rm_opts(args); sh!(*args)
   end
 
   # --
 
-  # ohai + shc; requires `obfusk/util/message`
+  # onow + shc; requires `obfusk/util/message`
   def self.oshc(*args)
-    ::Obfusk::Util.ohai _spawn_rm_opts(args)*' '; shc(*args)
+    ::Obfusk::Util.onow 'sh', *_spawn_rm_opts(args); shc(*args)
   end
 
-  # ohai + shc?; requires `obfusk/util/message`
+  # onow + shc?; requires `obfusk/util/message`
   def self.oshc?(*args)
-    ::Obfusk::Util.ohai _spawn_rm_opts(args)*' '; shc?(*args)
+    ::Obfusk::Util.onow 'sh', *_spawn_rm_opts(args); shc?(*args)
   end
 
-  # ohai + shc!; requires `obfusk/util/message`
+  # onow + shc!; requires `obfusk/util/message`
   def self.oshc!(*args)
-    ::Obfusk::Util.ohai _spawn_rm_opts(args)*' '; shc!(*args)
+    ::Obfusk::Util.onow 'sh', *_spawn_rm_opts(args); shc!(*args)
   end
 
   # --

data/lib/obfusk/util/version.rb

@@ -1,5 +1,5 @@
 # my namespace
 module Obfusk; module Util
-  VERSION = '0.5.0'
-  DATE    = '2014-02-20'
+  VERSION = '0.5.1'
+  DATE    = '2014-03-03'
 end; end

data/spec/obfusk/util/data_spec.rb

@@ -2,7 +2,7 @@
 #
 # File        : obfusk/util/data_spec.rb
 # Maintainer  : Felix C. Stegerman <flx@obfusk.net>
-# Date        : 2014-02-19
+# Date        : 2014-03-03
 #
 # Copyright   : Copyright (C) 2014  Felix C. Stegerman
 # Licence     : LGPLv3+
@@ -29,6 +29,82 @@ describe 'obfusk/util/data' do
     end
   end                                                           # }}}1
 
+  context 'get_in' do                                           # {{{1
+    it 'returns nested key' do
+      x = { x: { y: 0 }, z: [1,2,3] }
+      expect(ou.get_in(x, :x, :y)).to eq(0)
+      expect(ou.get_in(x, :z, 1)).to eq(2)
+    end
+    it 'returns nil when not found' do
+      expect(ou.get_in({}, :x, :y)).to eq(nil)
+    end
+    it 'returns block result when not found and block given' do
+      expect(ou.get_in({}, :x, :y) { 42 }).to eq(42)
+    end
+  end                                                           # }}}1
+
+  context 'stringify_keys' do                                   # {{{1
+    it 'transforms keys to strings' do
+      expect(ou.stringify_keys({ x: 1, 2 => 99 })).to \
+        eq({ 'x' => 1, '2' => 99 })
+    end
+  end                                                           # }}}1
+
+  context 'symbolize_keys' do                                   # {{{1
+    it 'transforms keys to symbols' do
+      expect(ou.symbolize_keys({ 'x' => 1, 'y' => 99 })).to \
+        eq({ x: 1, y: 99 })
+    end
+    it 'ignores errors w/ always = false' do
+      expect(ou.symbolize_keys({ 'x' => 1, 2 => 99 }, false)).to \
+        eq({ x: 1, 2 => 99 })
+    end
+  end                                                           # }}}1
+
+  context 'transform_keys' do                                   # {{{1
+    it 'transforms keys' do
+      h = { 'x' => 1, 2 => 99 }
+      expect(ou.transform_keys(h) { |k| k.to_sym rescue k }).to \
+        eq({ x: 1, 2 => 99 })
+    end
+  end                                                           # }}}1
+
+  context 'deep_stringify_keys' do                              # {{{1
+    it 'transforms nested keys to strings' do
+      expect(ou.deep_stringify_keys({ x: { 2 => 99 } })).to \
+        eq({ 'x' => { '2' => 99 } })
+    end
+  end                                                           # }}}1
+
+  context 'deep_symbolize_keys' do                              # {{{1
+    it 'transforms nested keys to symbols' do
+      expect(ou.deep_symbolize_keys({ 'x' => { 'y' => 99 } })).to \
+        eq({ x: { y: 99 } })
+    end
+  end                                                           # }}}1
+
+  context 'deep_transform_keys' do                              # {{{1
+    it 'transforms nested keys' do
+      h = { 'x' => { 'y' => 42 }, 2 => 99 }
+      expect(ou.deep_transform_keys(h) { |k| k.to_sym rescue k }).to \
+        eq({ x: { y: 42 }, 2 => 99 })
+    end
+  end                                                           # }}}1
+
+  context 'deep_merge' do                                       # {{{1
+    it 'merges hashes recursively' do
+      h1  = { x: { y: 42       }, z: 11 }
+      h2  = { x: { y: 1 , q: 1 }, z: 1  }
+      h3  = { x: { y: 1 , q: 1 }, z: 1  }
+      h4  = { x: { y: 42, q: 1 }, z: 11 }
+      h5  = { x: { y: 43, q: 1 }, z: 12 }
+      f   = -> k,o,n { o + n }
+      expect(ou.deep_merge(h1, h2   )).to eq(h3)
+      expect(ou.deep_merge(h2, h1   )).to eq(h4)
+      expect(ou.deep_merge(h1, h2, &f)).to eq(h5)
+    end
+  end                                                           # }}}1
+
   context 'deepdup' do                                          # {{{1
     it 'equal' do
       x = { x: { y: 0 }, z: [1,2,3], s: ds::S.new(1,2) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: obfusk-util
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Felix C. Stegerman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake