bellbro 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74409ad9fa91aaa71560415ffed1edb0fbc7cd4a
-  data.tar.gz: 804c467baf1edf241be682b8d745ce97755f5b9e
+  metadata.gz: 59843051a36bb5d7d2d9d22a261a9f2d5e71dbdd
+  data.tar.gz: 2f7c00567922a84937e26c9fa4b2682fabdcd7cd
 SHA512:
-  metadata.gz: db86de1aeeb29d4f40c8da9ecbf895b43923c7b9ae6abdb347dd76e2c1e0593d70b11c2407ef927aefa041447734de8880e24f6dfe36196704c22041982b9a6d
-  data.tar.gz: 4063b6d5ff173284fb7dfc267ac0d1652eb3a7c9a4437f90536cedc26d706b0c55c52ad680d7eda54b9d8affcaf51ad79c2d621894177a60b1d566c86556b20a
+  metadata.gz: 197c4375c817d11ad36058a9e28ca39ec1720e137cc0ac7ef574431affc94d4a9279047481073aa59fa8fdd83978f7980ebb1f659397fd6180bc0eebad339c77
+  data.tar.gz: 0b30b39693e8a51bbf596677c523e4e1bf2dc4dbe08e5ba29c637e2fae994b30453a8f740c8e1dc23817aa8338eb835a90ee7318f06c274f747971ab4dcd6b02

data/lib/bellbro/hooks.rb

@@ -5,6 +5,14 @@ module Bellbro
       base.class_eval do
         extend ClassMethods
       end
+
+      def aborted?
+        !!@abort
+      end
+
+      def abort!
+        !(@abort = true)
+      end
     end
 
     module ClassMethods
@@ -125,6 +133,11 @@ module Bellbro
         hooks.each { |hook| after_hooks.unshift(hook) }
       end
 
+      def always(*hooks, &block)
+        hooks << block if block
+        hooks.each { |hook| always_hooks.unshift(hook) }
+      end
+
       # Internal: An Array of declared hooks to run around Worker
       # invocation. The hooks appear in the order in which they will be run.
       #
@@ -181,6 +194,11 @@ module Bellbro
       def after_hooks
         @after_hooks ||= []
       end
+
+      def always_hooks
+        @always_hooks ||= []
+      end
+
     end
 
     private
@@ -236,14 +254,21 @@ module Bellbro
       run_hooks(self.class.after_hooks)
     end
 
+    def run_always_hooks
+      run_hooks(self.class.always_hooks, halt_on_abort: false)
+    end
+
     # Internal: Run a colection of hooks. The "run_hooks" method is the common
     # interface by which collections of either before or after hooks are run.
     #
     # hooks - An Array of Symbol and Proc hooks.
     #
     # Returns nothing.
-    def run_hooks(hooks)
-      hooks.each { |hook| run_hook(hook) }
+    def run_hooks(hooks, halt_on_abort: true)
+      hooks.each do |hook|
+        run_hook(hook)
+        break if aborted? && halt_on_abort
+      end
     end
 
     # Internal: Run an individual hook. The "run_hook" method is the common

data/lib/bellbro/version.rb

@@ -1,3 +1,3 @@
 module Bellbro
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/bellbro/worker.rb

@@ -7,13 +7,18 @@ module Bellbro
 
     attr_reader :context
 
+    before :should_run?
+
     def perform(args)
       return unless args.present?
       set_context(args)
       run_before_hooks
-      return unless should_run?
+      return if aborted?
       call
+      return if aborted?
       run_after_hooks
+    ensure
+      run_always_hooks
     end
 
     def call
@@ -21,8 +26,7 @@ module Bellbro
     end
 
     def should_run?
-      # override
-      self.class.should_run?
+      self.class.should_run? || abort!
     end
 
     def debug?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bellbro
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jon Stokes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement