ruby-nuggets 0.5.6 → 0.5.7

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to ruby-nuggets version 0.5.6
+This documentation refers to ruby-nuggets version 0.5.7
 
 
 == DESCRIPTION

data/lib/nuggets/hash/nest_mixin.rb

@@ -50,14 +50,28 @@ module Nuggets
   #   hash[:foo][:bar][:b] = { :x => 0, :y => 3 }
   #   hash
   #   #=> {:foo=>{:bar=>{:b=>{:y=>3, :x=>0}, :a=>{:y=>2, :x=>1}}}}
-  def nest(depth = 0, value = default = Object.new, &block)
-    new { |hash, key|
-      hash[key] = if depth.zero?
-        default ? block ? block[key] : hash.default : value
+  def nest(depth = 0, value = default = Object.new)
+    if depth.zero?
+      if default
+        if block_given?
+          new { |hash, key| hash[key] = yield(key) }
+        else
+          new { |hash, key| hash[key] = hash.default }
+        end
       else
-        default ? nest(depth - 1, &block) : nest(depth - 1, value)
+        new { |hash, key| hash[key] = value }
       end
-    }
+    else
+      if default
+        if block_given?
+          new { |hash, key| hash[key] = nest(depth - 1, &::Proc.new) }
+        else
+          new { |hash, key| hash[key] = nest(depth - 1) }
+        end
+      else
+        new { |hash, key| hash[key] = nest(depth - 1, value) }
+      end
+    end
   end
 
     end

data/lib/nuggets/hash/unroll_mixin.rb

@@ -31,32 +31,47 @@ module Nuggets
 
   # call-seq:
   #   hash.unroll(*value_keys) => anArray
-  #   hash.unroll(*value_keys) { |key, value| ... } => anArray
+  #   hash.unroll(*value_keys, :sort_by => { |key, value| ... }) => anArray
+  #   hash.unroll(*value_keys) { |value_hash| ... } => anArray
   #
   # "Unrolls" a nested hash, so that each path through +hash+ results in a
-  # row that is, e.g., suitable for use with CSV. Note that from the final
-  # hash only the values are used, namely, if +value_keys+ are given, the
-  # values at those keys are returned. If a block is given, all hashes are
-  # passed through that block for sorting before being put into the result
-  # array.
+  # row that is, e.g., suitable for use with CSV.
+  #
+  # Note that from the final hash ("value hash") only the values are used,
+  # namely, if +value_keys+ are given, the values at those keys are returned.
+  # If a block is given, the +value_hash+ is passed to that block for any
+  # additional processing or sanitization.
+  #
+  # If +sort_by+ is given, all hashes are passed through that block for
+  # sorting before being put into the result array.
   #
   # Examples:
   #
   #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll
   #   #=> [[:foo, :bar, :b, 3, 0], [:foo, :bar, :a, 2, 1]]
   #
-  #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll(&:to_s)
+  #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll(:sort_by => :to_s)
   #   #=> [[:foo, :bar, :a, 1, 2], [:foo, :bar, :b, 0, 3]]
-  def unroll(*value_keys, &sort_block)
+  #
+  #   { :foo => { :bar => { :a => { :x => 1, :y => 2 }, :b => { :x => 0, :y => 3 } } } }.unroll { |data| data[:x] = nil; data[:y] *= 2 }
+  #   #=> [[:foo, :bar, :b, 6, nil], [:foo, :bar, :a, 4, nil]]
+  def unroll(*value_keys, &block)
+    args = value_keys.dup
+
+    options = value_keys.last.is_a?(::Hash) ? value_keys.pop : {}
+    do_sort = options.has_key?(:sort_by)
+
     rows = []
 
     if values.first.is_a?(self.class)  # if any is, then all are
-      (sort_block ? sort_by(&sort_block) : self).each { |key, value|
-        value.unroll(*value_keys, &sort_block).each { |row| rows << [key, *row] }
+      (do_sort ? sort_by(&options[:sort_by]) : self).each { |key, value|
+        value.unroll(*args, &block).each { |row| rows << [key, *row] }
       }
     else
+      block[self] if block
+
       rows << if value_keys.empty?
-        sort_block ? sort_by(&sort_block).map(&:last) : values
+        do_sort ? sort_by(&options[:sort_by]).map { |key, value| value } : values
       else
         values_at(*value_keys)
       end

data/lib/nuggets/version.rb

@@ -4,7 +4,7 @@ module Nuggets
 
     MAJOR = 0
     MINOR = 5
-    TINY  = 6
+    TINY  = 7
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-nuggets
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-24 00:00:00 +02:00
+date: 2009-07-27 00:00:00 +02:00
 default_executable: 
 dependencies: []