ribbon 0.4.4 → 0.4.6

data/README.markdown

@@ -46,8 +46,8 @@ context of the value instance. The above example could be rewritten as:
 
     > Ribbon.new.tap do |config|
         config.music do
-          music.file do
-            file.extensions %w(flac mp3 ogg wma)
+          file do
+            extensions %w(flac mp3 ogg wma)
           end
         end
       end

data/lib/ribbon/version.rb

@@ -16,7 +16,7 @@ class Ribbon < BasicObject
     # Patch version.
     #
     # Increments denote changes in implementation.
-    PATCH = 4
+    PATCH = 6
 
     # Build version.
     #

data/lib/ribbon/wrapper.rb

@@ -83,6 +83,14 @@ class Ribbon < BasicObject
       else ribbon end.__send__ method, *args, &block
     end
 
+    def deep_merge(ribbon)
+      ::Ribbon.deep_merge self, ribbon
+    end
+
+    def deep_merge!(ribbon)
+      ::Ribbon.deep_merge! self, ribbon
+    end
+
     # Wraps all ribbons contained by this wrapper's ribbon.
     def wrap_all!
       wrap_all_recursive!

data/lib/ribbon.rb

@@ -56,7 +56,7 @@ class Ribbon < BasicObject
 
   # The internal Hash.
   def __hash__
-    @hash ||= {}
+    @hash ||= (::Hash.new &::Ribbon.default_value_proc)
   end
 
   # Initializes the new ribbon, merging the internal hash with the given one and
@@ -68,8 +68,7 @@ class Ribbon < BasicObject
 
   # Gets a value by key.
   def [](key, &block)
-    value = if __hash__.has_key? key then ::Ribbon.convert __hash__[key]
-    else ::Ribbon.new end
+    value = ::Ribbon.convert __hash__[key]
     if block.arity.zero? then value.instance_eval &block
     else block.call value end if block
     self[key] = value
@@ -101,7 +100,8 @@ class Ribbon < BasicObject
       when '!'
         self[m] = args.first; self
       when '?'
-        self.__hash__.fetch m, *args, &block
+        begin self.__hash__.fetch m, *args, &block
+        rescue ::KeyError; nil end
       else
         self[method] = args.first unless args.empty?
         self[method, &block]
@@ -125,72 +125,117 @@ class Ribbon < BasicObject
   # Same as #to_s.
   alias inspect to_s
 
-  # If <tt>object</tt> is a hash, converts it to a ribbon. If it is an array,
-  # converts any hashes inside.
-  def self.convert(object)
-    case object
-      when ::Hash then self.new object
-      when ::Array then object.map { |element| convert element }
-      else object
+  # The class methods.
+  class << self
+
+    # A Proc which returns a new ribbon as the default value for the given hash
+    # key.
+    def default_value_proc
+      @default_value_proc ||= (proc { |hash, key| hash[key] = Ribbon.new })
     end
-  end
 
-  # Converts all values in the given ribbon.
-  def self.convert_all!(ribbon)
-    ribbon.__hash__.each do |key, value|
-      ribbon[key] = case value
-        when self then convert_all! value
-        else convert value
+    # If <tt>object</tt> is a hash, converts it to a ribbon. If it is an array,
+    # converts any hashes inside.
+    def convert(object)
+      case object
+        when Hash then Ribbon.new object
+        when Array then object.map { |element| convert element }
+        else object
       end
     end
-    ribbon
-  end
 
-  # Merges the hash of +new+ with the hash of +old+, creating a new ribbon in
-  # the process.
-  def self.merge(old, new, &block)
-    new extract_hash_from(old).merge(extract_hash_from(new), &block)
-  end
+    # Converts all values in the given ribbon.
+    def convert_all!(ribbon)
+      ribbon.__hash__.each do |key, value|
+        ribbon[key] = case value
+          when Ribbon then convert_all! value
+          else convert value
+        end
+      end
+      ribbon
+    end
 
-  # Merges the hash of +new+ with the hash of +old+, modifying +old+'s hash in
-  # the process.
-  def self.merge!(old, new, &block)
-    extract_hash_from(old).merge! extract_hash_from(new), &block
-  end
+    # Merges the hash of +new_ribbon+ with the hash of +old_ribbon+, creating a
+    # new ribbon in the process.
+    def merge(old_ribbon, new_ribbon, &block)
+      old_hash = extract_hash_from old_ribbon
+      new_hash = extract_hash_from new_ribbon
+      merged_hash = old_hash.merge new_hash, &block
+      Ribbon.new merged_hash
+    end
 
-  # Returns +true+ if the given +object+ is a ribbon.
-  def self.instance?(object)
-    self === object
-  end
+    # Merges the hash of +new_ribbon+ with the hash of +old_ribbon+, modifying
+    # +old_ribbon+'s hash in the process.
+    def merge!(old_ribbon, new_ribbon, &block)
+      old_hash = extract_hash_from old_ribbon
+      new_hash = extract_hash_from new_ribbon
+      old_hash.merge! new_hash, &block
+      old_ribbon
+    end
 
-  # Returns +true+ if the given ribbon is wrapped.
-  def self.wrapped?(ribbon)
-    ::Ribbon::Wrapper === ribbon
-  end
+    # Merges the +new_ribbon+ and all nested ribbons with the +old_ribbon+
+    # recursively, returning a new ribbon.
+    def deep_merge(old_ribbon, new_ribbon, &block)
+      deep :merge, old_ribbon, new_ribbon, &block
+    end
 
-  # Wraps a ribbon instance in a Ribbon::Wrapper.
-  def self.wrap(ribbon = ::Ribbon.new)
-    ::Ribbon::Wrapper.new ribbon
-  end
+    # Merges the +new_ribbon+ and all nested ribbons with the +old_ribbon+
+    # recursively, modifying all ribbons in place.
+    def deep_merge!(old_ribbon, new_ribbon, &block)
+      deep :merge!, old_ribbon, new_ribbon, &block
+    end
 
-  # Unwraps the +ribbon+ if it is wrapped and returns its hash. Returns +nil+ in
-  # any other case.
-  def self.extract_hash_from(ribbon)
-    case ribbon
-      when ::Ribbon::Wrapper then ribbon.hash
-      when ::Ribbon then ribbon.__hash__
-      when ::Hash then ribbon
-      else nil
+    # Returns +true+ if the given +object+ is a ribbon.
+    def instance?(object)
+      Ribbon === object
     end
-  end
 
-  class << self
+    # Returns +true+ if the given ribbon is wrapped.
+    def wrapped?(ribbon)
+      Ribbon::Wrapper === ribbon
+    end
+
+    # Wraps a ribbon instance in a Ribbon::Wrapper.
+    def wrap(ribbon = ::Ribbon.new)
+      Ribbon::Wrapper.new ribbon
+    end
+
+    # Unwraps the +ribbon+ if it is wrapped and returns its hash. Returns +nil+
+    # in any other case.
+    def extract_hash_from(ribbon)
+      case ribbon
+        when Ribbon::Wrapper then ribbon.hash
+        when Ribbon then ribbon.__hash__
+        when Hash then ribbon
+        else nil
+      end
+    end
 
     # Wraps a ribbon instance in a Ribbon::Wrapper.
     #
     #   Ribbon[ribbon].keys
     alias [] wrap
 
+    private
+
+    # Common logic for deep merge functions. +merge_func+ should be either
+    # +merge+ or +merge!+, and denotes which function will be used to merge
+    # recursively. +args+ will be forwarded to the merge function.
+    #
+    # If given a block, it will be called with the key, the old value and the
+    # new value as parameters and its return value will be used. The value of
+    # the new hash will be used, otherwise.
+    def deep(merge_method, old_ribbon, new_ribbon, &block)
+      send merge_method, old_ribbon, new_ribbon do |key, old_value, new_value|
+        if instance?(old_value) and instance?(new_value)
+          deep merge_method, old_value, new_value, &block
+        else
+          if block.respond_to? :call then block.call key, old_value, new_value
+          else new_value end
+        end
+      end
+    end
+
   end
 
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ribbon
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rookie
-  requirement: &18087600 !ruby/object:Gem::Requirement
+  requirement: &14094740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18087600
+  version_requirements: *14094740
 description: Ruby Object Notation. Inspired by JSON and OpenStruct.
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3618044830386511159
+      hash: -2764903379968974603
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3618044830386511159
+      hash: -2764903379968974603
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10