On second thought, #unwrap shouldn't take a block. Don't make it so p…

…owerful.

lib/wrapped/types.rb

@@ -5,8 +5,12 @@ def initialize(value)
     @value = value
   end
 
-  def unwrap_or(_, &block)
-    unwrap(&block)
+  def unwrap_or(_)
+    if block_given?
+      yield unwrap
+    else
+      unwrap
+    end
   end
 
   def present(&block)
@@ -18,17 +22,13 @@ def blank(&ignored)
     self
   end
 
-  def each(&block)
-    unwrap(&block)
+  def each
+    yield unwrap if block_given?
     [unwrap]
   end
 
   def unwrap
-    if block_given?
-      yield @value
-    else
-      @value
-    end
+    @value
   end
 
   def present?

spec/wrapped_spec.rb

@@ -26,14 +26,6 @@
   it 'raises an exception when called on the wrapped nil' do
     expect { nothing.unwrap }.to raise_error(IndexError)
   end
-
-  it 'produces the value of the block for a wrapped object' do
-    just.unwrap {|n| n+1}.should == value+1
-  end
-
-  it 'raises an exception when called on the wrapped nil, even with a block' do
-    expect { nothing.unwrap { 2 } }.to raise_error(IndexError)
-  end
 end
 
 describe Wrapped, 'callbacks' do