nestive_rendering 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 099ff10f13d97d6e59b72959b44445ebc9919d52
-  data.tar.gz: d3c8a453d1c30dfb6131f50ef7e51b7cf5735fde
+  metadata.gz: 718534e775cc27b0f914e6b819276fce7dafbe56
+  data.tar.gz: c6b5768099cf80e2764e4a09878918a93117628d
 SHA512:
-  metadata.gz: 463152fc1c35aac30f7d01b57495ce50315d5a0394056563c7799c31022353da41445a38bed1fc04e0489a3a8ce6755c6537691fa50bde160cecaefe0e5883b7
-  data.tar.gz: ed95fd4b280fecbd6721834bb2340f2c3db1dd8446a2b73fcd2fe464fdd0e69abefc4a15cc504f036b27388ec6b28e03c2a07bc2c37e1d5886f8349e7da89032
+  metadata.gz: 640c89dd1a849726813a2ce130e00de66ff922dbedbd83e5d27d2a3fd7be1bc7ce1baa9908a9c3b1b6c9a153243dbcf13d181f1b75c49a866bee9b9fde493755
+  data.tar.gz: 88e85dfd59fcb844dd63741ef96ae39cf7cd7786739e4909b9681f2b3f3abec5143b9c39cdff3d8303a4ee04dc8d559412890117d160b723d573cdceb556dc17

data/lib/nestive_rendering/layout_helper.rb

@@ -142,7 +142,7 @@ module NestiveRendering
     # @param [String] content
     #   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?
+      content = -> { capture(&block) } if block_given?
       append name, content
       render_area name
     end
@@ -164,7 +164,7 @@ module NestiveRendering
     # @param [String] content
     #   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?
+      content = -> { capture(&block) } if block_given?
       add_instruction_to_area name, :push, content
     end
 
@@ -185,7 +185,7 @@ module NestiveRendering
     # @param [String] content
     #   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?
+      content = -> { capture(&block) } if block_given?
       add_instruction_to_area name, :unshift, content
     end
 
@@ -206,7 +206,7 @@ module NestiveRendering
     # @param [String] content
     #   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?
+      content = -> { capture(&block) } if block_given?
       add_instruction_to_area name, :replace, [content]
     end
 
@@ -255,6 +255,8 @@ module NestiveRendering
         @_area_for.fetch(name, []).reverse_each do |method_name, content|
           output.public_send method_name, content
         end
+      end.map do |content|
+        content.respond_to?(:call) ?  content.call : content
       end.join.html_safe
     end
 

data/lib/nestive_rendering/version.rb

@@ -1,3 +1,3 @@
 module NestiveRendering
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/controllers/nestive_spec.rb

@@ -54,6 +54,12 @@ describe NestiveController do
       get :replace
       assert_select '#some-area', 'replaced'
     end
+
+    it 'does not call the original/replaced area' do
+      expect(DummyClass).not_to receive(:content)
+      get :replace
+      assert_select '#another-area', 'replaced content'
+    end
   end
 
   context '#purge' do

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

@@ -15,3 +15,9 @@ class NestiveController < ApplicationController
     render layout: 'locals'
   end
 end
+
+class DummyClass
+  def self.content
+    'dummy content'
+  end
+end

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

@@ -10,6 +10,12 @@
         Some content
       <%- end -%>
     </div>
+
+    <div id="another-area">
+      <%= area :area_to_be_replaced do -%>
+        <%= DummyClass.content %>
+      <%- end -%>
+    </div>
     <div id="empty-area"><%= area :empty_area %></div>
   </body>
 </html>

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

@@ -4,4 +4,9 @@
 
 <%= replace :some_area do %>
   replaced
-<% end %>
+<% end %>
+
+<%= replace :area_to_be_replaced do %>
+  replaced content
+<% end %>
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nestive_rendering
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin French
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,7 +66,6 @@ files:
 - spec/internal/app/views/nestive/purge_single.html.erb
 - spec/internal/app/views/nestive/replace.html.erb
 - spec/internal/config/routes.rb
-- spec/internal/log/test.log
 - spec/spec_helper.rb
 homepage: https://github.com/mdeering/nestive_rendering
 licenses:
@@ -88,35 +87,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A Rails gem for awesome nested templates, layouts and paritals
 test_files:
-- spec/spec_helper.rb
-- spec/controllers/nestive_spec.rb
 - spec/internal/config/routes.rb
-- spec/internal/app/controllers/nestive_controller.rb
-- spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/views/nestive/_features.html.erb
-- spec/internal/app/views/nestive/extended_partial_options.html.haml
+- spec/internal/app/views/nestive/purge_single.html.erb
+- spec/internal/app/views/nestive/extended_two.html.erb
+- spec/internal/app/views/nestive/prepend.html.erb
 - spec/internal/app/views/nestive/replace.html.erb
-- spec/internal/app/views/nestive/extended_one.html.erb
+- spec/internal/app/views/nestive/locals.html.erb
 - spec/internal/app/views/nestive/_features_options.html.erb
-- spec/internal/app/views/nestive/extended_partial.html.erb
+- spec/internal/app/views/nestive/extended_one.html.erb
 - spec/internal/app/views/nestive/extended_three.html.erb
-- spec/internal/app/views/nestive/_extended_features_options.html.haml
-- spec/internal/app/views/nestive/prepend.html.erb
-- spec/internal/app/views/nestive/index.html.erb
-- spec/internal/app/views/nestive/purge_single.html.erb
-- spec/internal/app/views/nestive/locals.html.erb
+- spec/internal/app/views/nestive/extended_partial.html.erb
 - spec/internal/app/views/nestive/purge_multiple.html.erb
+- spec/internal/app/views/nestive/index.html.erb
 - spec/internal/app/views/nestive/_extended_features.html.erb
-- spec/internal/app/views/nestive/extended_two.html.erb
 - spec/internal/app/views/nestive/append.html.erb
+- spec/internal/app/views/nestive/extended_partial_options.html.haml
+- spec/internal/app/views/nestive/_extended_features_options.html.haml
 - spec/internal/app/views/layouts/nestive.html.erb
+- spec/internal/app/views/layouts/extend_two.html.erb
 - spec/internal/app/views/layouts/needs_options.html.erb
 - spec/internal/app/views/layouts/locals.html.erb
 - spec/internal/app/views/layouts/extend_one.html.erb
-- spec/internal/app/views/layouts/extend_two.html.erb
-- spec/internal/log/test.log
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/nestive_controller.rb
+- spec/controllers/nestive_spec.rb
+- spec/spec_helper.rb

data/spec/internal/log/test.log

@@ -1,43 +0,0 @@
-Processing by NestiveController#index as HTML
-  Rendered nestive/index.html.erb within layouts/nestive (0.6ms)
-Completed 200 OK in 3.6ms (Views: 3.5ms)
-Processing by NestiveController#index as HTML
-Completed 200 OK in 0.3ms (Views: 0.2ms)
-Processing by NestiveController#index as HTML
-Completed 200 OK in 0.2ms (Views: 0.2ms)
-Processing by NestiveController#append as HTML
-Completed 200 OK in 0.8ms (Views: 0.7ms)
-Processing by NestiveController#append as HTML
-Completed 200 OK in 0.3ms (Views: 0.2ms)
-Processing by NestiveController#prepend as HTML
-Completed 200 OK in 0.7ms (Views: 0.6ms)
-Processing by NestiveController#prepend as HTML
-Completed 200 OK in 0.2ms (Views: 0.2ms)
-Processing by NestiveController#replace as HTML
-Completed 200 OK in 0.8ms (Views: 0.7ms)
-Processing by NestiveController#replace as HTML
-Completed 200 OK in 0.2ms (Views: 0.2ms)
-Processing by NestiveController#purge_single as HTML
-Completed 200 OK in 0.7ms (Views: 0.6ms)
-Processing by NestiveController#purge_multiple as HTML
-Completed 200 OK in 0.9ms (Views: 0.7ms)
-Processing by NestiveController#extended_one as HTML
-Completed 200 OK in 1.2ms (Views: 1.1ms)
-Processing by NestiveController#extended_two as HTML
-Completed 200 OK in 1.2ms (Views: 1.1ms)
-Processing by NestiveController#extended_three as HTML
-Completed 200 OK in 1.1ms (Views: 0.9ms)
-Processing by NestiveController#locals as HTML
-Completed 200 OK in 1.7ms (Views: 1.6ms)
-Processing by NestiveController#extended_partial as HTML
-  Rendered nestive/_features.html.erb (0.3ms)
-  Rendered nestive/_extended_features.html.erb (1.0ms)
-Completed 200 OK in 3.1ms (Views: 3.0ms)
-Processing by NestiveController#extended_partial_options as HTML
-  Rendered nestive/_features_options.html.erb (0.4ms)
-  Rendered nestive/_extended_features_options.html.haml (1.5ms)
-Completed 200 OK in 3.0ms (Views: 2.9ms)
-Processing by NestiveController#extended_partial_options as HTML
-  Rendered nestive/_features_options.html.erb (0.1ms)
-  Rendered nestive/_extended_features_options.html.haml (0.3ms)
-Completed 200 OK in 0.7ms (Views: 0.7ms)