deas-erbtags 0.4.2 → 0.5.0

data/README.md

@@ -64,7 +64,7 @@ template_helpers(Deas::ErbTags::Capture)
 
 The `capture_render` method is used to make Deas template `render` calls with nested erb markup.  It calls `render` with the given args, and captures its output.  Call it just as you would `render`, just invoke the call using `<% ... %>`.
 
-### `capture_render`
+### `capture_partial`
 
 ```ruby
 template_helpers(Deas::ErbTags::Capture)

data/deas-tags.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert")
+  gem.add_dependency("deas", ["~> 0.23"])
+
+  gem.add_development_dependency("assert", ["~> 2.3"])
 
 end

data/lib/deas-erbtags/capture.rb

@@ -17,18 +17,17 @@ module Deas::ErbTags
         instance_variable_get(self.erb_outvar_name)
       end
 
-      def capture(content)
+      def erb_write(content)
         self.erb_outvar << "#{content}\n"
       end
 
-      def capture_tag(name, *args, &content)
-        opts = args.last.kind_of?(::Hash) ? args.pop : {}
+      def capture(&content)
         outvar = self.erb_outvar_name
-        captured_content = begin
+        begin
           orig_outvar = self.erb_outvar
           instance_variable_set(outvar, "\n")
 
-          result = instance_eval(&content) if !content.nil?
+          result = instance_eval(&(content || Proc.new {}))
 
           if instance_variable_get(outvar) == "\n"
             "\n#{result}"
@@ -38,16 +37,19 @@ module Deas::ErbTags
         ensure
           instance_variable_set(outvar, orig_outvar)
         end
+      end
 
-        self.capture tag(name, "#{captured_content}\n", opts)
+      def capture_tag(name, *args, &content)
+        opts = args.last.kind_of?(::Hash) ? args.pop : {}
+        self.erb_write tag(name, "#{capture(&content)}\n", opts)
       end
 
-      def capture_render(*args, &block)
-        self.capture self.render(*args, &block)
+      def capture_render(*args, &content)
+        self.erb_write self.render(*args, &Proc.new{ capture(&content) })
       end
 
-      def capture_partial(*args, &block)
-        self.capture self.partial(*args, &block)
+      def capture_partial(*args, &content)
+        self.erb_write self.partial(*args, &Proc.new{ capture(&content) })
       end
 
     end

data/lib/deas-erbtags/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::ErbTags
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/test/support/factory.rb

@@ -23,11 +23,13 @@ module Factory
       end
 
       def render(*args, &block)
-        [args, block].inspect
+        cap_content = "#{(block || Proc.new {}).call}"
+        RenderArgs.new(args, cap_content).inspect
       end
 
       def partial(*args, &block)
-        [args, block].inspect
+        cap_content = "#{(block || Proc.new {}).call}"
+        RenderArgs.new(args, cap_content).inspect
       end
 
     end
@@ -39,4 +41,6 @@ module Factory
     Deas::ErbTags::Utils.html_attrs(opts)
   end
 
+  RenderArgs = Struct.new(:args, :captured_content)
+
 end

data/test/unit/capture_tests.rb

@@ -4,14 +4,14 @@ require 'deas-erbtags/capture'
 
 module Deas::ErbTags::Capture
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "the `Capture` module"
     setup do
       @template = Factory.template(Deas::ErbTags::Capture)
     end
     subject{ @template }
 
-    should have_imeths :erb_outvar_name, :erb_outvar
+    should have_imeths :erb_outvar_name, :erb_outvar, :erb_write
     should have_imeths :capture, :capture_tag, :capture_render, :capture_partial
 
     should "include the `Tag` module" do
@@ -20,7 +20,7 @@ module Deas::ErbTags::Capture
 
   end
 
-  class CaptureTagTests < BaseTests
+  class CaptureTagTests < UnitTests
 
     should "create content by capturing content from a given block" do
       div_div = subject.tag(:div, "\n#{subject.tag(:div, "\ninner\n")}\n\n", {
@@ -51,28 +51,32 @@ module Deas::ErbTags::Capture
 
   end
 
-  class CaptureRenderTests < BaseTests
+  class CaptureRenderTests < UnitTests
 
     should "capture output from Deas' template `render` call" do
-      exp_output = "#{subject.render('something')}\n"
       assert_empty subject._out_buf
 
-      cap_output = subject.capture_render('something')
-      assert_equal exp_output, cap_output
-      assert_equal exp_output, subject._out_buf
+      content = Proc.new{ '_some_content_' }
+      exp_out = "#{subject.render('something', &Proc.new{ subject.capture(&content) })}\n"
+      cap_out = subject.capture_render('something') { '_some_content_' }
+
+      assert_equal exp_out, cap_out
+      assert_equal exp_out, subject._out_buf
     end
 
   end
 
-  class CapturePartialTests < BaseTests
+  class CapturePartialTests < UnitTests
 
     should "capture output from Deas' template `partial` call" do
-      exp_output = "#{subject.partial('something')}\n"
       assert_empty subject._out_buf
 
-      cap_output = subject.capture_partial('something')
-      assert_equal exp_output, cap_output
-      assert_equal exp_output, subject._out_buf
+      content = Proc.new{ }
+      exp_out = "#{subject.partial('something', &Proc.new{ subject.capture(&content) })}\n"
+      cap_out = subject.capture_partial('something')
+
+      assert_equal exp_out, cap_out
+      assert_equal exp_out, subject._out_buf
     end
 
   end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,22 +16,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-28 00:00:00 Z
+date: 2013-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: assert
+  name: deas
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 37
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 23
+        version: "0.23"
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: assert
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  type: :development
+  version_requirements: *id002
 description: Deas template helpers for creating HTML tags using Erb.
 email: 
 - kelly@kellyredding.com