goat 0.2.9 → 0.2.10

data/lib/goat.rb

@@ -271,8 +271,7 @@ module Goat
     attr_accessor :app_class
         
     def initialize
-      @before_handler_bindings = {}
-      @after_handler_bindings = {}
+      @around_handler_bindings = {}
     end
     
     class ::Proc
@@ -306,25 +305,24 @@ module Goat
       mappings[method][path] = hook
     end
     
-    def before_handler_binding(handler)
-      @before_handler_bindings[handler] ||= App.bind(handler)
-    end
-    
-    def after_handler_binding(handler)
-      @after_handler_bindings[handler] ||= App.bind(handler)
-    end    
+    def around_handler_binding(handler, type)
+      if type == :before
+        @around_handler_bindings[handler] ||= App.bind(handler)
+      elsif type == :after
+        @around_handler_bindings[handler] ||= App.bind(handler, nil, false)
+      else
+        raise 'bad handler type'
+      end
+    end      
     
-    def run_before_handlers(app)
-      app.class.before_handlers.each do |handler|
-        before_handler_binding(handler).call(app)
+    def run_around_handlers(app, type)
+      app.class.around_handlers.select{|h| h.first == type}.each do |handler|
+        around_handler_binding(handler[1], type).call(app)
       end
     end
     
-    def run_after_handlers(app)
-      app.class.after_handlers.each do |handler|
-        after_handler_binding(handler).call(app)
-      end
-    end    
+    def run_before_handlers(app); run_around_handlers(app, :before); end
+    def run_after_handlers(app); run_around_handlers(app, :after); end
     
     def resp_for_error(e, app)      
       resp = nil
@@ -536,8 +534,7 @@ module Goat
     @@not_found_handler = nil
     @@active_pages = {}
     @@active_page_queue = Queue.new
-    @@before_handlers = []    
-    @@after_handlers = []
+    @@around_handlers = []
     
     def active_pages; @@active_pages; end    
     def active_page_queue; @@active_page_queue; end
@@ -584,15 +581,14 @@ module Goat
       req_handler.add_mapping(opts)
     end
     
-    def before_handlers; @@before_handlers; end    
-    def after_handlers; @@after_handlers; end
+    def around_handlers; @@around_handlers; end    
         
     def before(&blk)
-      before_handlers << blk
+      around_handlers << [:before, blk]
     end
     
     def after(&blk)
-      after_handlers << blk
+      around_handlers << [:after, blk]
     end
 
     def enable_notifications(opts={})
@@ -723,7 +719,7 @@ module Goat
     include AppHelpers
     include FlashHelper
     
-    def self.bind(hook, name=nil)
+    def self.bind(hook, name=nil, for_response=true)
       mname = name || String.random
       
       lambda do |app, *args|
@@ -736,7 +732,12 @@ module Goat
         end
         
         Logger.log :req, "running #{mname}"
-        app.respond_with_hook(mname, *args)
+        if for_response                  
+          # sets the body
+          app.respond_with_hook(mname, *args)
+        else
+          app.send(mname, *args)
+        end
       end
     end
         

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Patrick Collison