bubot 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8764e8dfff1268e2c54d7248d67d3ef8d6ad96ff
-  data.tar.gz: a928121e7306a845b1cc17b3ea3f676163047f94
+  metadata.gz: c1064314ec4c93d7e867557fe47933598b7a6105
+  data.tar.gz: ccb71b09f29ec586c3a0b37a1f2d77f7762a2ae4
 SHA512:
-  metadata.gz: f6fde114e83d818bfe1d267fbae30dc55cfebf60b21b1833f722015aa4c76a775c48089d8c7d0def03ea94ce4646b8f9b9494a786c2876ccdfc73683d505a38b
-  data.tar.gz: 62d5d55a37d2653d7ea238e6a418bf6c2421a817c4f56d466b46e4541fc2190fad3763302e86aec833c94b7b1ec6357f0dbf88ad0e07b0da20b75542dc9878b6
+  metadata.gz: eb56d4dda32148fc88d8e8bc8ff7f38d1775cadcb1309eda0ad348680cc4fbe2c27bf18d00f77d2503e72cca85f0e68244c6b876a02406753935f3f39972897f
+  data.tar.gz: c5c90448fb55e80795fc06905f7d42df5d18192a34aab138efc5970538685adc9e879f9a59a0acf506cb55ca2a43254f3be82a66e1d1222f5767490d594a1c79

data/README.md

@@ -23,13 +23,15 @@ Or install it yourself as:
 
 ## Usage
 
-Extend Bubot in your class.
+Include Bubot in your class.
 
 This gives you the class method `.watch(:method_name, options)`.
 
 If a watched method takes longer than options[:timeout], the block will execute.
 Remember, the timeout is 0 by default so if you don't pass it a timeout, the
-block will always execute (like a callback)
+block will always execute (like an after callback).
+
+Also, as a bonus, you get `.bubot`, which is syntactic sugar for active support callbacks.
 
 ### Example
 
@@ -47,6 +49,21 @@ class WebAPI
     sleep 3
     "body"
   end
+
+  # Syntactic sugar for active support callbacks
+  bubot :before, :save, :udpate
+  bubot :around, :save, ->(instance, &block) { puts "Before"; block.call; puts "All Done" }
+  bubot :after, :save do
+    puts "Another thing to do after"
+  end
+
+  def save
+    puts "Saving..."
+  end
+
+  def update
+    puts "Updating..."
+  end
 end
 ```
 

data/lib/bubot.rb

@@ -8,20 +8,17 @@ module Bubot
   include ActiveSupport::Callbacks
 
   module ClassMethods
+    def bubot(before_after_around, method_name, callback=nil, &block)
+      configure_bubot method_name
+      set_callback(method_name, before_after_around, (callback || block))
+    end
+
     def watch(method_name, timeout: 0, with: nil, &block)
-      define_callbacks method_name
+      configure_bubot method_name
 
       past_time_block = with || (block if block_given?)
 
-      define_method("#{method_name}_with_bubot") do |*args, &block|
-        run_callbacks method_name do
-          send("#{method_name}_without_bubot".to_sym, *args, &block)
-        end
-      end
-
-      alias_method_chain_or_register_for_chaining method_name
-
-      set_callback method_name, :around, ->(r, &block) do
+      set_callback method_name, :around, ->(instance, &block) do
         start_time = Time.now
 
         method_return_value = block.call
@@ -34,6 +31,21 @@ module Bubot
 
     private
 
+    def configure_bubot(method_name)
+      method_name_with_bubot = "#{method_name}_with_bubot".to_sym
+      return if instance_methods.include? method_name_with_bubot
+
+      define_callbacks method_name
+
+      define_method(method_name_with_bubot) do |*args, &block|
+        run_callbacks method_name do
+          send("#{method_name}_without_bubot".to_sym, *args, &block)
+        end
+      end
+
+      alias_method_chain_or_register_for_chaining method_name
+    end
+
     def alias_method_chain_or_register_for_chaining(method_name)
       if method_defined?(method_name)
         alias_method_chain(method_name, :bubot)

data/lib/bubot/version.rb

@@ -1,3 +1,3 @@
 module Bubot
-  VERSION = "0.0.8"
+  VERSION = "0.1.0"
 end

data/spec/bubot_spec.rb

@@ -23,7 +23,40 @@ class Qux
   end
 end
 
+class CallbackTester
+  include Bubot
+
+  bubot :before, :save, :update
+  bubot :around, :save, ->(instance, &block) { instance.do_other_stuff; block.call }
+  bubot(:after, :save) do
+    Baz.buz
+  end
+
+  def update; end
+  def save; end
+  def do_other_stuff; end
+end
+
 describe Bubot do
+  describe ".bubot" do
+    subject(:callbacks) { CallbackTester.new }
+    it "allows a method to be executed before another method" do
+      expect(callbacks).to receive(:update).once
+      callbacks.save
+    end
+
+    it "allows a block to be executed as a callback" do
+      expect(Baz).to receive(:buz).once
+      callbacks.save
+    end
+
+    it "allows a lambda to be executed as a callback" do
+      expect(callbacks).to receive(:do_other_stuff).once
+      callbacks.save
+    end
+
+  end
+
   describe ".watch" do
     it "calls the strategy(block) when the time exceeds the max time" do
       Baz.should_receive(:buz).once

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubot
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Micah Cooper
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler