nestive 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source :rubygems
 
 # Specify dependencies in nestive.gemspec
 gemspec

data/Gemfile.lock

@@ -1,78 +1,110 @@
 PATH
   remote: .
   specs:
-    nestive (0.0.1.pre)
+    nestive (0.1.0)
       rails (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.10)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.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)
+    builder (3.0.4)
+    combustion (0.3.2)
+      rails (>= 3.0.0)
+      thor (>= 0.14.6)
+    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)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
+    mime-types (1.19)
+    multi_json (1.3.7)
+    polyglot (0.3.3)
+    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.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    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.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      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)
-      thor (~> 0.14.4)
-    rake (0.9.0)
-    thor (0.14.6)
-    treetop (1.4.9)
+      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)
+    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.27)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  combustion (~> 0.3.2)
   nestive!
-  rails (~> 3.0)
+  rspec-rails (~> 2.11)

data/README.md

@@ -1,6 +1,7 @@
-# Nestive, A Nested Inheritable Layouts Plugin for Rails
+# Nestive
+[![Build Status](https://travis-ci.org/rwz/nestive.png)](https://travis-ci.org/rwz/nestive)
+## A Nested Inheritable Layouts Plugin for Rails
 
-**Note: This is ridiculously alpha proof-of-concept seeking feedback. Things will change.**
 
 Nestive adds powerful layout and view helpers to your Rails app. It's similar to the nested layout technique [already documented in the Rails guides](http://guides.rubyonrails.org/layouts_and_rendering.html#using-nested-layouts) and found in many other nested layout plugins (a technique using `content_for` and rendering the parent layout at the end of the child layout). There's a bunch of problems with this technique, including:
 
@@ -9,14 +10,14 @@ Nestive adds powerful layout and view helpers to your Rails app. It's similar to
 
 Nestive is *better* because it addresses these problems.
 
-## Just five methods (so far) – `area`, `extend`, `append`, `prepend`, `replace`.
+## Just five methods (so far) – `area`, `extends`, `append`, `prepend`, `replace`.
 
 ### Declaring an area of content in your parent layout with `area`:
 
 The `area` helper is a lot like Rails' own `<%= yield :foo %>`, and is used in layouts to define and render a chunk of content in your layout:
 
     <%= area :sidebar %>
-    
+
 Unlike `yield`, `area` will allow your parent layouts to add content to the area at the same time using either a String or a block:
 
     <%= area :sidebar, "Some Content Here" %>
@@ -24,41 +25,16 @@ Unlike `yield`, `area` will allow your parent layouts to add content to the area
     <%= area :sidebar do %>
       Some Content Here
     <% end %>
-    
-It's important to note that this isn't *default* content, it *is* the content (unless a child changes it).
-
-### Extending a layout in a child layout (or view):
-
-Any layout (or view) can declare that it wants to inherit from and extend a parent layout, in this case we're extending `app/views/layouts/application.html.erb`:
-
-    <%= extends :application do %>
-       ...
-    <% end %>
-    
-You can nest many levels deep:
 
-    # app/views/posts/index.html.erb
-    <%= extends :blog do %>
-       ...
-    <% end %>
-    
-    # app/views/layouts/blog.html.erb
-    <%= extends :public do %>
-       ...
-    <% end %>
-    
-    # app/views/layouts/public.html.erb
-    <%= extends :application do %>
-       ...
-    <% end %>
+It's important to note that this isn't *default* content, it *is* the content (unless a child changes it).
 
 ### Appending content to an area:
 
 The implementation details are quite different, but the `append` helper works much like Rails' built-in `content_for`. It will work with either a String or block, adding the new content onto the end of any content previously provided by parent layouts:
 
     <%= extends :application do %>
-      <%= append :sidebar, "More content." %>
-      <%= append :sidebar do %>
+      <% append :sidebar, "More content." %>
+      <% append :sidebar do %>
         More content.
       <% end %>
     <% end %>
@@ -85,17 +61,63 @@ You can also replace any content provided by parent layouts:
       <% end %>
     <% end %>
 
+### Extending a layout in a child layout (or view):
+
+Any layout (or view) can declare that it wants to inherit from and extend a parent layout, in this case we're extending `app/views/layouts/application.html.erb`:
+
+    <%= extends :application do %>
+       ...
+    <% end %>
+
+You can nest many levels deep:
+
+    # app/views/layouts/application.html.erb
+    <!DOCTYPE html>
+      <html>
+        <head>
+          <%= area :head do %>
+            <title><%= area :title, 'Nestive' %></title>
+          <% end %>
+        </head>
+      <body>
+        <%= yield %>
+      </body>
+    </html>
+
+    # app/views/layouts/with_sidebar.html.erb
+    <%= extends :application do %>
+      <div class="sidebar"><%= area(:sidebar) do %>
+        here goes sidebar
+      <% end %></div>
+      <%= yield -%>
+    <% end %>
+
+    # app/views/layouts/blog_posts.html.erb
+    <%= extends :with_sidebar do %>
+      <% append :sidebar do %>
+        Blog archive:
+        <%= render_blog_archive %>
+      <% end %>
+
+      <% append :head do %>
+        <%= javascript_include_tag 'fancy_blog_archive_tag_cloud' %>
+      <% end %>
+
+      <%= yield %>
+    <% end %>
+
+
 
 ## The token blog example
 
-Set-up a global layout defining some content areas. Note that there is no `<% yield %>` here.
-    
+Set-up a global layout defining some content areas.
+
     # app/views/layouts/application.html.erb
     <!DOCTYPE html>
     <html>
     <head>
       <meta charset="utf-8">
-      <title><%= area :title %> JustinFrench.com</title>
+      <title><%= area :title, "JustinFrench.com" %></title>
       <meta name="description" content="<%= area :description, "This is my website." %>">
       <meta name="keywords" content="<%= area :keywords, "justin, french, ruby, design" %>">
     </head>
@@ -113,76 +135,49 @@ Set-up a global layout defining some content areas. Note that there is no `<% yi
           <% end %>
         </div>
       </div>
+      <%= yield %>
     </body>
     </html>
-    
+
 Next, we set-up a `blog` layout that extends `application`, replacing, appending & prepending content to the areas we defined earlier.
-    
+
     # app/views/layouts/blog.html.erb
     <%= extends :application do %>
       <% replace :title, "My Blog – " %>
       <% replace :description, "Justin French blogs here on Ruby, Rails, Design, Formtastic, etc" %>
       <% prepend :keywords, "blog, weblog, design links, ruby links, formtastic release notes, " %>
+      <%= yield %>
     <% end %>
 
-Now our blog index view can extend `blog` and fill in the areas with content specific to the index action.
-    
+Now in our blog index view we can use `blog` layout and fill in the areas with content specific to the index action.
+
     # app/views/posts/index.html.erb
-    <%= extends :blog do %>
-      <% replace :content do %>
-        <h1>My Blog</h1>
-        <% render @articles %>
-      <% end %>
-    
-      <% append :content do %>
-        <h2>Blog Roll</h2>
-        <% render @links %>
-      <% end %>
+    <% replace :content do %>
+      <h1>My Blog</h1>
+      <%= render @articles %>
     <% end %>
-    
-We also need to instruct the `PostsController` not to wrap the view in a layout of it's own (default Rails behavior), which can be done on an individual action:
 
-    # app/controllers/posts_controller.rb
-    class PostsController < ApplicationController
-      def index
-        render :layout => nil
-      end
-    end
+    <% append :sidebar do %>
+      <h2>Blog Roll</h2>
+      <%= render @links %>
+    <% end %>
 
-Or for an entire controller:
+We also need to instruct the `PostsController` to use this `blog` layout:
 
     # app/controllers/posts_controller.rb
     class PostsController < ApplicationController
-      layout nil
+      layout 'blog'
     end
-    
-Or for every controller:
-
-    # app/controllers/application_controller.rb
-    class ApplicationController < ActionController::Base
-      layout nil
-    end
-
-We'll find a way to make this easier or a bit more obvious in a future version.
 
 
 ## Installation
 
-* add `gem 'nestive', '~> 0.1'` to your gemfile
+* add `gem 'nestive', '~> 0.2'` to your gemfile
 * run `bundle`
-* add `layout nil` to ApplicationController or the specific controllers you want to use Nestive on (see above)
-
-
-## TODO
-
-* Figure out how to test it
-* Actually use it in an app
-* You know, everything!
-
 
 ## Compatibility
 
-Only testing it with Rails 3.1 RCs right now, but it should work with Rails 2 & 3. The dependency is set to ~> 3.0 right now, will change to 2.x when someone can test it works.
+Nestive should work properly with any Rails 3.*. It should probably work with 2.* too, but we don't have test coverage for this.
 
 *Nestive doesn't monkey patch or fiddle with any default behaviors in Rails.* Use it when you want to, don't when you don't.
 
@@ -195,5 +190,5 @@ Only testing it with Rails 3.1 RCs right now, but it should work with Rails 2 &
 
 ## Twitter
 
-* [@nestivegem](http://twitter.com/nestivegem)
-* [@justinfrench](http://twitter.com/justinfrench)
+* [@rwz](https://twitter.com/rwz) — current maintainer
+* [@justinfrench](http://twitter.com/justinfrench) — author

data/Rakefile

@@ -1,21 +1,15 @@
 #!/usr/bin/env rake
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'rdoc/task'
 
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
 
-desc 'Default: run unit tests.'
-task :default => :test
+task :default => :spec
 
-desc 'Test the nestive plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+desc 'Run specs'
+RSpec::Core::RakeTask.new
 
 desc 'Generate documentation for the nestive plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|

data/app/helpers/nestive/layout_helper.rb

@@ -1,9 +1,9 @@
 module Nestive
-  
+
   # The Nestive LayoutHelper provides a handful of helper methods for use in your layouts and views.
   #
-  # See the documentation for each individual method for detailed information, but at a high level, 
-  # your parent layouts define `area`s of content. You can define an area and optionally add content 
+  # See the documentation for each individual method for detailed information, but at a high level,
+  # your parent layouts define `area`s of content. You can define an area and optionally add content
   # to it at the same time using either a String, or a block:
   #
   #     # app/views/layouts/global.html.erb
@@ -24,11 +24,11 @@ module Nestive
   #       </body>
   #     </html>
   #
-  # Your child layouts (or views) inherit and modify the parent by wrapping in an `extend` block 
-  # helper. You can then either `append`, `prepend` or `replace` the content that has previously 
+  # Your child layouts (or views) inherit and modify the parent by wrapping in an `extends` block
+  # helper. You can then either `append`, `prepend` or `replace` the content that has previously
   # been assigned to each area by parent layouts.
   #
-  # The `append`, `prepend` or `replace` helpers are *similar* to Rails' own `content_for`, which 
+  # The `append`, `prepend` or `replace` helpers are *similar* to Rails' own `content_for`, which
   # accepts content for the named area with either a String or with a block). They're different to
   # `content_for` because they're only used modify the content assigned to the area, not retrieve it:
   #
@@ -51,7 +51,7 @@ module Nestive
   #       <% end %>
   #     <% end %>
   module LayoutHelper
-    
+
     # Declares that the current layour (or view) is inheriting from and extending another layout.
     #
     # @param [Symbol] name
@@ -70,10 +70,10 @@ module Nestive
     #     class Admin::PostsController < ApplicationController
     #       # You can disable Rails' layout rendering for all actions
     #       layout nil
-    #       
+    #
     #       # Or disable Rails' layout rendering per-controller
     #       def index
-    #         render :layout => nil 
+    #         render :layout => nil
     #       end
     #     end
     #
@@ -81,12 +81,20 @@ module Nestive
     #     <%= extends :admin do %>
     #       ...
     #     <% end %>
-    def extends(name, &block)
-      capture(&block)
-      render(:file => "layouts/#{name}")
+    def extends(layout, &block)
+      # Make sure it's a string
+      layout = layout.to_s
+
+      # If there's no directory component, presume a plain layout name
+      layout = layout.include?('/') ? layout : "layouts/#{layout}"
+
+      # Capture the content to be placed inside the extended layout
+      content_for(:layout).replace capture(&block)
+
+      render :file => layout
     end
-    
-    # Defines an area of content in your layout that can be modified or replaced by child layouts 
+
+    # Defines an area of content in your layout that can be modified or replaced by child layouts
     # that extend it. You can optionally add content to an area using either a String, or a block.
     #
     # Areas are declared in a parent layout and modified by a child layout, but since Nestive
@@ -121,13 +129,13 @@ module Nestive
       append(name, content)
       render_area(name)
     end
-    
+
     def block(name, content=nil, &block)
       ActiveSupport::Deprecation.warn("block() is deprecated and will be removed very soon, please use area() instead")
       area(name, content, &block)
     end
-    
-    # Appends content to an area previously defined or modified in parent layout(s). You can provide 
+
+    # Appends content to an area previously defined or modified in parent layout(s). You can provide
     # the content using either a String, or a block.
     #
     # @example Appending content with a String
@@ -146,9 +154,10 @@ module Nestive
     def append(name, content=nil, &block)
       content = capture(&block) if block_given?
       add_instruction_to_area(name, :push, content)
+      nil
     end
 
-    # Prepends content to an area previously declared or modified in parent layout(s). You can 
+    # Prepends content to an area previously declared or modified in parent layout(s). You can
     # provide the content using either a String, or a block.
     #
     # @example Prepending content with a String
@@ -167,9 +176,10 @@ module Nestive
     def prepend(name, content=nil, &block)
       content = capture(&block) if block_given?
       add_instruction_to_area(name, :unshift, content)
+      nil
     end
-    
-    # Replaces the content of an area previously declared or modified in parent layout(s). You can 
+
+    # Replaces the content of an area previously declared or modified in parent layout(s). You can
     # provide the content using either a String, or a block.
     #
     # @example Prepending content with a String
@@ -188,20 +198,21 @@ module Nestive
     def replace(name, content=nil, &block)
       content = capture(&block) if block_given?
       add_instruction_to_area(name, :replace, [content])
+      nil
     end
-    
+
     private
-    
+
     # We record the instructions (declaring, appending, prepending and replacing) for an area of
     # content into an array that we can later retrieve and replay. Instructions are stored in an
-    # instance variable Hash `@_area_for`, with each key representing an area name, and each value 
-    # an Array of instructions. Each instruction is a two element array containing a instruction 
+    # instance variable Hash `@_area_for`, with each key representing an area name, and each value
+    # an Array of instructions. Each instruction is a two element array containing a instruction
     # method (eg `:push`, `:unshift`, `:replace`) and a value (content String).
     #
     #     @_area_for[:sidebar] # => [ [:push,"World"], [:unshift,"Hello"] ]
     #
     # Due to the way we extend layouts (render the parent layout after the child), the instructions
-    # are captured in reverse order. `render_area` reversed them and plays them back at rendering 
+    # are captured in reverse order. `render_area` reversed them and plays them back at rendering
     # time.
     #
     # @example
@@ -211,12 +222,12 @@ module Nestive
       @_area_for[name] ||= []
       @_area_for[name] << [instruction, value]
     end
-    
+
     # Take the instructions we've gathered for the area and replay them one after the other on
     # an empty array. These instructions will push, unshift or replace items into our output array,
     # which we then join and mark as html_safe.
     #
-    # These instructions are reversed and replayed when we render the block (rather than as they 
+    # These instructions are reversed and replayed when we render the block (rather than as they
     # happen) due to the way they are gathered by the layout extension process (in reverse).
     #
     # @todo is `html_safe` "safe" here?
@@ -229,4 +240,4 @@ module Nestive
     end
 
   end
-end
+end

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize!
+run Combustion::Application

data/lib/nestive/version.rb

@@ -1,3 +1,3 @@
 module Nestive
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/nestive.gemspec

@@ -1,23 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "nestive/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'nestive/version'
 
 Gem::Specification.new do |s|
   s.name        = "nestive"
   s.version     = Nestive::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Justin French"]
-  s.email       = ["justin@indent.com.au"]
-  s.homepage    = ""
-  s.summary     = %q{A Rails plugin/gem for awesome nested templates and layouts}
-  s.description = %q{A Rails plugin/gem for awesome nested templates and layouts}
+  s.authors     = ['Justin French', 'Pavel Pravosud']
+  s.email       = ['justin@indent.com.au', 'pavel@pravosud.com']
+  s.homepage    = 'https://github.com/rwz/nestive'
+  s.summary     = 'A Rails plugin/gem for awesome nested templates and layouts'
+  s.description = 'A Rails plugin/gem for awesome nested templates and layouts'
 
-  s.rubyforge_project = "nestive"
+  s.rubyforge_project = 'nestive'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  
-  s.add_dependency(%q<rails>, ["~> 3.0"])
+  s.require_paths = ['lib']
+
+  s.add_dependency 'rails', '~> 3.0'
+  s.add_development_dependency 'combustion', '~> 0.3.2'
+  s.add_development_dependency 'rspec-rails', '~> 2.11'
+
 end

data/spec/controllers/nestive_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe NestiveController do
+  render_views
+  
+  context '#area' do
+    it 'is empty by default' do
+      get :index
+      assert_select '#empty-area', ''
+    end
+    
+    it 'shows initial value if any' do
+      get :index
+      assert_select 'title', 'Nestive'
+    end
+    
+    it 'can accept blocks as initial value' do
+      get :index
+      assert_select '#some-area', 'Some content'
+    end
+  end
+  
+  context '#append' do
+    it 'appends content to area as a string' do
+      get :append
+      assert_select 'title', 'Nestive is awesome'
+    end
+    
+    it 'appends content to area as a block' do
+      get :append
+      assert_select '#some-area', "Some content\n Another content"
+    end
+  end
+  
+  context '#prepend' do
+    it 'prepends content to area as a string' do
+      get :prepend
+      assert_select 'title', 'Awesome Nestive'
+    end
+    
+    it 'prepends content to area as a block' do
+      get :prepend
+      assert_select '#some-area', "Prepended\n        Some content"
+    end
+  end
+  
+  context '#replace' do
+    it 'replaces area content with string' do
+      get :replace
+      assert_select 'title', 'Lolwut'
+    end
+    
+    it 'replaces area content with block' do
+      get :replace
+      assert_select '#some-area', 'replaced'
+    end
+  end
+  
+  context '#extends' do
+    it 'extends layouts' do
+      get :extended_one
+      assert_select 'p', 'extended: one'
+      assert_select 'title', 'extended: one'
+      assert_select 'h2', 'extended: one'
+    end
+    
+    it 'can extend already extended layouts' do
+      get :extended_two
+      assert_select 'p', 'extended: two'
+      assert_select 'title', 'extended: one'
+      assert_select '#some-area', 'extended: two'
+      assert_select 'h2', 'extended: one'
+    end
+  end
+  
+end

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

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

data/spec/internal/app/controllers/nestive_controller.rb

@@ -0,0 +1,9 @@
+class NestiveController < ApplicationController
+  def extended_one
+    render :layout => 'extend_one'
+  end
+  
+  def extended_two
+    render :layout => 'extend_two'
+  end
+end

data/spec/internal/app/views/layouts/extend_one.html.erb

@@ -0,0 +1,7 @@
+<%= extends :nestive do %>
+  <% replace :title, 'extended: one' %>
+  
+  <h2>extended: one</h2>
+  
+  <%= yield %>
+<% end %>

data/spec/internal/app/views/layouts/extend_two.html.erb

@@ -0,0 +1,6 @@
+<%= extends :extend_one do %>
+  <%= replace :some_area do %>
+    extended: two
+  <% end %>
+  <%= yield %>
+<% end %>

data/spec/internal/app/views/layouts/nestive.html.erb

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= area :title, 'Nestive' %></title>
+  </head>
+  <body>
+    <%= yield %>
+    <div id="some-area">
+      <%= area :some_area do -%>
+        Some content
+      <%- end -%>
+    </div>
+    <div id="empty-area"><%= area :empty_area %></div>
+  </body>
+</html>

data/spec/internal/app/views/nestive/append.html.erb

@@ -0,0 +1,6 @@
+<h1>here we'll be appending to areas</h1>
+
+<% append :title, ' is awesome' %>
+<% append :some_area do %>
+ Another content
+<% end %>

data/spec/internal/app/views/nestive/extended_one.html.erb

@@ -0,0 +1 @@
+<p>extended: one</p>

data/spec/internal/app/views/nestive/extended_two.html.erb

@@ -0,0 +1 @@
+<p>extended: two</p>

data/spec/internal/app/views/nestive/index.html.erb

@@ -0,0 +1 @@
+<h1>Hello World</h1>

data/spec/internal/app/views/nestive/prepend.html.erb

@@ -0,0 +1,6 @@
+<h1>here we'll be prepending stuff to areas</h1>
+
+<% prepend :title, 'Awesome ' %>
+<% prepend :some_area do %>
+Prepended
+<% end %>

data/spec/internal/app/views/nestive/replace.html.erb

@@ -0,0 +1,7 @@
+<h1>replacing areas</h1>
+
+<% replace :title, 'Lolwut' %>
+
+<%= replace :some_area do %>
+  replaced
+<% end %>

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  match ':controller/:action'
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,2 @@
+# ActiveRecord::Schema.define do
+# end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'bundler/setup'
+require 'rails'
+require 'combustion'
+
+require File.expand_path('../../lib/nestive', __FILE__)
+
+Combustion.initialize! :action_controller
+
+require 'rspec/rails'

metadata

@@ -1,49 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nestive
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Justin French
+- Pavel Pravosud
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-30 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-10 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: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 description: A Rails plugin/gem for awesome nested templates and layouts
-email: 
+email:
 - justin@indent.com.au
+- pavel@pravosud.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - Gemfile.lock
@@ -51,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - app/helpers/nestive/layout_helper.rb
+- config.ru
 - init.rb
 - install.rb
 - lib/nestive.rb
@@ -58,43 +85,63 @@ files:
 - lib/nestive/railtie.rb
 - lib/nestive/version.rb
 - nestive.gemspec
-- test/nestive_test.rb
-- test/test_helper.rb
+- spec/controllers/nestive_spec.rb
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/nestive_controller.rb
+- spec/internal/app/views/layouts/extend_one.html.erb
+- spec/internal/app/views/layouts/extend_two.html.erb
+- spec/internal/app/views/layouts/nestive.html.erb
+- spec/internal/app/views/nestive/append.html.erb
+- spec/internal/app/views/nestive/extended_one.html.erb
+- spec/internal/app/views/nestive/extended_two.html.erb
+- spec/internal/app/views/nestive/index.html.erb
+- spec/internal/app/views/nestive/prepend.html.erb
+- spec/internal/app/views/nestive/replace.html.erb
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
+- spec/spec_helper.rb
 - uninstall.rb
-has_rdoc: true
-homepage: ""
+homepage: https://github.com/rwz/nestive
 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 
-      hash: 3
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nestive
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Rails plugin/gem for awesome nested templates and layouts
-test_files: 
-- test/nestive_test.rb
-- test/test_helper.rb
+test_files:
+- spec/controllers/nestive_spec.rb
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/nestive_controller.rb
+- spec/internal/app/views/layouts/extend_one.html.erb
+- spec/internal/app/views/layouts/extend_two.html.erb
+- spec/internal/app/views/layouts/nestive.html.erb
+- spec/internal/app/views/nestive/append.html.erb
+- spec/internal/app/views/nestive/extended_one.html.erb
+- spec/internal/app/views/nestive/extended_two.html.erb
+- spec/internal/app/views/nestive/index.html.erb
+- spec/internal/app/views/nestive/prepend.html.erb
+- spec/internal/app/views/nestive/replace.html.erb
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
+- spec/spec_helper.rb

data/test/nestive_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class NestiveTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end

data/test/test_helper.rb

@@ -1,3 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_support'