ribbon 0.4.6 → 0.4.7

data/README.markdown

@@ -11,8 +11,9 @@ and natural to use. It allows the dynamic definition of arbitrary attributes,
 which can easily be nested.
 
     > r = Ribbon.new
-    > r.a.b.c = :d
      => {}
+    > r.a.b.c = :d
+     => :d
     > r
      => {a: {b: {c: :d}}}
 
@@ -32,7 +33,7 @@ You can also set the property if you give an argument to the method.
 
 If you give it a block, the value of the option will be yielded to it.
 
-    > Ribbon.new.tap do |config|
+    > Ribbon.new do |config|
         config.music do |music|
           music.file do |file|
             file.extensions %w(flac mp3 ogg wma)
@@ -44,7 +45,7 @@ If you give it a block, the value of the option will be yielded to it.
 If the block takes no arguments (arity of zero), it will be evaluated in the
 context of the value instance. The above example could be rewritten as:
 
-    > Ribbon.new.tap do |config|
+    > Ribbon.new do
         config.music do
           file do
             extensions %w(flac mp3 ogg wma)
@@ -62,6 +63,15 @@ be created and stored in its place.
     > r
      => {}
 
+You may also provide a return value or a block:
+
+    > r.z? :no_value
+     => :no_value
+    > r.z? { :value_from_block }
+     => :value_from_block
+    > r.z? { raise 'Value not found' }
+     => RuntimeError: Value not found
+
 If you append a `!` to the name of the property and give it an argument, the
 value of the property will be set to it and the receiver will be returned,
 allowing you to chain multiple assignments in a single line.
@@ -78,8 +88,8 @@ They work just like the regular method calls, which means you can chain them.
 ### Ribbon Wrappers
 
 Since Ribbons inherit from BasicObject, they don't include many general-purpose
-methods. In order to solve that problem, `Ribbon::Wrapper` is provided. With a
-wrapped Ribbon instance, you can treat it as if it were an ordinary hash.
+methods. In order to solve that problem, `Ribbon::Wrapper` is provided. You can
+treat wrapped ribbons as if it were ordinary hashes.
 
     > w = Ribbon::Wrapper.new
     > w[:x]

data/lib/ribbon.rb

@@ -62,7 +62,8 @@ class Ribbon < BasicObject
   # Initializes the new ribbon, merging the internal hash with the given one and
   # converting all internal objects. See Ribbon::convert_all! for details.
   def initialize(hash = {}, &block)
-    __hash__.merge! hash, &block
+    __hash__.merge! hash
+    if block.arity.zero? then instance_eval &block else block.call self end if block
    ::Ribbon.convert_all! self
   end
 
@@ -211,6 +212,12 @@ class Ribbon < BasicObject
       end
     end
 
+    # Deserializes the hash from the +string+ using YAML and uses it to
+    # construct a new ribbon.
+    def from_yaml(string)
+      Ribbon.new YAML.load(string)
+    end
+
     # Wraps a ribbon instance in a Ribbon::Wrapper.
     #
     #   Ribbon[ribbon].keys

data/lib/ribbon/core_ext/array.rb

@@ -10,9 +10,9 @@ class Ribbon < BasicObject
       # otherwise returns an empty ribbon.
       def extract_ribbon!
         case last
-          when ::Hash then Ribbon.new pop
-          when ::Ribbon then pop
-          when ::Ribbon::Wrapper then pop.ribbon
+          when Hash then Ribbon.new pop
+          when Ribbon then pop
+          when Ribbon::Wrapper then pop.ribbon
           else Ribbon.new
         end
       end
@@ -20,10 +20,13 @@ class Ribbon < BasicObject
       # Extracts the last argument as a wrapped ribbon, or returns an empty one.
       # See #extract_ribbon! for details.
       def extract_wrapped_ribbon!
-        ::Ribbon.wrap extract_options_as_ribbon!
+        Ribbon.wrap extract_options_as_ribbon!
       end
 
+      # Same as #extract_ribbon!
       alias extract_options_as_ribbon! extract_ribbon!
+
+      # Same as #extract_wrapped_ribbon!
       alias extract_options_as_wrapped_ribbon! extract_wrapped_ribbon!
 
     end

data/lib/ribbon/version.rb

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

data/lib/ribbon/wrapper.rb

@@ -41,15 +41,6 @@ class Ribbon < BasicObject
   #   => 10
   class Wrapper
 
-    class << self
-
-      # Wraps a Ribbon instance.
-      #
-      #   Ribbon::Wrapper[ribbon]
-      alias [] new
-
-    end
-
     # The wrapped Ribbon object.
     attr :ribbon
 
@@ -67,8 +58,9 @@ class Ribbon < BasicObject
 
     # Wraps a Ribbon object, providing many general-purpose methods that were
     # not defined in the Ribbon itself.
-    def initialize(ribbon = Ribbon.new)
+    def initialize(ribbon = Ribbon.new, &block)
       self.ribbon = ribbon
+      if block.arity.zero? then instance_eval &block else block.call self end if block
     end
 
     # Returns the hash of the wrapped ribbon.
@@ -84,11 +76,11 @@ class Ribbon < BasicObject
     end
 
     def deep_merge(ribbon)
-      ::Ribbon.deep_merge self, ribbon
+      Ribbon.deep_merge self, ribbon
     end
 
     def deep_merge!(ribbon)
-      ::Ribbon.deep_merge! self, ribbon
+      Ribbon.deep_merge! self, ribbon
     end
 
     # Wraps all ribbons contained by this wrapper's ribbon.
@@ -123,6 +115,22 @@ class Ribbon < BasicObject
       ribbon.to_s
     end
 
+    # The class methods.
+    class << self
+
+      # Wraps a Ribbon instance.
+      #
+      #   Ribbon::Wrapper[ribbon]
+      alias [] new
+
+      # Deserializes the hash from the +string+ using YAML and uses it to
+      # construct a new wrapped ribbon.
+      def from_yaml(string)
+        Ribbon::Wrapper.new YAML.load(string)
+      end
+
+    end
+
     private
 
     # Converts the wrapped ribbon and all ribbons inside into hashes using
@@ -132,8 +140,8 @@ class Ribbon < BasicObject
       {}.tap do |hash|
         ribbon.__hash__.each do |key, value|
           hash[key] = case value
-            when ::Ribbon then to_hash_recursive value
-            when ::Ribbon::Wrapper then to_hash_recursive value.ribbon
+            when Ribbon then to_hash_recursive value
+            when Ribbon::Wrapper then to_hash_recursive value.ribbon
             else value
           end
         end
@@ -145,7 +153,7 @@ class Ribbon < BasicObject
     def wrap_all_recursive!(wrapper = self)
       wrapper.hash.each do |key, value|
         wrapper.hash[key] = case value
-          when ::Ribbon then wrap_all_recursive! ::Ribbon::Wrapper[value]
+          when Ribbon then wrap_all_recursive! Ribbon::Wrapper[value]
           else value
         end
       end
@@ -157,18 +165,12 @@ class Ribbon < BasicObject
     def unwrap_all_recursive!(ribbon = self)
       ribbon.__hash__.each do |key, value|
         ribbon[key] = case value
-          when ::Ribbon::Wrapper then unwrap_all_recursive! value.ribbon
+          when Ribbon::Wrapper then unwrap_all_recursive! value.ribbon
           else value
         end
       end
       ribbon
     end
 
-    # Deserializes the hash from the +string+ using YAML and uses it to
-    # construct a new wrapped Ribbon.
-    def self.from_yaml(string)
-      ::Ribbon::Wrapper.new YAML.load(string)
-    end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ribbon
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rookie
-  requirement: &14094740 !ruby/object:Gem::Requirement
+  requirement: &15079400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14094740
+  version_requirements: *15079400
 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: -2764903379968974603
+      hash: -3941054121051003876
 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: -2764903379968974603
+      hash: -3941054121051003876
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10