nestive 0.2.1 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjQyMmRkZWQ4OTUzODczYmQ3ZmRjYWI5MDZkODYzNDY5MGViNTcyMg==
+  data.tar.gz: !binary |-
+    MTcxOWVjYjA0M2M3NjZmZDUyYWY4NWRiOTc5MjRlMjVlNDZlZDljNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWFlMzM1ODY2MGE1YjQzZTM3ZjdhYTRmMzhlMTFiZWQ0OTkxNGZlOTQwNGM3
+    NGRlNzUzYTI4NGEzZjUzNDRhNjUwMjlkZjM0OTU1ZTJiYzYyNWQxZjI5YzJk
+    NjM1MjI4MzRlNjk5MWU0Mzc2NmUyOWM3MTUyMjU0YzhiYWE0M2Y=
+  data.tar.gz: !binary |-
+    ZDA3NGRlZGZjODc5ZGNjODMwYTIwZGU1NjMyMTY5YzMwY2ZhYzE5YzYxYjJj
+    YWIyYzdhYjE1ODY3MzY4NGNjYTIzMjM2ZDBlZGMwMGIwYzNkMzRhYzVkZDk3
+    NDA0OTgyNzUzNTllMDJlNzA2OTFkY2I2NzBiMmZlZjZlMDUwMTE=

data/.gitignore

@@ -1,4 +1,5 @@
 .rvmrc
 doc
 .yardoc
-pkg
+pkg
+Gemfile.lock

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7

data/Gemfile

@@ -1,4 +1,9 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify dependencies in nestive.gemspec
 gemspec
+
+group :test do
+  gem 'combustion', '~> 0.4.0'
+  gem 'rspec-rails', '~> 2.13'
+end

data/README.md

@@ -1,6 +1,5 @@
-# Nestive
-[![Build Status](https://travis-ci.org/rwz/nestive.png)](https://travis-ci.org/rwz/nestive)
-## A Nested Inheritable Layouts Plugin for Rails
+# Nestive [![Build Status](https://travis-ci.org/rwz/nestive.png)](https://travis-ci.org/rwz/nestive) [![Code Climate](https://codeclimate.com/github/rwz/nestive.png)](https://codeclimate.com/github/rwz/nestive)
+## A Nested Inheritable Layouts Helpers for Rails
 
 
 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:
@@ -10,9 +9,9 @@ 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`, `extends`, `append`, `prepend`, `replace`.
+## Just six methods (so far)
 
-### Declaring an area of content in your parent layout with `area`:
+### Declaring an area of content 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:
 
@@ -32,7 +31,7 @@ Unlike `yield`, `area` will allow your parent layouts to add content to the area
 
 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:
+### Appending content to an area with `append`:
 
 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:
 
@@ -45,7 +44,7 @@ The implementation details are quite different, but the `append` helper works mu
 <% end %>
 ```
 
-### Prepending content to an area:
+### Prepending content to an area with `prepend`:
 
 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:
 
@@ -58,7 +57,7 @@ Exactly what you think it is. The reverse of `append` (duh), adding the new cont
 <% end %>
 ```
 
-### Replacing content
+### Replacing content with `replace`
 
 You can also replace any content provided by parent layouts:
 
@@ -71,7 +70,21 @@ You can also replace any content provided by parent layouts:
 <% end %>
 ```
 
-### Extending a layout in a child layout (or view):
+### Removing content with `purge`
+
+You can remove the content of the area:
+
+``` erb
+<% purge :sidebar %>
+```
+
+... which is equal to:
+
+``` erb
+<% replace :sidebar, nil %>
+```
+
+### Extending a layout in a child layout (or view) with `extends`
 
 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`:
 
@@ -204,7 +217,7 @@ end
 
 ## Installation
 
-* add `gem 'nestive', '~> 0.2'` to your Gemfile
+* add `gem 'nestive', '~> 0.4'` to your Gemfile
 * run `bundle`
 
 ## Compatibility

data/app/helpers/nestive/layout_helper.rb

@@ -54,8 +54,8 @@ module Nestive
 
     # Declares that the current layour (or view) is inheriting from and extending another layout.
     #
-    # @param [Symbol] name
-    #   The base name of the file in `layouts/` that you wish to extend (eg `:application` for `layouts/application.html.erb`)
+    # @param [String] layout
+    #   The base name of the file in `layouts/` that you wish to extend (eg `application` for `layouts/application.html.erb`)
     #
     # @example Extending the `application` layout to create an `admin` layout
     #
@@ -86,7 +86,7 @@ module Nestive
       layout = layout.to_s
 
       # If there's no directory component, presume a plain layout name
-      layout = layout.include?('/') ? layout : "layouts/#{layout}"
+      layout = "layouts/#{layout}" unless layout.include?('/')
 
       # Capture the content to be placed inside the extended layout
       content_for(:layout).replace capture(&block)
@@ -126,13 +126,8 @@ module Nestive
     #   An optional String of content to add to the area as you declare it.
     def area(name, content=nil, &block)
       content = capture(&block) if block_given?
-      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)
+      append name, content
+      render_area name
     end
 
     # Appends content to an area previously defined or modified in parent layout(s). You can provide
@@ -153,8 +148,7 @@ module Nestive
     #   Optionally provide a String of content, instead of a block. A block will take precedence.
     def append(name, content=nil, &block)
       content = capture(&block) if block_given?
-      add_instruction_to_area(name, :push, content)
-      nil
+      add_instruction_to_area name, :push, content
     end
 
     # Prepends content to an area previously declared or modified in parent layout(s). You can
@@ -175,17 +169,16 @@ module Nestive
     #   Optionally provide a String of content, instead of a block. A block will take precedence.
     def prepend(name, content=nil, &block)
       content = capture(&block) if block_given?
-      add_instruction_to_area(name, :unshift, content)
-      nil
+      add_instruction_to_area name, :unshift, content
     end
 
     # 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
+    # @example Replacing content with a String
     #     <% replace :sidebar, "New content." %>
     #
-    # @example Prepending content with a block:
+    # @example Replacing content with a block:
     #     <% replace :sidebar do %>
     #       New content.
     #     <% end %>
@@ -197,8 +190,18 @@ module Nestive
     #   Optionally provide a String of content, instead of a block. A block will take precedence.
     def replace(name, content=nil, &block)
       content = capture(&block) if block_given?
-      add_instruction_to_area(name, :replace, [content])
-      nil
+      add_instruction_to_area name, :replace, [content]
+    end
+
+    # Purge the content of an area previously declared or modified in parent layout(s).
+    #
+    # @example Purge content
+    #     <% purge :sidebar %>
+    #
+    # @param [Symbol] name
+    #   A name to identify the area of content you wish to purge
+    def purge(name)
+      replace name, nil
     end
 
     private
@@ -221,6 +224,7 @@ module Nestive
       @_area_for ||= {}
       @_area_for[name] ||= []
       @_area_for[name] << [instruction, value]
+      nil
     end
 
     # Take the instructions we've gathered for the area and replay them one after the other on
@@ -232,11 +236,11 @@ module Nestive
     #
     # @todo is `html_safe` "safe" here?
     def render_area(name)
-      output = []
-      (@_area_for[name] || []).reverse.each do |i|
-        output.send(i.first, i.last)
-      end
-      output.join.html_safe
+      [].tap do |output|
+        @_area_for.fetch(name, []).reverse_each do |i|
+          output.send i.first, i.last
+        end
+      end.join.html_safe
     end
 
   end

data/lib/nestive/version.rb

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

data/nestive.gemspec

@@ -3,16 +3,16 @@ $:.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', '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.name          = 'nestive'
+  s.version       = Nestive::VERSION
+  s.platform      = Gem::Platform::RUBY
+  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 gem for awesome nested templates and layouts'
+  s.description   = 'A Rails plugin/gem for awesome nested templates and layouts'
+  s.licenses      = ['MIT']
 
-  s.rubyforge_project = 'nestive'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -20,7 +20,4 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'rails', '>= 3.0.0'
-  s.add_development_dependency 'combustion', '~> 0.3.3'
-  s.add_development_dependency 'rspec-rails', '~> 2.12'
-
 end

data/spec/controllers/nestive_spec.rb

@@ -55,7 +55,14 @@ describe NestiveController do
       assert_select '#some-area', 'replaced'
     end
   end
-  
+
+  context '#purge' do
+    it 'purge area content' do
+      get :purge
+      assert_select 'title'
+    end
+  end
+
   context '#extends' do
     it 'extends layouts' do
       get :extended_one

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

@@ -0,0 +1,3 @@
+<h1>purge area</h1>
+
+<% purge :title %>

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestive
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin French
@@ -10,56 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
+  name: rails
   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
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-    none: false
-  type: :development
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.3
-    none: false
-- !ruby/object:Gem::Dependency
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-    none: false
-  type: :development
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
-    none: false
+  type: :runtime
 description: A Rails plugin/gem for awesome nested templates and layouts
 email:
 - justin@indent.com.au
@@ -72,14 +37,11 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
 - app/helpers/nestive/layout_helper.rb
 - config.ru
-- init.rb
-- install.rb
 - lib/nestive.rb
 - lib/nestive/engine.rb
 - lib/nestive/railtie.rb
@@ -96,15 +58,17 @@ files:
 - 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/purge.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
 homepage: https://github.com/rwz/nestive
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -114,19 +78,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  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.25
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: A Rails plugin/gem for awesome nested templates and layouts
+specification_version: 4
+summary: A Rails gem for awesome nested templates and layouts
 test_files:
 - spec/controllers/nestive_spec.rb
 - spec/internal/app/controllers/application_controller.rb
@@ -139,6 +101,7 @@ test_files:
 - 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/purge.html.erb
 - spec/internal/app/views/nestive/replace.html.erb
 - spec/internal/config/routes.rb
 - spec/internal/db/schema.rb

data/Gemfile.lock

@@ -1,109 +0,0 @@
-PATH
-  remote: .
-  specs:
-    nestive (0.2.0)
-      rails (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.11)
-      actionpack (= 3.2.11)
-      mail (~> 2.4.4)
-    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.2.1)
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    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.3)
-      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.6)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    polyglot (0.3.3)
-    rack (1.4.4)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    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.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 (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    rspec-rails (2.12.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      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.17.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  combustion (~> 0.3.3)
-  nestive!
-  rspec-rails (~> 2.12)

data/init.rb

@@ -1 +0,0 @@
-# Include hook code here

data/install.rb

@@ -1 +0,0 @@
-# Install hook code here

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here