rory 0.3.14 → 0.3.15

data/lib/rory/controller.rb

@@ -11,11 +11,11 @@ module Rory
 
     class << self
       def before_actions
-        @before_actions ||= []
+        @before_actions ||= ancestor_actions(:before)
       end
 
       def after_actions
-        @after_actions ||= []
+        @after_actions ||= ancestor_actions(:after)
       end
 
       # Register a method to run before the action method.
@@ -27,6 +27,13 @@ module Rory
       def after_action(method_name)
         after_actions << method_name
       end
+
+      def ancestor_actions(action_type)
+        (ancestors - [self]).reverse.map { |c|
+          query_method = :"#{action_type}_actions"
+          c.send(query_method) if c.respond_to?(query_method)
+        }.flatten.compact
+      end
     end
 
     def initialize(request, routing, app = nil)
@@ -107,11 +114,11 @@ module Rory
   private
 
     def call_filter_set(which_set, opts = {})
-      opts[:break_if_response] ||= true
+      opts = { :break_if_response => true }.merge(opts)
       filters = self.class.send(which_set)
       filters.each do |filter|
-        self.send(filter)
         break if @response && opts[:break_if_response]
+        self.send(filter)
       end
     end
 

data/lib/rory/version.rb

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

data/spec/fixture_app/controllers/base_filtered_controller.rb

@@ -0,0 +1,4 @@
+class BaseFilteredController < Rory::Controller
+  before_action :pickle_something
+  after_action :rub_tummy
+end

data/spec/fixture_app/controllers/filtered_controller.rb

@@ -1,5 +1,6 @@
-class FilteredController < Rory::Controller
-  before_action :pickle_something
+require_relative 'base_filtered_controller'
+
+class FilteredController < BaseFilteredController
   before_action :make_it_tasty
-  after_action :rub_tummy
+  after_action :sleep
 end

data/spec/lib/rory/controller_spec.rb

@@ -93,6 +93,7 @@ describe Rory::Controller do
       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
       controller.present
     end
@@ -105,6 +106,7 @@ describe Rory::Controller do
       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
       controller.present
     end
@@ -118,6 +120,7 @@ describe Rory::Controller do
       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(:sleep).ordered
       expect(controller).to receive(:render).never
       controller.present
     end
@@ -129,6 +132,7 @@ describe Rory::Controller do
       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(:sleep).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.14
+  version: 0.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -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/base_filtered_controller.rb
 - spec/fixture_app/controllers/filtered_controller.rb
 - spec/fixture_app/controllers/for_reals_controller.rb
 - spec/fixture_app/controllers/goose/lumpies_controller.rb