hooks 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17924e6e39cc1e9257eb89343e4b714bc617c1e3
-  data.tar.gz: c5f79d3aec15fc0ae9a6e36f11b7db3c1c35455c
+  metadata.gz: 0b837493d808a39dba9923d6f57b6e679df91c1c
+  data.tar.gz: 5ab4d80c78c0fa39946fbbfb50e255d12e4a0cdb
 SHA512:
-  metadata.gz: 55f49769f6dd5bb4cce4dfcea66546d6681580479be431409eff36d884417898bfcf5d903d0ebed765d20fa32ca772880bc7463805ed8c55428b60b28ef97501
-  data.tar.gz: c216a9b2d5f1b841b91c83a8cee5a20cc0425789dd95d147ef9474af389234e990d13f46e1694966a39c1eaaa9441d86aa46f1f3f1a6cce908e05f3abe3fda30
+  metadata.gz: 23344cb417f370797f6de7cdcc4974bba3cd958b9a4d0c90ae4a639197b9f163081819498d8349a3851376f0c1c127e42e79133b1e6e9b5d9d3128d2f872136e
+  data.tar.gz: 9dacc24205cd2ecabc682c5fe5654d8119b2d4a123fe8095753696ddcf168817d7e578b34abe68f0a5759067f5dfe7f3f9ced4fb671ff4da9788a6f71eff7aa4

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.3.3
+
+* Fix a bug where the hook writer method (e.g. `#after_dark`) wasn't available on the instance even when `InstanceHooks` was included.
+
 ## 0.3.2
 
 * Added `Hooks::InstanceHooks` to add hooks and/or callbacks on instance level. Thanks to @mpapis for that suggestion.

data/lib/hooks.rb

@@ -77,11 +77,18 @@ module Hooks
     end
 
     def define_hook_writer(name)
-      instance_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+      instance_eval *hook_writer_args(name)
+    end
+
+    def hook_writer_args(name)
+      # DISCUSS: isn't there a simpler way to define a dynamic method? should the internal logic be handled by HooksSet instead?
+      str = <<-RUBY_EVAL
         def #{name}(method=nil, &block)
           _hooks[:#{name}] << (block || method)
         end
       RUBY_EVAL
+
+      [str, __FILE__, __LINE__ + 1]
     end
 
     def extract_options!(args)

data/lib/hooks/instance_hooks.rb

@@ -2,12 +2,24 @@ module Hooks
   module InstanceHooks
     include ClassMethods
 
+    def run_hook(name, *args)
+      run_hook_for(name, self, *args)
+    end
+
+  private
     def _hooks
       @_hooks ||= self.class._hooks.clone # TODO: generify that with representable_attrs.
     end
 
-    def run_hook(name, *args)
-      run_hook_for(name, self, *args)
+    module ClassMethods
+      def define_hook_writer(name)
+        super
+        class_eval *hook_writer_args(name)
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
     end
   end
 end

data/lib/hooks/version.rb

@@ -1,3 +1,3 @@
 module Hooks
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/test/instance_hooks_test.rb

@@ -6,7 +6,11 @@ class InstanceHooksTest < HooksTest
       include Hooks::InstanceHooks
     end }
 
-    subject { klass.new }
+    subject { klass.new.tap do |obj|
+      obj.instance_eval do
+        def dine; executed << :dine; end
+      end
+    end }
 
     it "adds hook to instance" do
       subject.define_hook :after_eight
@@ -32,9 +36,16 @@ class InstanceHooksTest < HooksTest
       end
 
       it "responds to #run_hook" do
-        subject.instance_eval do
-          def dine; executed << :dine; end
-        end
+        subject.run_hook :after_eight
+        subject.executed.must_equal [:dine]
+      end
+    end
+
+    describe "#after_eight from class (no define_hook in instance)" do
+      it "responds to #after_eight" do
+        klass.define_hook :after_eight
+
+        subject.after_eight :dine
 
         subject.run_hook :after_eight
         subject.executed.must_equal [:dine]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hooks
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Nick Sutterer