rory 0.3.13 → 0.3.14

data/lib/rory/controller.rb

@@ -9,6 +9,26 @@ module Rory
 
     attr_accessor :locals
 
+    class << self
+      def before_actions
+        @before_actions ||= []
+      end
+
+      def after_actions
+        @after_actions ||= []
+      end
+
+      # Register a method to run before the action method.
+      def before_action(method_name)
+        before_actions << method_name
+      end
+
+      # Register a method to run after the action method.
+      def after_action(method_name)
+        after_actions << method_name
+      end
+    end
+
     def initialize(request, routing, app = nil)
       @request = request
       @dispatcher = routing[:dispatcher]
@@ -64,22 +84,10 @@ module Rory
       @response = @dispatcher.render_not_found
     end
 
-    # This method is called before the action method.
-    def before_action
-      #noop
-    end
-
-    # This method is called after the action method.
-    def after_action
-      #noop
-    end
-
     def present
-      # if a method exists on the controller for the requested action, call it.
-      action = @route.action
-      before_action
-      self.send(action) if self.respond_to?(action)
-      after_action
+      # Call all before and after filters, and if a method exists on the
+      # controller for the requested action, call it in between.
+      call_filtered_action(@route.action)
 
       if @response
         # that method may have resulted in a response already being generated
@@ -95,5 +103,24 @@ module Rory
         [200, {'Content-type' => 'text/html', 'charset' => 'UTF-8'}, [@body]]
       end
     end
+
+  private
+
+    def call_filter_set(which_set, opts = {})
+      opts[:break_if_response] ||= true
+      filters = self.class.send(which_set)
+      filters.each do |filter|
+        self.send(filter)
+        break if @response && opts[:break_if_response]
+      end
+    end
+
+    def call_filtered_action(action)
+      call_filter_set(:before_actions)
+      unless @response
+        self.send(action) if self.respond_to?(action)
+        call_filter_set(:after_actions, :break_if_response => false)
+      end
+    end
   end
 end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.13'
+  VERSION = '0.3.14'
 end

data/spec/fixture_app/controllers/filtered_controller.rb

@@ -0,0 +1,5 @@
+class FilteredController < Rory::Controller
+  before_action :pickle_something
+  before_action :make_it_tasty
+  after_action :rub_tummy
+end

data/spec/lib/rory/controller_spec.rb

@@ -88,21 +88,48 @@ describe Rory::Controller do
 
   describe "#present" do
     it "calls filters and action from route if exists on controller" do
-      controller = Rory::Controller.new(@request, @routing)
-      expect(controller).to receive('before_action').ordered
-      expect(controller).to receive('letsgo').ordered
-      expect(controller).to receive('after_action').ordered
-      expect(controller).to receive('render').ordered
+      controller = FilteredController.new(@request, @routing)
+      expect(controller).to receive(:pickle_something).ordered
+      expect(controller).to receive(:make_it_tasty).ordered
+      expect(controller).to receive(:letsgo).ordered
+      expect(controller).to receive(:rub_tummy).ordered
+      expect(controller).to receive(:render).ordered
+      controller.present
+    end
+
+    it "short circuits if a before_action generates a response" do
+      controller = FilteredController.new(@request, @routing)
+      def controller.pickle_something
+        @response = 'stuff'
+      end
+      expect(controller).to receive(:make_it_tasty).never
+      expect(controller).to receive(:letsgo).never
+      expect(controller).to receive(:rub_tummy).never
+      expect(controller).to receive(:render).never
+      controller.present
+    end
+
+    it "does not short circuit after_actions if action generates response" do
+      controller = FilteredController.new(@request, @routing)
+      def controller.letsgo
+        @response = 'stuff'
+      end
+      expect(controller).to receive(:pickle_something).ordered
+      expect(controller).to receive(:make_it_tasty).ordered
+      expect(controller).to receive(:letsgo).ordered.and_call_original
+      expect(controller).to receive(:rub_tummy).ordered
+      expect(controller).to receive(:render).never
       controller.present
     end
 
     it "doesn't try to call action from route if nonexistent on controller" do
-      controller = Rory::Controller.new(@request, @routing)
+      controller = FilteredController.new(@request, @routing)
       allow(controller).to receive(:respond_to?).with('letsgo').and_return(false)
-      expect(controller).to receive('before_action').ordered
-      expect(controller).to receive('letsgo').never
-      expect(controller).to receive('after_action').ordered
-      expect(controller).to receive('render').ordered
+      expect(controller).to receive(:pickle_something).ordered
+      expect(controller).to receive(:make_it_tasty).ordered
+      expect(controller).to receive(:letsgo).never
+      expect(controller).to receive(:rub_tummy).ordered
+      expect(controller).to receive(:render).ordered
       controller.present
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -205,6 +205,7 @@ files:
 - lib/tasks/rory.rake
 - spec/fixture_app/config/application.rb
 - spec/fixture_app/config/routes.rb
+- spec/fixture_app/controllers/filtered_controller.rb
 - spec/fixture_app/controllers/for_reals_controller.rb
 - spec/fixture_app/controllers/goose/lumpies_controller.rb
 - spec/fixture_app/controllers/goose/wombat/rabbits_controller.rb