layout 0.1.0 → 0.2.0

data/.gitignore

@@ -1,3 +1,5 @@
 pkg/*
 *.gem
 .bundle
+.DS_Store
+*.log

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation --order random

data/Gemfile

@@ -1,4 +1,2 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in layout.gemspec
+source :rubygems
 gemspec

data/Gemfile.lock

@@ -1,107 +1,116 @@
 PATH
   remote: .
   specs:
-    layout (0.1.0)
-      rails (>= 3.0.0)
+    layout (0.2.0)
+      rails
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    archive-tar-minitar (0.5.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    columnize (0.3.1)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.4.1)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.7)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    awesome_print (1.1.0)
+    builder (3.0.4)
+    coderay (1.0.8)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    method_source (0.8.1)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
-    rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rspec-rails (2.0.1)
-      rspec (~> 2.0.0)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
-    thor (0.14.3)
-    treetop (1.4.8)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    slop (3.3.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.34)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   layout!
-  rails (>= 3.0.0)
-  rspec-rails (= 2.0.1)
-  ruby-debug19
+  pry
+  rspec-rails

data/README.rdoc

@@ -0,0 +1,44 @@
+= Layout
+
+Layout is plugin that allow to choose the layout with options like
+`:except` and `:only`.
+
+== Instalation
+
+  gem install layout
+
+== Usage
+
+Add the method call `set_layout` to your controller.
+
+  class PagesController < ApplicationController
+    set_layout 'site', :only => %w(faq feedback)
+    set_layout 'custom', :except => %w(faq feedback)
+  end
+
+== Maintainer
+
+* Nando Vieira (http://nandovieira.com.br)
+
+== License
+
+(The MIT License)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/layout.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["fnando.vieira@gmail.com"]
   s.homepage    = "http://rubygems.org/gems/layout"
   s.summary     = "Specify which layout will be rendered on Rails 3 apps"
-  s.description = "Specify which layout will be rendered on Rails 3 apps"
+  s.description = s.summary
 
   s.rubyforge_project = "layout"
 
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 3.0.0"
-  s.add_development_dependency "rspec-rails", "2.0.1"
-  s.add_development_dependency "ruby-debug19"
+  s.add_dependency "rails"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "awesome_print"
 end

data/lib/layout/base.rb

@@ -15,28 +15,41 @@ module Layout
         # Set current action's layout.
         # Works in the same old fashion, but you can have multiple calls to it.
         #
-        #   set_layout "application"
-        #   set_layout "site", :only => %w[show edit]
-        #   set_layout "site", :except => %w[remove index]
+        #   set_layout :application
+        #   set_layout :site, :only => %w[show edit]
+        #   set_layout :site, :except => %w[remove index]
         #
         def self.set_layout(name, options = {})
-          self.layout_options << [name, options]
+          self.layout_options << [name.to_s, options]
+          layout :choose_layout
         end
-
-        before_filter :choose_layout
       end
     end
 
     module InstanceMethods
       private
       def choose_layout
+        layout_name = nil
+
         self.class.layout_options.each do |name, options|
-          if options[:only] && validates_action_for_layout(true, options[:only])
-            self.class.layout(name)
-          elsif options[:except] && validates_action_for_layout(false, options[:except])
-            self.class.layout(name)
-          end
+          matched = options[:only] && validates_action_for_layout(true, options[:only]) ||
+                    options[:except] && validates_action_for_layout(false, options[:except])
+
+          next unless matched
+
+          layout_name = name
+          break
         end
+
+        if layout_name && lookup_context.find_all(layout_name.to_s, "layouts").first
+          return layout_name
+        end
+
+        self.class.ancestors
+          .take_while {|item| item.name != "ActionController::Base" }
+          .select {|item| item.instance_of?(Class) }
+          .map(&:controller_name)
+          .find {|name| lookup_context.find_all(name, "layouts").first } || "application"
       end
 
       def validates_action_for_layout(compares_to, actions)

data/lib/layout/version.rb

@@ -1,7 +1,7 @@
 module Layout
   module Version
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end

data/spec/controllers/inherited_controller_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe InheritedController do
+  render_views
+
+  context "GET :index" do
+    let(:layout) { "samples" }
+    let(:action) { :index }
+    it_should_behave_like "custom layout"
+  end
+end

data/spec/controllers/no_layout_file_controller_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+describe NoLayoutFileController do
+  render_views
+
+  context "GET :index" do
+    let(:layout) { "application" }
+    let(:action) { :index }
+    it_should_behave_like "custom layout"
+  end
+end

data/spec/controllers/samples_controller_spec.rb

@@ -20,4 +20,10 @@ describe SamplesController do
     let(:action) { :edit }
     it_should_behave_like "custom layout"
   end
+
+  context "GET :remove" do
+    let(:layout) { "samples" }
+    let(:action) { :remove }
+    it_should_behave_like "custom layout"
+  end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 ENV["RAILS_ENV"] = "test"
+ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
 require "rails"
 require "layout"
 require "support/config/boot"
 require "rspec/rails"
 require "support/custom_layout_shared"
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end

data/spec/support/app/controllers/application_controller.rb

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/support/app/controllers/inherited_controller.rb

@@ -0,0 +1,7 @@
+class InheritedController < SamplesController
+  set_layout :missing, :only => :index
+
+  def index
+    render "/action"
+  end
+end

data/spec/support/app/controllers/no_layout_file_controller.rb

@@ -0,0 +1,7 @@
+class NoLayoutFileController < ApplicationController
+  set_layout :missing
+
+  def index
+    render "/action"
+  end
+end

data/spec/support/app/controllers/samples_controller.rb

@@ -1,14 +1,14 @@
-class SamplesController < ActionController::Base
+class SamplesController < ApplicationController
   set_layout "application", :only => :index
   set_layout "site", :only => :show
-  set_layout "modal", :except => [:index, :show]
+  set_layout "modal", :except => [:index, :show, :remove]
+  set_layout "window", :only => :remove
 
   def index
+    render "/action"
   end
 
-  def show
-  end
-
-  def edit
-  end
+  alias_method :show, :index
+  alias_method :edit, :index
+  alias_method :remove, :index
 end

data/spec/support/app/views/action.html.erb

@@ -0,0 +1 @@
+Viewing the <%= controller.action_name %> page

data/spec/support/app/views/layouts/samples.html.erb

@@ -0,0 +1,2 @@
+<h1>Samples</h1>
+<%= yield %>

data/spec/support/config/boot.rb

@@ -1,19 +1,8 @@
-ENV["BUNDLE_GEMFILE"] = File.dirname(__FILE__) + "/../../../../Gemfile"
 require "bundler"
 Bundler.setup
 
 require "rails"
-
-%w(
-  action_controller
-  rails/test_unit
-).each do |framework|
-  begin
-    require "#{framework}/railtie"
-  rescue LoadError
-  end
-end
-
+require "action_controller/railtie"
 
 Bundler.require(:default)
 

data/spec/support/config/routes.rb

@@ -3,5 +3,14 @@ Layout::Application.routes.draw do
     get :index
     get :show
     get :edit
+    get :remove
+  end
+
+  controller :inherited do
+    get :index
+  end
+
+  controller :no_layout_file do
+    get :index
   end
 end

data/spec/support/custom_layout_shared.rb

@@ -1,7 +1,8 @@
 shared_examples_for "custom layout" do
-  it "should render specified layout" do
+  it "renders specified layout" do
     get action
-    response.body.should match(/<h1>#{layout}<\/h1>/i)
-    response.body.should match(/Viewing the #{action} page/i)
+
+    expect(response.body).to match(/<h1>#{layout}<\/h1>/i)
+    expect(response.body).to match(/Viewing the #{action} page/i)
   end
 end

metadata

@@ -1,78 +1,92 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: layout
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-06 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Specify which layout will be rendered on Rails 3 apps
-email: 
+email:
 - fnando.vieira@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
+- README.rdoc
 - Rakefile
 - layout.gemspec
 - lib/layout.rb
@@ -80,70 +94,49 @@ files:
 - lib/layout/railtie.rb
 - lib/layout/version.rb
 - spec/.DS_Store
+- spec/controllers/inherited_controller_spec.rb
+- spec/controllers/no_layout_file_controller_spec.rb
 - spec/controllers/samples_controller_spec.rb
 - spec/spec_helper.rb
 - spec/support/.DS_Store
 - spec/support/app/.DS_Store
+- spec/support/app/controllers/application_controller.rb
+- spec/support/app/controllers/inherited_controller.rb
+- spec/support/app/controllers/no_layout_file_controller.rb
 - spec/support/app/controllers/samples_controller.rb
+- spec/support/app/views/action.html.erb
 - spec/support/app/views/layouts/application.html.erb
 - spec/support/app/views/layouts/modal.html.erb
+- spec/support/app/views/layouts/samples.html.erb
 - spec/support/app/views/layouts/site.html.erb
-- spec/support/app/views/samples/edit.html.erb
-- spec/support/app/views/samples/index.html.erb
-- spec/support/app/views/samples/show.html.erb
 - spec/support/config/boot.rb
 - spec/support/config/routes.rb
 - spec/support/custom_layout_shared.rb
 - spec/support/log/.gitkeep
 - spec/support/tmp/.gitkeep
 - spec/support/tmp/pagseguro-test.yml
-has_rdoc: true
 homepage: http://rubygems.org/gems/layout
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: layout
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Specify which layout will be rendered on Rails 3 apps
-test_files: 
-- spec/controllers/samples_controller_spec.rb
-- spec/spec_helper.rb
-- spec/support/.DS_Store
-- spec/support/app/.DS_Store
-- spec/support/app/controllers/samples_controller.rb
-- spec/support/app/views/layouts/application.html.erb
-- spec/support/app/views/layouts/modal.html.erb
-- spec/support/app/views/layouts/site.html.erb
-- spec/support/app/views/samples/edit.html.erb
-- spec/support/app/views/samples/index.html.erb
-- spec/support/app/views/samples/show.html.erb
-- spec/support/config/boot.rb
-- spec/support/config/routes.rb
-- spec/support/custom_layout_shared.rb
-- spec/support/log/.gitkeep
-- spec/support/tmp/.gitkeep
-- spec/support/tmp/pagseguro-test.yml
+test_files: []

data/spec/support/app/views/samples/edit.html.erb

@@ -1 +0,0 @@
-Viewing the edit page

data/spec/support/app/views/samples/index.html.erb

@@ -1 +0,0 @@
-Viewing the index page

data/spec/support/app/views/samples/show.html.erb

@@ -1 +0,0 @@
-Viewing the show page