bubot 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1064314ec4c93d7e867557fe47933598b7a6105
-  data.tar.gz: ccb71b09f29ec586c3a0b37a1f2d77f7762a2ae4
+  metadata.gz: 21a01a014424cffe08eb7b9d5981f82d1347b98c
+  data.tar.gz: 142d37e4b860d1517893d5aca3d68162e011079d
 SHA512:
-  metadata.gz: eb56d4dda32148fc88d8e8bc8ff7f38d1775cadcb1309eda0ad348680cc4fbe2c27bf18d00f77d2503e72cca85f0e68244c6b876a02406753935f3f39972897f
-  data.tar.gz: c5c90448fb55e80795fc06905f7d42df5d18192a34aab138efc5970538685adc9e879f9a59a0acf506cb55ca2a43254f3be82a66e1d1222f5767490d594a1c79
+  metadata.gz: a32ad5c192a105ec1ff8085b4a977f18e4d4e2024a32082342cbb180b9ce0ba0663792ff869f48804d04fa99d36f512dc26d285f3c682bbd192a308063d0e881
+  data.tar.gz: c76a9f3f90e26e76e0239045f9f9ba4bdab72b5fbae9d76ffda4578cdfbef7a0e4bcae018171cebc56e1e804bab7a6211634ca8d762ccbda7d3ad942da98fc2b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.1

data/README.md

@@ -31,8 +31,6 @@ 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 an after callback).
 
-Also, as a bonus, you get `.bubot`, which is syntactic sugar for active support callbacks.
-
 ### Example
 
 ```ruby
@@ -49,21 +47,6 @@ 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

@@ -1,63 +1,31 @@
 require "bubot/version"
-require "active_support/concern"
-require "active_support/callbacks"
-require "active_support/core_ext/module/aliasing"
 
 module Bubot
-  extend ActiveSupport::Concern
-  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 self.included(base)
+    base.extend ClassMethods
+    interceptor = const_set "#{base.name}Interceptor", Module.new
+    base.prepend interceptor
+  end
 
+  module ClassMethods
     def watch(method_name, timeout: 0, with: nil, &block)
-      configure_bubot method_name
-
-      past_time_block = with || (block if block_given?)
-
-      set_callback method_name, :around, ->(instance, &block) do
-        start_time = Time.now
-
-        method_return_value = block.call
-
-        if (total_time = Time.now - start_time) >= timeout
-          past_time_block.call(self, total_time, method_return_value)
-        end
-      end
-    end
+      interceptor = const_get "#{self.name}Interceptor"
+      interceptor.module_eval do
+        past_time_block = with || (block if block_given?)
 
-    private
+        define_method(method_name) do |*args, &block|
+          start_time = Time.now
 
-    def configure_bubot(method_name)
-      method_name_with_bubot = "#{method_name}_with_bubot".to_sym
-      return if instance_methods.include? method_name_with_bubot
+          method_return_value = super(*args, &block)
 
-      define_callbacks method_name
+          if (total_time = Time.now - start_time) >= timeout
+            past_time_block.call(self, total_time, method_return_value)
+          end
 
-      define_method(method_name_with_bubot) do |*args, &block|
-        run_callbacks method_name do
-          send("#{method_name}_without_bubot".to_sym, *args, &block)
+          method_return_value
         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)
-      else
-        (@method_names ||= []).push(method_name)
-      end
-    end
-
-    def method_added(method_name)
-      if (@method_names ||= []).delete(method_name)
-        alias_method_chain(method_name, :bubot)
-      end
     end
   end
 end

data/lib/bubot/version.rb

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

data/spec/bubot_spec.rb

@@ -6,8 +6,7 @@ end
 
 module Foo
   def not_too_slow; end
-  def too_slow; sleep 0.006
-  end
+  def too_slow; sleep 0.006 end
 end
 
 class Qux
@@ -23,40 +22,7 @@ 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
@@ -248,15 +214,13 @@ describe Bubot do
             #something
           end
 
-          def arguments(foo, bar)
-            # do something
+          def arguments(a, b)
+            a + b
           end
         end
 
         original_class = OriginalArguments.new
-        expect(original_class).to receive(:arguments_without_bubot).with("foo", "bar")
-        original_class.arguments('foo', 'bar')
-
+        expect(original_class.arguments('foo', 'bar')).to eq('foobar')
       end
 
       it "accepts the original methods block" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bubot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Micah Cooper
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Take action when methods take too long
@@ -89,10 +89,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Take action when methods take too long