layout_by_action 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20b94e2962763d30e7e52fa8956a233a5a55ee8a
-  data.tar.gz: e153f1f34232ee4cbba6f02c130cf522b344f091
+  metadata.gz: e99f266b24711feae6f13e1af903f465b9cf0d48
+  data.tar.gz: a98da069d32903b1824edc5df17f54d5942a4d5a
 SHA512:
-  metadata.gz: 15bfc7f4a79bb03b61f2437ed52ff462f11c0ac389830920d9db654c41d072342ce60c9ce048f8cfe75e27d3bc7a35acb696bb524793489d86b15988fd9fcbdb
-  data.tar.gz: db8f49cd3aff4357d41818e3efacb3a4ad5d2d9be41e73e37f33b4e3cc6f2c131564b978e0c9333c0c190a849bcd28c0b1693855363b7642f6f1983bde2457e6
+  metadata.gz: 2dfc9c441cc347fd30b1767590bc1d6c73295780d01b1de3f1a9484b6e2992e79e823b42faa0d7394d5b27a7e48ecdbf1beb507278a95069ca3a8f5f270737d5
+  data.tar.gz: 90ff2be99511dd1adeae9db244c063110c4f61b784a6ea75f65b655f83ce8a7f54a18b6be995fe56caa01a3c66e49b6ce715de86f78fb185bec79a0157669f94

data/lib/layout_by_action/able.rb

@@ -3,9 +3,7 @@ module LayoutByAction
     extend ActiveSupport::Concern
 
     def layout_by_action(action_name=params[:action])
-      self.class.layouts.fetch(action_name) do
-        self.class.default_layout
-      end
+      self.class.layout_heirarchy(action_name).first
     end
 
     module ClassMethods
@@ -31,6 +29,16 @@ module LayoutByAction
         end
         layout :layout_by_action
       end
+
+      def layout_heirarchy(action_name)
+        ancestors.grep(Class).select do |klass|
+          klass.ancestors.grep(Class).include?(ActionController::Base)
+        end.select do |klass|
+          klass != ActionController::Base
+        end.collect do |klass|
+          klass.layouts[action_name] || klass.default_layout
+        end.compact
+      end
     end
 
   end

data/lib/layout_by_action/version.rb

@@ -1,3 +1,3 @@
 module LayoutByAction
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/layout_by_action/able_spec.rb

@@ -3,11 +3,16 @@ require "spec_helper"
 # stand ins for Rails application controller
 # it is extended by the railtie
 
-class ApplicationController
+class ActionController
+  class Base; end
+end
+
+class ApplicationController < ActionController::Base
   include LayoutByAction::Able
   def self.layout(method); end
 end
 
+
 class YourController < ApplicationController; end
 
 module LayoutByAction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: layout_by_action
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - barelyknown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler