hooks 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 667b11cabf0e31ce6915b5acedc3f6bb33547307
-  data.tar.gz: 14d261838dbcb5f189efc8dc9222133bf384c992
+  metadata.gz: 3d492829007f205fe193790c8ffb3f1357dc0e3e
+  data.tar.gz: c91b0ddaba7851ba19f668987d8f2b3e3fc16592
 SHA512:
-  metadata.gz: 2c003d89f6509c22384807e98e18ea95e4a73f36924dc629b6e20d238a5ce5e67dc280dcd8002d7b286d0d5ddf92bee9a9ee9aee19c44fe50eb1e1063027bcc3
-  data.tar.gz: 55070c29fa509cc6dab3cac0c35b9a717ffe6ffbbecc9168c6f042fdc6c762158e3a7a3bcb232fe5a4321330d32b9ce89e1389ba373e6dde989292c0155c251c
+  metadata.gz: 2663911770685b2657e4e31e2a09781e060668bc8b2ba49294e02a35591b071d7a456b2e9ce42aaee954b0fa50e8dfd382618962d89344438842650066c0094e
+  data.tar.gz: 79f902652386af0c587b3c147010622190b3030b42c6733dafc97294610993c4afeee41c578c13ab2f28a554db96d2880b6edf89d3846a5152b73ad15c8f9ddc

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.3.6
+
+* Use `Uber::Options::Value` for evaluating callbacks, now that we have that gem.
+
 ## 0.3.5
 
 * Fixing bug where `uninitialized constant Hooks` was thrown when using InheritableAttribute exclusively. Thanks to @haswalt for reporting.

data/hooks.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license       = 'MIT'
 
-  s.add_dependency "uber", "~> 0.0.2"
+  s.add_dependency "uber", "~> 0.0.4"
 
   s.add_development_dependency "minitest", ">= 5.0.0"
   s.add_development_dependency "rake"

data/lib/hooks.rb

@@ -111,6 +111,7 @@ module Hooks
     self.class.run_hook_for(name, self, *args)
   end
 
+
   class HookSet < Hash
     def [](name)
       super(name.to_sym)

data/lib/hooks/hook.rb

@@ -1,3 +1,5 @@
+require 'uber/options'
+
 module Hooks
   class Hook < Array
     def initialize(options)
@@ -42,13 +44,13 @@ module Hooks
       end
     end
 
+    def <<(callback)
+      super Uber::Options::Value.new(callback, :dynamic => true) # allows string and symbol method names.
+    end
+
   private
     def execute_callback(scope, callback, *args)
-      if callback.kind_of?(Symbol)
-        scope.send(callback, *args)
-      else
-        scope.instance_exec(*args, &callback)
-      end
+      callback.evaluate(scope, *args) # from Uber::Options::Value.
     end
 
     def continue_execution?(result)

data/lib/hooks/version.rb

@@ -1,3 +1,3 @@
 module Hooks
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/test/hook_test.rb

@@ -7,7 +7,7 @@ class HookTest < MiniTest::Spec
     subject << :play_music
     subject << :drink_beer
 
-    subject.to_a.must_equal [:play_music, :drink_beer]
+    subject.to_a.map(&:to_sym).must_equal [:play_music, :drink_beer]
   end
 end
 

data/test/hooks_test.rb

@@ -22,7 +22,7 @@ class HooksTest < MiniTest::Spec
     it "respond to Class.callbacks_for_hook" do
       assert_equal [], klass.callbacks_for_hook(:after_eight)
       klass.after_eight :dine
-      assert_equal [:dine], klass.callbacks_for_hook(:after_eight)
+      assert_equal [:dine], klass.callbacks_for_hook(:after_eight).map(&:to_sym)
     end
 
     it 'symbolizes strings when defining a hook' do
@@ -41,19 +41,19 @@ class HooksTest < MiniTest::Spec
     describe "creates a public writer for the hook that" do
       it "accepts method names" do
         klass.after_eight :dine
-        assert_equal [:dine], klass._hooks[:after_eight]
+        assert_equal [:dine], klass._hooks[:after_eight].map(&:to_sym)
       end
 
       it "accepts blocks" do
         klass.after_eight do true; end
-        assert klass._hooks[:after_eight].first.kind_of? Proc
+        assert klass._hooks[:after_eight].first.to_sym.kind_of? Proc
       end
 
       it "be inherited" do
         klass.after_eight :dine
         subklass = Class.new(klass)
 
-        assert_equal [:dine], subklass._hooks[:after_eight]
+        assert_equal [:dine], subklass._hooks[:after_eight].map(&:to_sym)
       end
       # TODO: check if options are not shared!
     end
@@ -187,11 +187,11 @@ class HooksTest < MiniTest::Spec
     let (:subclass) { Class.new(superclass) do after_eight :have_dinner end }
 
     it "inherits callbacks from the hook" do
-      subclass.callbacks_for_hook(:after_eight).must_equal [:take_shower, :have_dinner]
+      subclass.callbacks_for_hook(:after_eight).map(&:to_sym).must_equal [:take_shower, :have_dinner]
     end
 
     it "doesn't mix up superclass hooks" do
-      subclass.superclass.callbacks_for_hook(:after_eight).must_equal [:take_shower]
+      subclass.superclass.callbacks_for_hook(:after_eight).map(&:to_sym).must_equal [:take_shower]
     end
   end
 end

data/test/instance_hooks_test.rb

@@ -22,7 +22,7 @@ class InstanceHooksTest < HooksTest
       klass.define_hook :after_eight
       klass.after_eight :dine
 
-      assert_equal [:dine], subject.callbacks_for_hook(:after_eight)
+      assert_equal [:dine], subject.callbacks_for_hook(:after_eight).map(&:to_sym)
     end
 
     describe "#after_eight (adding callbacks)" do
@@ -32,7 +32,7 @@ class InstanceHooksTest < HooksTest
       end
 
       it "adds #after_eight hook" do
-        assert_equal [:dine], subject.callbacks_for_hook(:after_eight)
+        assert_equal [:dine], subject.callbacks_for_hook(:after_eight).map(&:to_sym)
       end
 
       it "responds to #run_hook" do

data/test/test_helper.rb

@@ -1,2 +1,8 @@
 require 'minitest/autorun'
 require 'hooks'
+
+Uber::Options::Value.class_eval do
+  def to_sym
+    @value
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hooks
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Nick Sutterer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement