layout_options 0.1 → 0.2

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    layout_options (0.1)
-      actionpack (~> 3.0.1)
+    layout_options (0.1.1)
+      rails (~> 3.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
     actionpack (3.0.3)
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
@@ -22,21 +25,56 @@ GEM
       activesupport (= 3.0.3)
       builder (~> 2.1.2)
       i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
     activesupport (3.0.3)
     archive-tar-minitar (0.5.2)
+    arel (2.0.4)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    has_scope (0.5.0)
     i18n (0.4.2)
+    inherited_resources (1.1.2)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6.0)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
+    mail (2.2.10)
+      activesupport (>= 2.3.6)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    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)
       rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    responders (0.6.2)
     rspec (2.1.0)
       rspec-core (~> 2.1.0)
       rspec-expectations (~> 2.1.0)
@@ -57,15 +95,19 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.4)
       archive-tar-minitar (>= 0.5.2)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 3.0.1)
   bundler (>= 1.0.0.rc.6)
+  inherited_resources (~> 1.1.2)
   layout_options!
+  rails (~> 3.0.1)
   rspec (~> 2.1.0)
   rspec-rails (~> 2.1.0)
   ruby-debug19 (~> 0.11.6)

data/README.textile

@@ -8,32 +8,22 @@ This gem came from that exact scenario.
 
 h2. Usage
 
-To add @layout_options@ to your project just add it to your Gemfile, require it
-in your ApplicationController and define your layouts within each controller.
+To add @layout_options@ to your Rails project and type 'rails generate layout_options:install'
 
 h3. Example
 
 Adding layout_options to your Gemfile:
 
-<code>
-gem 'layout_options', '~> 0.1'
-</code>
+  gem 'layout_options', '~> 0.1'
 
-Require layout_options in your ApplicationController:
+Install @layout_options@:
 
-<code>
-require 'layout_options' # require the gem
-
-class ApplicationController < ActionController::Base
-  # ...
-end
-</code>
+  rails generate layout_options:install
 
 Define your layouts in your controllers:
 
-<code>
-class UsersController < ApplicationController
-  # define your layouts
-  layout_options :overlay => [:new, :edit], :none => :destroy
-end
-</code>
+  class UsersController < ApplicationController
+    layout_options :overlay => [:new, :edit], :none => :destroy
+  end
+
+Thats it!

data/init.rb

@@ -0,0 +1 @@
+require 'layout_options'

data/layout_options.gemspec

@@ -16,12 +16,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "layout_options"
 
-  s.add_dependency 'actionpack','~> 3.0.1'
+  s.add_dependency 'rails', '~> 3.0.1'
+  #s.add_dependency 'actionpack','~> 3.0.1'
 
   s.add_development_dependency "bundler", ">= 1.0.0.rc.6"
   s.add_development_dependency "rspec", "~> 2.1.0"
   s.add_development_dependency "rspec-rails", "~> 2.1.0"
   s.add_development_dependency 'ruby-debug19', '~> 0.11.6'
+  s.add_development_dependency 'inherited_resources', '~> 1.1.2'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/generators/layout_options/install/install_generator.rb

@@ -0,0 +1,13 @@
+module LayoutOptions
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      desc 'prep the application to use layout_options'
+
+      def application_controller_injection # :nodoc:
+        inject_into_class 'app/controllers/application_controller.rb', ApplicationController do
+         "  include LayoutOptions\n"
+        end
+      end
+    end
+  end
+end

data/lib/layout_options/layout_options.rb

@@ -1,19 +1,50 @@
 module LayoutOptions
-  def self.included(controller)
+  def self.included(controller) # :nodoc:
     controller.send(:include, LayoutOptions::InstanceMethods)
     controller.send(:extend, LayoutOptions::ClassMethods)
     controller.send(:layout, :layout_options_selector)
   end
 
   module ClassMethods
+    # layout_options - This method is available at the class level of your ApplicationController
+    # and any controller that inherits from it.
+    #
+    # <tt>layout_options</tt> accepts a single hash where the index is the layout name and the
+    # is the controller method(s) that will be using that layout. If you set the index to <tt>:none</tt>
+    # no layout will be used. If no layout is specified it will default to using the
+    # 'application' layout.
+    #
+    # All of the following examples will work controllers that inherit from <tt>InheritedResources::Base</tt>.
+    #
+    #   # setting an overlay layout for a new method
+    #   class UsersController < ApplicationController
+    #     layout_options :overlay => :new
+    #   end
+    #
+    #   # setting an overlay layout for multiple methods
+    #   class UsersController < ApplicationController
+    #     layout_options :overlay => [:new, :edit]
+    #   end
+    #
+    #   # not using a layout
+    #   class UsersController < ApplicationController
+    #     layout_options :none => [:create, :destroy]
+    #   end
+    #
+    #   # using multiple layouts
+    #   class UsersController < ApplicationController
+    #     layout_options :overlay => [:new, :edit], :none => [:create, :destroy],
+    #       :foo => :show
+    #   end
     def layout_options(args={})
       LayoutOptions::Storage[controller_name] = args
     end
   end
 
   module InstanceMethods
-    def layout_options_selector
-      layout_options = LayoutOptions::Storage[controller_name].clone || {}
+    def layout_options_selector # :nodoc:
+      layout_options = LayoutOptions::Storage[controller_name] || {}
+      layout_options = layout_options.clone unless layout_options.empty?
       no_layout = layout_options.delete(:none) || []
       no_layout = [no_layout] unless Array === no_layout
       action = action_name.to_sym

data/lib/layout_options/storage.rb

@@ -1,12 +1,12 @@
 module LayoutOptions
   class Storage
     class << self
-      def[](key)
+      def[](key) # :nodoc:
         @storage ||= {}
         @storage[key]
       end
 
-      def []=(key, value)
+      def []=(key, value) # :nodoc:
         @storage ||= {}
         @storage[key] = value
       end

data/lib/layout_options/version.rb

@@ -1,7 +1,7 @@
 module LayoutOptions
   module VERSION
-    def self.to_s
-      '0.1'
+    def self.to_s # :nodoc:
+      '0.2'
     end
   end
 end

data/lib/layout_options.rb

@@ -1,7 +1,4 @@
 $: << File.expand_path(File.dirname(__FILE__))
+require 'rails'
 require 'layout_options/layout_options'
 require 'layout_options/storage'
-
-ActiveSupport.on_load :action_controller do
-  include LayoutOptions
-end

data/spec/rails_root/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/spec/rails_root/.rspec

@@ -0,0 +1 @@
+--colour

data/spec/rails_root/Gemfile

@@ -0,0 +1,8 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.3'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'inherited_resources', '~> 1.1.2'
+gem 'layout_options', :path => "#{File.expand_path(File.dirname(__FILE__)+'/../../')}"
+gem 'rspec', '~> 2.1.0'
+gem 'rspec-rails', '~> 2.1.0'

data/spec/rails_root/Gemfile.lock

@@ -0,0 +1,99 @@
+PATH
+  remote: /Users/Dane/Projects/layout_options
+  specs:
+    layout_options (0.1.1)
+      rails (~> 3.0.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.4)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    has_scope (0.5.0)
+    i18n (0.4.2)
+    inherited_resources (1.1.2)
+      has_scope (~> 0.5.0)
+      responders (~> 0.6.0)
+    mail (2.2.10)
+      activesupport (>= 2.3.6)
+      i18n (~> 0.4.1)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    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)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    responders (0.6.2)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    rspec-rails (2.1.0)
+      rspec (~> 2.1.0)
+    sqlite3-ruby (1.3.2)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  inherited_resources (~> 1.1.2)
+  layout_options!
+  rails (= 3.0.3)
+  rspec (~> 2.1.0)
+  rspec-rails (~> 2.1.0)
+  sqlite3-ruby

data/spec/rails_root/Rakefile

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+require 'rake'
+
+RailsRoot::Application.load_tasks

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

@@ -0,0 +1,4 @@
+class ApplicationController < ActionController::Base
+  include LayoutOptions
+  protect_from_forgery
+end

data/spec/rails_root/app/controllers/bar_controller.rb

@@ -0,0 +1,6 @@
+class BarController < InheritedResources::Base
+  layout_options :overlay => :new, :none => :create
+  def new; end
+  def show; end
+  def create; end
+end

data/spec/rails_root/app/controllers/baz_controller.rb

@@ -0,0 +1,7 @@
+class BazController < InheritedResources::Base
+  belongs_to :bar
+  layout_options :overlay => :new, :none => :create
+  def new; end
+  def show; end
+  def create; end
+end

data/spec/rails_root/app/controllers/foo_controller.rb

@@ -0,0 +1,6 @@
+class FooController < ApplicationController
+  layout_options :overlay => :new, :none => :create
+  def new; end
+  def show; end
+  def create; end
+end

data/spec/rails_root/app/views/layouts/application.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>RailsRoot</title>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/spec/rails_root/app/views/layouts/overlay.html.erb

@@ -0,0 +1,2 @@
+<!-- overlay view -->
+<%= yield %>

data/spec/rails_root/config/application.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module RailsRoot
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/spec/rails_root/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/spec/rails_root/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/rails_root/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+RailsRoot::Application.initialize!

data/spec/rails_root/config/environments/development.rb

@@ -0,0 +1,26 @@
+RailsRoot::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/spec/rails_root/config/environments/production.rb

@@ -0,0 +1,49 @@
+RailsRoot::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/spec/rails_root/config/environments/test.rb

@@ -0,0 +1,35 @@
+RailsRoot::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/rails_root/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/spec/rails_root/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/spec/rails_root/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/spec/rails_root/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+RailsRoot::Application.config.secret_token = 'c9074d143f197e0d16199d1564853c3758c51315e5748d1304b5683bb3c008b6c76518a6cbb6ec0272b0f36393ccf987898b36bcbec62a0afd7650b5914f2911'

data/spec/rails_root/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+RailsRoot::Application.config.session_store :cookie_store, :key => '_rails_root_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rails generate session_migration")
+# RailsRoot::Application.config.session_store :active_record_store

data/spec/rails_root/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/spec/rails_root/config/routes.rb

@@ -0,0 +1,6 @@
+RailsRoot::Application.routes.draw do
+  resources :foo
+  resources :bar do
+    resources :baz
+  end
+end

data/spec/rails_root/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run RailsRoot::Application

data/spec/rails_root/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/spec/rails_root/spec/controllers/bar_controller_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe BarController do
+  let(:params) { {} }
+  it_should_behave_like 'layout options'
+end

data/spec/rails_root/spec/controllers/baz_controller_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe BazController do
+  let(:params) { {:bar_id => 1 }.clone }
+  it_should_behave_like 'layout options'
+end

data/spec/rails_root/spec/controllers/foo_controller_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe FooController do
+  let(:params) { {} }
+  it_should_behave_like 'layout options'
+end

data/spec/rails_root/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

data/spec/rails_root/spec/support/shared.rb

@@ -0,0 +1,24 @@
+shared_examples_for 'layout options' do
+  describe '#new' do
+    before(:each) { get :new, params }
+    it { should render_template("#{controller.controller_name}/new") }
+    it { should render_template('layouts/overlay') }
+  end
+
+  describe '#show' do
+    before(:each) { get :show, params.merge(:id => 1) }
+    it { should render_template("#{controller.controller_name}/show") }
+    it { should render_template('layouts/application') }
+  end
+
+  describe '#create' do
+    before(:each) { post :create, params }
+    it { should render_template("#{controller.controller_name}/create") }
+
+    it 'does not use a layout' do
+      # i know i shouldn't be testing a private method, but i cant figure
+      # out how to test that no layout is used
+      controller.send(:_layout).should == false
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'bundler/setup'
+require 'rails'
 require 'action_controller'
+require 'inherited_resources'
 require 'rspec/rails'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/layout_options')

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Dane Harrigan
@@ -13,11 +13,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -05:00
+date: 2010-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: actionpack
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -93,6 +93,21 @@ dependencies:
         version: 0.11.6
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: inherited_resources
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  type: :development
+  version_requirements: *id006
 description: The layout_options gem provides a single place to set all of your layouts in your controller. This gem really shines when multiple layouts are needed when using inherited_resources.
 email: 
 - dane.harrigan@gmail.com
@@ -108,13 +123,55 @@ files:
 - Gemfile.lock
 - README.textile
 - Rakefile
+- init.rb
 - layout_options.gemspec
+- lib/generators/layout_options/install/install_generator.rb
 - lib/layout_options.rb
 - lib/layout_options/layout_options.rb
 - lib/layout_options/storage.rb
 - lib/layout_options/version.rb
-- spec/layout_options_spec.rb
 - spec/layout_options_storage_spec.rb
+- spec/rails_root/.gitignore
+- spec/rails_root/.rspec
+- spec/rails_root/Gemfile
+- spec/rails_root/Gemfile.lock
+- spec/rails_root/Rakefile
+- spec/rails_root/app/controllers/application_controller.rb
+- spec/rails_root/app/controllers/bar_controller.rb
+- spec/rails_root/app/controllers/baz_controller.rb
+- spec/rails_root/app/controllers/foo_controller.rb
+- spec/rails_root/app/views/bar/create.html.erb
+- spec/rails_root/app/views/bar/new.html.erb
+- spec/rails_root/app/views/bar/show.html.erb
+- spec/rails_root/app/views/baz/create.html.erb
+- spec/rails_root/app/views/baz/new.html.erb
+- spec/rails_root/app/views/baz/show.html.erb
+- spec/rails_root/app/views/foo/create.html.erb
+- spec/rails_root/app/views/foo/new.html.erb
+- spec/rails_root/app/views/foo/show.html.erb
+- spec/rails_root/app/views/layouts/application.html.erb
+- spec/rails_root/app/views/layouts/overlay.html.erb
+- spec/rails_root/config.ru
+- spec/rails_root/config/application.rb
+- spec/rails_root/config/boot.rb
+- spec/rails_root/config/database.yml
+- spec/rails_root/config/environment.rb
+- spec/rails_root/config/environments/development.rb
+- spec/rails_root/config/environments/production.rb
+- spec/rails_root/config/environments/test.rb
+- spec/rails_root/config/initializers/backtrace_silencers.rb
+- spec/rails_root/config/initializers/inflections.rb
+- spec/rails_root/config/initializers/mime_types.rb
+- spec/rails_root/config/initializers/secret_token.rb
+- spec/rails_root/config/initializers/session_store.rb
+- spec/rails_root/config/locales/en.yml
+- spec/rails_root/config/routes.rb
+- spec/rails_root/script/rails
+- spec/rails_root/spec/controllers/bar_controller_spec.rb
+- spec/rails_root/spec/controllers/baz_controller_spec.rb
+- spec/rails_root/spec/controllers/foo_controller_spec.rb
+- spec/rails_root/spec/spec_helper.rb
+- spec/rails_root/spec/support/shared.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/layout_options

data/spec/layout_options_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-class FooController < ActionController::Base
-  layout_options :overlay => :edit, :none => :destroy
-end
-
-describe LayoutOptions do
-  let(:controller) { FooController.new }
-  describe '#edit' do
-    it 'uses the overlay layout' do
-      controller.stub(:action_name => 'edit')
-      controller.layout_options_selector.should == 'overlay'
-    end
-  end
-
-  describe '#show' do
-    it 'uses the application layout' do
-      controller.stub(:action_name => 'show')
-      controller.layout_options_selector.should == 'application'
-    end
-  end
-
-  describe '#destroy' do
-    it 'uses no layout' do
-      controller.stub(:action_name => 'destroy')
-      controller.layout_options_selector.should == false
-    end
-  end
-end