rory 0.3.15 → 0.3.16

data/lib/rory/controller.rb

@@ -19,13 +19,13 @@ module Rory
       end
 
       # Register a method to run before the action method.
-      def before_action(method_name)
-        before_actions << method_name
+      def before_action(method_name, opts = {})
+        before_actions << opts.merge(:method_name => method_name)
       end
 
       # Register a method to run after the action method.
-      def after_action(method_name)
-        after_actions << method_name
+      def after_action(method_name, opts = {})
+        after_actions << opts.merge(:method_name => method_name)
       end
 
       def ancestor_actions(action_type)
@@ -94,7 +94,7 @@ module Rory
     def present
       # 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)
+      call_filtered_action(@route.action.to_sym)
 
       if @response
         # that method may have resulted in a response already being generated
@@ -113,20 +113,30 @@ module Rory
 
   private
 
-    def call_filter_set(which_set, opts = {})
-      opts = { :break_if_response => true }.merge(opts)
+    def call_filter_for_action?(filter, action)
+      (filter[:only].nil? || filter[:only].include?(action)) &&
+        (filter[:except].nil? || !filter[:except].include?(action))
+    end
+
+    def get_relevant_filters(which_set, action)
       filters = self.class.send(which_set)
+      filters.select { |filter| call_filter_for_action?(filter, action) }
+    end
+
+    def call_filter_set(which_set, action, opts = {})
+      opts = { :break_if_response => true }.merge(opts)
+      filters = get_relevant_filters(which_set, action)
       filters.each do |filter|
         break if @response && opts[:break_if_response]
-        self.send(filter)
+        self.send(filter[:method_name])
       end
     end
 
     def call_filtered_action(action)
-      call_filter_set(:before_actions)
+      call_filter_set(:before_actions, action)
       unless @response
         self.send(action) if self.respond_to?(action)
-        call_filter_set(:after_actions, :break_if_response => false)
+        call_filter_set(:after_actions, action, :break_if_response => false)
       end
     end
   end

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.3.15'
+  VERSION = '0.3.16'
 end

data/spec/fixture_app/controllers/base_filtered_controller.rb

@@ -1,4 +1,5 @@
 class BaseFilteredController < Rory::Controller
-  before_action :pickle_something
+  before_action :pickle_something, :except => [:eat]
   after_action :rub_tummy
+  after_action :smile, :only => [:eat]
 end

data/spec/fixture_app/controllers/filtered_controller.rb

@@ -2,5 +2,9 @@ require_relative 'base_filtered_controller'
 
 class FilteredController < BaseFilteredController
   before_action :make_it_tasty
-  after_action :sleep
+  before_action :make_it_nutritious, :only => [:eat]
+  after_action :sleep, :except => [:eat]
+
+  def eat
+  end
 end

data/spec/lib/rory/controller_spec.rb

@@ -89,12 +89,9 @@ describe Rory::Controller do
   describe "#present" do
     it "calls filters and action from route if exists on controller" do
       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(:sleep).ordered
-      expect(controller).to receive(:render).ordered
+      [:pickle_something, :make_it_tasty, :letsgo, :rub_tummy, :sleep, :render].each do |m|
+        expect(controller).to receive(m).ordered
+      end
       controller.present
     end
 
@@ -103,11 +100,9 @@ describe Rory::Controller do
       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(:sleep).never
-      expect(controller).to receive(:render).never
+      [:make_it_tasty, :letsgo, :rub_tummy, :sleep, :render].each do |m|
+        expect(controller).to receive(m).never
+      end
       controller.present
     end
 
@@ -127,12 +122,23 @@ describe Rory::Controller do
 
     it "doesn't try to call action from route if nonexistent on controller" do
       controller = FilteredController.new(@request, @routing)
-      allow(controller).to receive(:respond_to?).with('letsgo').and_return(false)
-      expect(controller).to receive(:pickle_something).ordered
-      expect(controller).to receive(:make_it_tasty).ordered
+      allow(controller).to receive(:respond_to?).with(:letsgo).and_return(false)
       expect(controller).to receive(:letsgo).never
+      [:pickle_something, :make_it_tasty, :rub_tummy, :sleep, :render].each do |m|
+        expect(controller).to receive(m).ordered
+      end
+      controller.present
+    end
+
+    it "filters before and after actions on :only and :except" do
+      @routing[:route] = Rory::Route.new('', :to => 'test#eat')
+      controller = FilteredController.new(@request, @routing)
+      expect(controller).to receive(:make_it_tasty).ordered
+      expect(controller).to receive(:make_it_nutritious).ordered
+      expect(controller).to receive(:eat).ordered
       expect(controller).to receive(:rub_tummy).ordered
-      expect(controller).to receive(:sleep).ordered
+      expect(controller).to receive(:smile).ordered
+      expect(controller).to receive(:sleep).never
       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.15
+  version: 0.3.16
   prerelease: 
 platform: ruby
 authors: