hooks 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b837493d808a39dba9923d6f57b6e679df91c1c
-  data.tar.gz: 5ab4d80c78c0fa39946fbbfb50e255d12e4a0cdb
+  metadata.gz: 0f63910d0f878778c924a59a0de9503a56bdb748
+  data.tar.gz: 99e98842efad2faee958e2083101035623bae89e
 SHA512:
-  metadata.gz: 23344cb417f370797f6de7cdcc4974bba3cd958b9a4d0c90ae4a639197b9f163081819498d8349a3851376f0c1c127e42e79133b1e6e9b5d9d3128d2f872136e
-  data.tar.gz: 9dacc24205cd2ecabc682c5fe5654d8119b2d4a123fe8095753696ddcf168817d7e578b34abe68f0a5759067f5dfe7f3f9ced4fb671ff4da9788a6f71eff7aa4
+  metadata.gz: bd8cfb3df2da9db53a3ad96084f5664bb4df4918cc2bbf9328e08fa5a24685f766db913e881a68aae6d3df617850299f5af9f9322b291c5fe9b6a705c714c43b
+  data.tar.gz: 4f104c3b400edf21cb19523b4233b8aac411733d5c8d79b11e645f01c72d8b71019f9ee514200c7b7ac3aae714232948299e5219375661978f0eb1c590767566

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.3.4
+
+* Removing `InheritableAttribute` as we use uber's `InheritableAttr` now.
+
 ## 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.

data/README.md

@@ -155,7 +155,7 @@ end
 
 Note that you have to include `Hooks::InstanceHooks` to get this additional functionality.
 
-See how callbacks can be added to a separate object, now.
+Callbacks can now be added to a single object.
 
 ```ruby
 garfield = Cat.new
@@ -164,7 +164,7 @@ garfield.after_dark :sleep
 garfield.run_hook(:after_dark) # => invoke "Chase mice" hook and #sleep
 ```
 
-This will copy all callbacks from the `after_dark` hook to the instance and add a second hook. This all happens on the `garfield` instance, only, and leaves the class untouched.
+What happens is that the `garfield` object inherits existing hooks with all their callbacks from the `Cat` class, namely, this is `:after_dark`. It can then add local callbacks (or even more hooks) to itself without affecting the `Cat` class.
 
 Naturally, adding new hooks works like-wise.
 

data/hooks.gemspec

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

data/lib/hooks.rb

@@ -1,4 +1,4 @@
-require "hooks/inheritable_attribute"
+require "uber/inheritable_attr"
 require "hooks/hook"
 
 # Almost like ActiveSupport::Callbacks but 76,6% less complex.
@@ -20,7 +20,7 @@ require "hooks/hook"
 module Hooks
   def self.included(base)
     base.class_eval do
-      extend InheritableAttribute
+      extend Uber::InheritableAttr
       extend ClassMethods
       inheritable_attr :_hooks
       self._hooks= HookSet.new

data/lib/hooks/inheritable_attribute.rb

@@ -1,33 +1,5 @@
-module Hooks
-  module InheritableAttribute
-    # Creates an inheritable attribute with accessors in the singleton class. Derived classes inherit the
-    # attributes. This is especially helpful with arrays or hashes that are extended in the inheritance
-    # chain. Note that you have to initialize the inheritable attribute.
-    #
-    # Example:
-    #
-    #   class Cat
-    #     inheritable_attr :drinks
-    #     self.drinks = ["Becks"]
-    #
-    #   class Garfield < Cat
-    #     self.drinks << "Fireman's 4"
-    #
-    # and then, later
-    #
-    #   Cat.drinks      #=> ["Becks"]
-    #   Garfield.drinks #=> ["Becks", "Fireman's 4"]
-    def inheritable_attr(name)
-      instance_eval %Q{
-        def #{name}=(v)
-          @#{name} = v
-        end
-        
-        def #{name}
-          return @#{name} unless superclass.respond_to?(:#{name}) and value = superclass.#{name}
-          @#{name} ||= value.clone # only do this once.
-        end
-      }
-    end
-  end  
-end
+require "uber/inheritable_attr"
+
+Hooks::InheritableAttribute = Uber::InheritableAttr
+
+warn "WARNING: Hooks::InheritableAttribute is deprecated, use Uber::InheritableAttr instead."

data/lib/hooks/instance_hooks.rb

@@ -12,6 +12,7 @@ module Hooks
     end
 
     module ClassMethods
+      # Adds a hook writer to the instance in addition to the class writer.
       def define_hook_writer(name)
         super
         class_eval *hook_writer_args(name)

data/lib/hooks/version.rb

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

data/test/instance_hooks_test.rb

@@ -50,6 +50,26 @@ class InstanceHooksTest < HooksTest
         subject.run_hook :after_eight
         subject.executed.must_equal [:dine]
       end
+
+      it "keeps hooks separate per instance" do
+        klass.define_hook   :after_eight
+
+        other = klass.new.tap do |obj|
+          obj.instance_eval do
+            def dine_other; executed << :dine_other; end
+          end
+        end
+
+        subject.after_eight :dine
+        subject.run_hook    :after_eight
+        other.after_eight   :dine_other
+        other.run_hook      :after_eight
+
+        subject.executed.must_equal [:dine]
+        other.executed.must_equal   [:dine_other]
+      end
+
     end
+
   end
-end
+end

data/test/test_helper.rb

@@ -1,3 +1,2 @@
 require 'minitest/autorun'
-require 'pry'
 require 'hooks'

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hooks
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
+        version: 0.0.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  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'
 description: Declaratively define hooks, add callbacks and run them with the options
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -75,7 +75,6 @@ files:
 - lib/hooks/version.rb
 - test/hook_test.rb
 - test/hooks_test.rb
-- test/inheritable_attribute_test.rb
 - test/instance_hooks_test.rb
 - test/test_helper.rb
 homepage: http://nicksda.apotomo.de/2010/09/hooks-and-callbacks-for-ruby-but-simple/
@@ -88,18 +87,22 @@ 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.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Generic hooks with callbacks for Ruby.
-test_files: []
+test_files:
+- test/hook_test.rb
+- test/hooks_test.rb
+- test/instance_hooks_test.rb
+- test/test_helper.rb

data/test/inheritable_attribute_test.rb

@@ -1,53 +0,0 @@
-require 'test_helper'
-
-class HooksTest < MiniTest::Spec
-  describe "Hooks.define_hook" do
-    subject {
-      Class.new(Object) do
-        extend Hooks::InheritableAttribute
-        inheritable_attr :drinks
-      end
-    }
-
-    it "provides a reader with empty inherited attributes, already" do
-      assert_equal nil, subject.drinks
-    end
-
-    it "provides a reader with empty inherited attributes in a derived class" do
-      assert_equal nil, Class.new(subject).drinks
-      #subject.drinks = true
-      #Class.new(subject).drinks # TODO: crashes.
-    end
-
-    it "provides an attribute copy in subclasses" do
-      subject.drinks = []
-      assert subject.drinks.object_id != Class.new(subject).drinks.object_id
-    end
-
-    it "provides a writer" do
-      subject.drinks = [:cabernet]
-      assert_equal [:cabernet], subject.drinks
-    end
-
-    it "inherits attributes" do
-      subject.drinks = [:cabernet]
-
-      subklass_a = Class.new(subject)
-      subklass_a.drinks << :becks
-
-      subklass_b = Class.new(subject)
-
-      assert_equal [:cabernet],         subject.drinks
-      assert_equal [:cabernet, :becks], subklass_a.drinks
-      assert_equal [:cabernet],         subklass_b.drinks
-    end
-
-    it "does not inherit attributes if we set explicitely" do
-      subject.drinks = [:cabernet]
-      subklass = Class.new(subject)
-
-      subklass.drinks = [:merlot] # we only want merlot explicitely.
-      assert_equal [:merlot], subklass.drinks # no :cabernet, here
-    end
-  end
-end