ribbon 0.3.0 → 0.3.1

data/lib/ribbon.rb

@@ -128,13 +128,13 @@ class Ribbon < BasicObject
   # 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(ribbon), &block)
+    new extract_hash_from(old).merge(extract_hash_from(new), &block)
   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(ribbon), &block
+    extract_hash_from(old).merge! extract_hash_from(new), &block
   end
 
   # Returns +true+ if the given +object+ is a ribbon.
@@ -144,12 +144,12 @@ class Ribbon < BasicObject
 
   # Returns +true+ if the given ribbon is wrapped.
   def self.wrapped?(ribbon)
-    Wrapper === ribbon
+    ::Ribbon::Wrapper === ribbon
   end
 
   # Wraps a ribbon instance in a Ribbon::Wrapper.
   def self.wrap(ribbon)
-    Wrapper.new ribbon
+    ::Ribbon::Wrapper.new ribbon
   end
 
   # Unwraps the +ribbon+ if it is wrapped and returns its hash. Returns +nil+ in

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.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ribbon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.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: &15659380 !ruby/object:Gem::Requirement
+  requirement: &18538300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15659380
+  version_requirements: *18538300
 description: Ruby Object Notation. Inspired by JSON and OpenStruct.
 email: matheus.a.m.moreira@gmail.com
 executables: []
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2946347091620539582
+      hash: 63380645992066073
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2946347091620539582
+      hash: 63380645992066073
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10