rory 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f32801437785ab13928284bd7d3085846dc8f04d
-  data.tar.gz: 60e766bfd8db4e300c3b661dfc47f7cbb55dbecd
+  metadata.gz: 519e856afba46c0680d6d3af79ec301e16437bce
+  data.tar.gz: b6f3aff18d16be85d47eae141dd8f11f7946fcf8
 SHA512:
-  metadata.gz: 6d51ac0184c96b228640b1169229794bc79443a0e7c10c4d399d0646926d66805595aa37d1be0d5bd5f0955159b3109be4971f8ffcd5101a195ef2af0f364092
-  data.tar.gz: 86475e130a4d29a19875e1c81b3da04d4bb2fc0bd2a55850d0cc9ed816dd0b3632436b8acc6d2ef308b8ee0cfac95237864c828a6d818ae560758852373c1b0a
+  metadata.gz: ea76b00f53570b120d821f2e4f356cca6531ae15f85b4fe61a41f856d3ac025773b3e326bf9eef49ff2151e7a6d91189d9c3f876f0f08b294fe6fe36ff45df98
+  data.tar.gz: eed96368cd3a1e75d274f4c0f21d55a2b51b8340c10af48c92b7694b287837ccc9119fd9b54aee8850145f8a1d635f22b8f431432a8d9b72a655af32c847beca

data/lib/rory/controller.rb

@@ -30,10 +30,12 @@ module Rory
       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
+        query_method = :"#{action_type}_actions"
+        if superclass && superclass.respond_to?(query_method)
+          superclass.send(query_method).flatten.compact
+        else
+          []
+        end
       end
     end
 

data/lib/rory/version.rb

@@ -1,3 +1,3 @@
 module Rory
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/lib/rory/controller_spec.rb

@@ -68,6 +68,22 @@ describe Rory::Controller do
         subject.present
       end
 
+      context "on sub-subclass" do
+        let(:grandchild) { Class.new(FilteredController) }
+        let(:greatgrandchild) { Class.new(grandchild) }
+        subject { greatgrandchild.new(@request, @routing) }
+
+        it "assembles list of all filter actions from ancestry" do
+          grandchild.before_action :do_a_jig
+          greatgrandchild.before_action :take_a_deep_breath
+
+          [:pickle_something, :make_it_tasty, :do_a_jig, :take_a_deep_breath, :letsgo, :rub_tummy, :sleep, :render].each do |m|
+            expect(subject).to receive(m).ordered
+          end
+          subject.present
+        end
+      end
+
       it "short circuits if a before_action generates a response" do
         def subject.pickle_something
           @response = 'stuff'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rory
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ravi Gadad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack