nestive 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    nestive (0.1.0)
-      rails (~> 3.0)
+    nestive (0.2.0)
+      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       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)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
-    combustion (0.3.2)
+    combustion (0.3.3)
       rails (>= 3.0.0)
       thor (>= 0.14.6)
     diff-lcs (1.1.3)
@@ -44,57 +44,56 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     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)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec-mocks (2.12.2)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
-    sprockets (2.1.3)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
@@ -105,6 +104,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  combustion (~> 0.3.2)
+  combustion (~> 0.3.3)
   nestive!
-  rspec-rails (~> 2.11)
+  rspec-rails (~> 2.12)

data/README.md

@@ -16,15 +16,19 @@ Nestive is *better* because it addresses these problems.
 
 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 %>
+``` erb
+<%= 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" %>
+``` erb
+<%= area :sidebar, "Some Content Here" %>
 
-    <%= area :sidebar do %>
-      Some Content Here
-    <% end %>
+<%= 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).
 
@@ -32,147 +36,175 @@ It's important to note that this isn't *default* content, it *is* the content (u
 
 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 %>
-        More content.
-      <% end %>
-    <% end %>
+``` erb
+<%= extends :application do %>
+  <% append :sidebar, "More content." %>
+  <% append :sidebar do %>
+    More content.
+  <% end %>
+<% end %>
+```
 
 ### Prepending content to an area:
 
 Exactly what you think it is. The reverse of `append` (duh), adding the new content at the start of any content previously provided by parent layouts:
 
-    <%= extends :application do %>
-      <%= prepend :sidebar, "Content." %>
-      <%= prepend :sidebar do %>
-        Content.
-      <% end %>
-    <% end %>
+``` erb
+<%= extends :application do %>
+  <%= prepend :sidebar, "Content." %>
+  <%= prepend :sidebar do %>
+    Content.
+  <% end %>
+<% end %>
+```
 
 ### Replacing content
 
 You can also replace any content provided by parent layouts:
 
-    <%= extends :application do %>
-      <%= replace :sidebar, "New content." %>
-      <%= replace :sidebar do %>
-        New content.
-      <% end %>
-    <% end %>
+``` erb
+<%= extends :application do %>
+  <%= replace :sidebar, "New content." %>
+  <%= replace :sidebar do %>
+    New content.
+  <% 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 %>
+``` 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 %>
+`app/views/layouts/application.html.erb`:
 
-      <% append :head do %>
-        <%= javascript_include_tag 'fancy_blog_archive_tag_cloud' %>
+``` erb
+<!DOCTYPE html>
+  <html>
+    <head>
+      <%= area :head do %>
+        <title><%= area :title, 'Nestive' %></title>
       <% end %>
-
-      <%= yield %>
-    <% end %>
-
-
+    </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
+```
+
+`app/views/layouts/with_sidebar.html.erb`:
+
+``` erb
+<%= extends :application do %>
+  <div class="sidebar"><%= area(:sidebar) do %>
+    here goes sidebar
+  <% end %></div>
+  <%= yield -%>
+<% end %>
+```
+
+`app/views/layouts/blog_posts.html.erb`:
+
+``` 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.
 
-    # app/views/layouts/application.html.erb
-    <!DOCTYPE html>
-    <html>
-    <head>
-      <meta charset="utf-8">
-      <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>
-    <body>
-      <div id="wrapper">
-        <div id="content">
-          <%= area :content do %>
-            <p>Default content goes here.</p>
-          <% end %>
-        </div>
-        <div id="sidebar">
-          <%= area :sidebar do %>
-            <h2>About Me</h2>
-            <p>...</p>
-          <% end %>
-        </div>
-      </div>
-      <%= yield %>
-    </body>
-    </html>
+`app/views/layouts/application.html.erb`:
+
+``` erb
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <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>
+<body>
+  <div id="wrapper">
+    <div id="content">
+      <%= area :content do %>
+        <p>Default content goes here.</p>
+      <% end %>
+    </div>
+    <div id="sidebar">
+      <%= area :sidebar do %>
+        <h2>About Me</h2>
+        <p>...</p>
+      <% 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 %>
+`app/views/layouts/blog.html.erb`:
+
+``` 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 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
-    <% replace :content do %>
-      <h1>My Blog</h1>
-      <%= render @articles %>
-    <% end %>
 
-    <% append :sidebar do %>
-      <h2>Blog Roll</h2>
-      <%= render @links %>
-    <% end %>
+`app/views/posts/index.html.erb`:
+
+``` erb
+<% replace :content do %>
+  <h1>My Blog</h1>
+  <%= render @articles %>
+<% end %>
+
+<% append :sidebar do %>
+  <h2>Blog Roll</h2>
+  <%= render @links %>
+<% end %>
+```
 
 We also need to instruct the `PostsController` to use this `blog` layout:
 
-    # app/controllers/posts_controller.rb
-    class PostsController < ApplicationController
-      layout 'blog'
-    end
+`app/controllers/posts_controller.rb`:
+
+``` ruby
+class PostsController < ApplicationController
+  layout 'blog'
+end
+```
 
 
 ## Installation
 
-* add `gem 'nestive', '~> 0.2'` to your gemfile
+* add `gem 'nestive', '~> 0.2'` to your Gemfile
 * run `bundle`
 
 ## Compatibility

data/lib/nestive/version.rb

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

data/nestive.gemspec

@@ -19,8 +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'
-  s.add_development_dependency 'combustion', '~> 0.3.2'
-  s.add_development_dependency 'rspec-rails', '~> 2.11'
+  s.add_dependency 'rails', '>= 3.0.0'
+  s.add_development_dependency 'combustion', '~> 0.3.3'
+  s.add_development_dependency 'rspec-rails', '~> 2.12'
 
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: nestive
 version: !ruby/object:Gem::Version
-  version: 0.2.0
   prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Justin French
@@ -10,56 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    none: false
+  type: :runtime
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: 3.0.0
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
+        version: 0.3.3
+    none: false
+  type: :development
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :development
+        version: 0.3.3
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
+        version: '2.12'
+    none: false
+  type: :development
   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
+        version: '2.12'
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
 description: A Rails plugin/gem for awesome nested templates and layouts
 email:
 - justin@indent.com.au
@@ -110,20 +110,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: nestive
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A Rails plugin/gem for awesome nested templates and layouts
@@ -145,3 +145,4 @@ test_files:
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
 - spec/spec_helper.rb
+has_rdoc: