mar 0.2 → 1.0.1

data/README.md

@@ -2,8 +2,8 @@ MAR
 ===
 
 Inspired by [this blog post][ruby-decorators], I started looking into what it
-might actually take to implement it.  Turns out, it can be done in just one
-method, and it relies exclusively on Ruby Procs.
+might actually take to implement it.  Turns out, it can be done with just a few
+methods tacked onto `Class`.  It relies exclusively on Ruby Procs.
 
 Examble
 =======
@@ -11,21 +11,31 @@ Examble
 ```ruby
 require 'mar'
 
-def decorator(*options)
-  lambda { |*args, &blk|
-    blk.call(*args.map{ |arg| "MAR #{arg}!" })
+# a decorator function *returns* a lambda.  methods aren't first-class in Ruby,
+# so this is just how it's got to be.  On the other hand, it makes it very easy
+# to accept options and use those in the method decorator!
+def decorator(name)
+  lambda { |original, arg, &blk|
+    original.call("MAR #{arg}! --from #{name}", &blk)
   }
 end
 
 class Foo
-  _ decorator('foo')
-  def foo(one_arg)
-    one_arg + ' --from foo, with love'
+  _ decorator('foo')  # this gets passed in as an "option" to decorator()
+  def foo(one_arg)  # this get called via blk.call, which manipulates one_arg before calling the original method
+    one_arg + ', with love'
   end
 
-  def bar
+  def bar  # this doesn't get changed at all, but let's make sure of that...
     'I get no respect, I tell ya\', no respect.'
   end
+
+  _ decorator('baz')  # this time, let's accept a block!
+  def baz(one_arg)
+    yield
+    one_arg
+  end
+
 end
 
 describe "Mar" do
@@ -40,6 +50,15 @@ describe "Mar" do
   it 'should NOT decorate Foo#bar' do
     @foo.bar.should == 'I get no respect, I tell ya\', no respect.'
   end
+
+  it 'should decorate Foo#baz and accept a block' do
+    two = 1
+    nifty = @foo.baz('is nifty') {
+      two = 2
+    }
+    nifty.should == 'MAR is nifty! --from baz'
+    two.should == 2
+  end
 end
 ```
 

data/lib/mar/mar.rb

@@ -20,12 +20,12 @@ class Class
     if decorators.length > 0
       new_name = "marrrrrrrr_#{name}"
       alias_method new_name, name
-      define_method(name) { |*args|
+      define_method(name) { |*args, &outer_block|
         decorator = decorators[0]
-        here = lambda{ |*decorator_args, &blk|
-          self.send(new_name, *decorator_args, &blk)
+        original = lambda{ |*decorator_args, &inner_block|
+          self.send(new_name, *decorator_args, &inner_block)
         }
-        decorator.call(*args, &here)
+        decorator.call(original, *args, &outer_block)
       }
     end
   end

data/lib/mar/version.rb

@@ -1,3 +1,3 @@
 module Mar
-  Version = '0.2'
+  Version = '1.0.1'
 end

data/spec/test_mar.rb

@@ -1,20 +1,30 @@
 require 'mar'
 
-def decorator(*options)
-  lambda { |*args, &blk|
-    blk.call(*args.map{ |arg| "MAR #{arg}!" })
+# a decorator function *returns* a lambda.  methods aren't first-class in Ruby,
+# so this is just how it's got to be.  On the other hand, it makes it very easy
+# to accept options and use those in the method decorator!
+def decorator(name)
+  lambda { |original, arg, &blk|
+    original.call("MAR #{arg}! --from #{name}", &blk)
   }
 end
 
 class Foo
-  _ decorator('foo')
-  def foo(one_arg)
-    one_arg + ' --from foo, with love'
+  _ decorator('foo')  # this gets passed in as an "option" to decorator()
+  def foo(one_arg)  # this get called via blk.call, which manipulates one_arg before calling the original method
+    one_arg + ', with love'
   end
 
-  def bar
+  def bar  # this doesn't get changed at all, but let's make sure of that...
     'I get no respect, I tell ya\', no respect.'
   end
+
+  _ decorator('baz')  # this time, let's accept a block!
+  def baz(one_arg)
+    yield
+    one_arg
+  end
+
 end
 
 describe "Mar" do
@@ -29,4 +39,13 @@ describe "Mar" do
   it 'should NOT decorate Foo#bar' do
     @foo.bar.should == 'I get no respect, I tell ya\', no respect.'
   end
+
+  it 'should decorate Foo#baz and accept a block' do
+    two = 1
+    nifty = @foo.baz('is nifty') {
+      two = 2
+    }
+    nifty.should == 'MAR is nifty! --from baz'
+    two.should == 2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mar
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors: