ribbon 0.2.0 → 0.2.1

data/Gemfile

@@ -1,3 +1,8 @@
 source :rubygems
 
 gemspec
+
+{ rookie: '~/projects/rookie' }.each do |project, path|
+  path = File.expand_path path
+  gem project.to_s, path: path if Dir.exists? path
+end

data/lib/ribbon.rb

@@ -96,6 +96,11 @@ class Ribbon < BasicObject
     Wrapper.new ribbon
   end
 
+  def self.extract_hash_from(ribbon)
+    ribbon = ribbon.ribbon if ::Ribbon.wrapped? ribbon
+    ribbon = ribbon.__hash__ if ::Ribbon.instance? ribbon
+  end
+
   class << self
 
     # Wraps a Ribbon instance in a Ribbon::Wrapper.

data/lib/ribbon/version.rb

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

data/lib/ribbon/wrapper.rb

@@ -52,6 +52,22 @@ class Ribbon < BasicObject
       else ribbon end.__send__ method, *args, &block
     end
 
+    # Merges the hash of this wrapped Ribbon with the given +ribbon+, which can
+    # be a Ribbon::Wrapper, a Ribbon or a hash.
+    #
+    # This method returns a new hash.
+    def merge(ribbon, &block)
+      hash.merge Ribbon.extract_hash_from(ribbon), &block
+    end
+
+    # Merges the hash of this wrapped Ribbon with the given +ribbon+, which can
+    # be a Ribbon::Wrapper, a Ribbon or a hash.
+    #
+    # This method modifies the hash of this wrapped Ribbon.
+    def merge!(ribbon, &block)
+      hash.merge! Ribbon.extract_hash_from(ribbon), &block
+    end
+
     # Converts the wrapped Ribbon and all Ribbons inside into hashes.
     def to_hash
       to_hash_recursive

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ribbon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rookie
-  requirement: &19808560 !ruby/object:Gem::Requirement
+  requirement: &13625980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19808560
+  version_requirements: *13625980
 description: Ruby Object Notation. Inspired by JSON and OpenStruct.
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -52,18 +52,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1132984077947899198
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1132984077947899198
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10