binder 0.0.2 → 0.0.3

data/README.rdoc

@@ -39,30 +39,30 @@ The #bind_to method on a proc instance allows you to change the closure in which
 
 == Object##bind
 
-binder also provides the "#bind" object class method to DRY up your DSL instance methodsmethods: 
+binder also provides the "#bind" object class method to DRY up your DSL instance methods: 
 
   >> class Dog
-  >>     bind :do_trick, :self
+  >>   bind :do_trick, :self # binds to the instance of Dog
   >>     
-  ?>       def speak
-  >>         "ruff!"
-  >>       end
+  >>   def speak
+  >>     "ruff!"
   >>   end
+  >> end
     ==> nil
   
   >> Dog.new.do_trick { speak }
     ==> "ruff!"
     
   >> class Cat
-  >>   bind :do_trick, Cat
+  >>   bind :do_trick, :class # binds to Cat, not an instance of Cat
   >>   
-  ?>   class << self
+  >>   class << self
   >>     def speak
   >>       "screw you"
   >>     end
   >>   end
   >>   
-  ?>   def speak
+  >>   def speak
   >>     "bugger off"
   >>   end
   >> end
@@ -72,9 +72,9 @@ binder also provides the "#bind" object class method to DRY up your DSL instance
     ==> "screw you"
   
   >> class Kitten
-  >>   bind :do_trick, :mother
+  >>   bind :do_trick, :mother # binds to @mother instance variable
   >>   
-  ?>   def initialize(mom)
+  >>   def initialize(mom)
   >>     @mother = mom
   >>   end
   >> end 
@@ -94,36 +94,37 @@ binder also provides the "#bind" object class method to DRY up your DSL instance
 Whereas the Object##bind method created instance methods, Object##bind_class_method creates class methods:
 
   >> class Cat
-  >>   bind :do_trick, Cat
+  >>   bind :do_trick, :class # binds to Cat class, not an instance of Cat
   >> 
-  ?>   class << self
+  >>   class << self
   >>     def speak
-  >>         "screw you"
-  >>       end
+  >>       "screw you"
+  >>     end
   >>   end
   >>   
-  ?>   def speak
+  >>   def speak
   >>     "bugger off"
   >>   end
   >> end
     ==> nil
   
   >> class Lion
-  >>   bind_class_method :tame, :self
-  >>   bind_class_method :do_trick, :child
+  >>   bind_class_method :tame, :self # binds to Lion, since "self" will be evaluated in the context
+  >>                                  # of a class method
+  >>   bind_class_method :do_trick, :child # binds to value returned by method "child"
   >>   class << self
   >>     def down_kitty
   >>       "meow"
   >>     end
   >>     
-  ?>     def child
+  >>     def child
   >>       @child ||= Cat
   >>     end
   >>   end
   >> end
     ==> nil
      
-  >> Lion.tame {down_kitty}
+  >> Lion.tame { down_kitty }
     ==> "meow"
     
   >> Lion.do_trick { speak }

data/lib/binder/object.rb

@@ -1,43 +1,44 @@
 class Object
   class << self
-    def bind(method_name, closure)
-      if !closure.kind_of?(Symbol)
-        closure = closure.to_s
-      else   
-        closure = closure == :self ? "self" : "@#{closure}"
-      end
-      
-      self.class_eval do
-        eval(
-          "
+    def bind_in_context(method_name, closure, eval_context=:class_eval)
+      raise ArgumentError, "You may only pass symbols to #bind and #bind_class_method" unless closure.kind_of?(Symbol)
+      if closure == :self
+        self.send(eval_context) do
+          eval(
+            "
             def #{method_name}(&block)
-              raise ArgumentError, \"You must pass a block to ##{method_name}.\" unless block
-              block.bind_to(#{closure}).call
+              if block
+                block.bind_to(self).call
+              end
+            end
+            "
+          )
+        end
+      else
+        self.send(eval_context) do
+          eval(
+            "
+            def #{method_name}(&block)
+              if block
+                if self.respond_to?(:#{closure})
+                  block.bind_to(self.#{closure}).call
+                elsif @#{closure}
+                  block.bind_to(@#{closure}).call
+                else
+                  block.bind_to(self.#{closure}).call
+                end
+              end
             end
-          "
-        )
-      end
+            "
+          )
+        end
+      end      
     end
     
+    alias_method :bind, :bind_in_context
+    
     def bind_class_method(method_name, closure)
-      if !closure.kind_of?(Symbol)
-        closure = closure.to_s
-      else   
-        closure = closure == :self ? "self" : "#{closure}"
-      end
-      
-      self.class_eval do
-        eval(
-          "
-            class << self
-              def #{method_name}(&block)
-                raise ArgumentError, \"You must pass a block to ##{method_name}.\" unless block
-                block.bind_to(#{closure}).call
-              end
-            end
-          "
-        )
-      end
+      bind_in_context method_name, closure, :instance_eval
     end
   end
-end
+end

data/spec/binder/object_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 describe Object do
   describe "#bind" do
     it "should create a new instance method that evaluates the block passed it within the requested closure" do
+      proc do
+        class Platypus
+          bind :do_trick, "invalid argument"
+        end
+      end.should raise_error(ArgumentError, "You may only pass symbols to #bind and #bind_class_method")
+      
       class Dog
         bind :do_trick, :self
       
@@ -14,7 +20,7 @@ describe Object do
       Dog.new.do_trick { speak }.should == "ruff!"
     
       class Cat
-        bind :do_trick, Cat
+        bind :do_trick, :class
       
         class << self
           def speak
@@ -46,7 +52,7 @@ describe Object do
     describe "#bind_class_method" do
       it "should create a class method responder that binds to either a new class or the return value of a class method" do
         class Cat
-          bind :do_trick, Cat
+          bind :do_trick, :class
 
           class << self
             def speak
@@ -78,4 +84,4 @@ describe Object do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binder
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matt Parker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -05:00
+date: 2010-02-21 00:00:00 -05:00
 default_executable: 
 dependencies: []