sticky_blox 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/sticky_blox/behavior.rb

@@ -4,11 +4,34 @@ module StickyBlox
   def self.included(base)
     base.extend ClassMethods
   end
+  
+  class BindingArray < Array
+    
+    def bind(object)
+      @binding = object
+      self
+    end
+    
+    def call(*args)
+      value = @binding
+      self.reject{|e| e.nil?}.each do |blk|
+        value = blk.bind(value).call(*args)
+      end
+      value
+    end
+  end
 
   module ClassMethods
     def my_meta_class
       class << self; self; end
     end
+    
+    def stuck_methods
+      my_meta_class.instance_eval do
+        @stuck_methods ||= {}
+        @stuck_methods
+      end
+    end
 
     # Defines methods on the class identified by "binding"
     # for each method in @stuck_methods that will call
@@ -17,10 +40,10 @@ module StickyBlox
     def stick_to( binding )
       my_meta_class.instance_eval do
         clz = self
-        @stuck_methods.each do |method_name|
+        @stuck_methods.each_pair do |method_name, binding_array|
           binding.class_eval do
             define_method method_name do | *args |
-              clz.send(method_name).bind(self).call(*args)
+              binding_array.bind(self).call(*args)
             end
           end
         end
@@ -48,27 +71,20 @@ module StickyBlox
     end
     
     def unstick_all_from( binding, ignore_errors=true )
-      unstick_from( binding => my_meta_class.instance_variable_get("@stuck_methods"), :ignore_errors => ignore_errors )
+      unstick_from( binding => my_meta_class.instance_variable_get("@stuck_methods").keys, :ignore_errors => ignore_errors )
     end
 
-    def stick name, &block
-      my_meta_class.instance_eval do
-        @stuck_methods ||= [] #{}
-        @stuck_methods << name unless @stuck_methods.include?(name) #[name] = block unless @stuck_methods.has_key?(name)
+    def stick(name, replace=false, &block)
+      my_methods = stuck_methods
+      if replace && my_methods.has_key?(name)
+        my_methods.delete(name)
       end
-      
-      clz = self.class
-      clz.class_eval do
-        # define_method "#{name}=" do |arg|
-        #   my_meta_class.instance_variable_get("@stuck_methods")[name] = block
-        # end
+      (my_methods[name] ||= BindingArray.new) << block
 
-        # def method_missing(meth, *args, &blk)
-        #   raise "#{clz} doesn't respond to #{meth}"
-        #   my_meta_class.instance_variable_get("@stuck_methods")[meth]
-        # end
+      my_methods = my_methods[name]
+      self.class.class_eval do
         define_method name do
-          block
+          my_methods
         end
       end
     end

data/spec/sticky_blox_spec.rb

@@ -50,18 +50,17 @@ end
 
 describe "Overriding stuck methods" do
   before :all do
-    @original = Spearmint.chew
+    @original = Spearmint.chew.dup
     Spearmint.class_eval do
-      stick :chew do
+      stick :chew, true do
         self.upcase
       end
     end
   end
   
   after :all do
-    Spearmint.class_eval do
-      stick :chew, &@original
-    end
+    Spearmint.chew.clear
+    @original.each {|e| Spearmint.chew << e}
   end
 
   it "should override the previously stuck method" do
@@ -71,6 +70,28 @@ describe "Overriding stuck methods" do
   end
 end
 
+describe "Composing behavior" do
+  before :all do
+    @original = Spearmint.chew.dup
+    Spearmint.class_eval do
+      stick :chew do
+        self.gsub(/[a,e,i,o,u]/, '')
+      end
+    end
+  end
+  
+  after :all do
+    Spearmint.chew.clear
+    @original.each {|e| Spearmint.chew << e}
+  end
+
+  it "should add to the previously defined behavior" do
+    Spearmint.stick_to String
+    s = 'a string'
+    s.chew.should == 'gnrts '
+  end
+end
+
 describe "Undefining stuck methods" do
   it "should not throw an error if we try do unstick something that's never been stuck" do
     Spearmint.stick_to String
@@ -85,25 +106,44 @@ describe "Undefining stuck methods" do
     s = ''
     s.should respond_to(:chew)
     s.should respond_to(:chew_it_up_and_spit_it_out)
+    s.should respond_to(:open)
+    validate_sticks_of_spearmint
 
     Spearmint.unstick_from String => [:chew], :ignore_errors => false
     s.should_not respond_to(:chew)
     s.should respond_to(:chew_it_up_and_spit_it_out)
+    validate_sticks_of_spearmint
 
     Spearmint.unstick_from String => [:chew_it_up_and_spit_it_out], :ignore_errors => false
     s.should_not respond_to(:chew_it_up_and_spit_it_out)
+    validate_sticks_of_spearmint
+    
+    Spearmint.unstick_from String => [:open], :ignore_errors => false
+    s.should_not respond_to(:open)
+    validate_sticks_of_spearmint
   end
   
   it 'should be able to undefine all stuck methods' do
     Spearmint.stick_to String
-    s = ''
+    s = 'jason'
     s.should respond_to(:chew)
     s.should respond_to(:chew_it_up_and_spit_it_out)
     s.should respond_to(:open)
+    s.chew.should == 'nosaj'
+    
+    validate_sticks_of_spearmint
 
     Spearmint.unstick_all_from String, false
     s.should_not respond_to(:chew)
     s.should_not respond_to(:chew_it_up_and_spit_it_out)
     s.should_not respond_to(:open)
+
+    validate_sticks_of_spearmint
+  end
+  
+  def validate_sticks_of_spearmint
+    Spearmint.chew.should_not be_empty
+    Spearmint.chew_it_up_and_spit_it_out.should_not be_empty
+    Spearmint.open.should_not be_empty
   end
 end

data/sticky_blox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sticky_blox}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Rogers"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jason Rogers