deas-erbtags 0.2.0 → 0.3.0

data/README.md

@@ -26,6 +26,10 @@ end
 
 ## Methods
 
+```ruby
+template_helpers(Deas::ErbTags::Tag)
+```
+
 All helper methods are based off of the basic `tag` method.  Tag calls should be invoked with `<%= ... -%>`:
 
 ```erb
@@ -37,6 +41,10 @@ All helper methods are based off of the basic `tag` method.  Tag calls should be
 
 ### `capture_tag`
 
+```ruby
+template_helpers(Deas::ErbTags::Capture)
+```
+
 The `capture_tag` method is used to create tags with nested erb markup.  Like the `tag` method, it creates other tags with a similar API.  Unlike the `tag` method, it takes a block that contains nested markup and does not take content as an arg.  Capture tags should be invoked with the `<% ... %>`:
 
 ```erb
@@ -48,9 +56,27 @@ The `capture_tag` method is used to create tags with nested erb markup.  Like th
 
 **Note**: the convention is that if a tag method is called with a block, `capture_tag` will be used to generate the tag and it should be invoked with `<% ... %>`.
 
+### `capture_render`
+
+```ruby
+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`
+
+```ruby
+template_helpers(Deas::ErbTags::Capture)
+```
+
+The `capture_partial` method is used to make Deas template `partial` calls with nested erb markup.  It calls `partial` with the given args, and captures its output.  Call it just as you would `partial`, just invoke the call using `<% ... %>`.
+
 ### `link_to`
 
 ```ruby
+template_helpers(Deas::ErbTags::LinkTo)
+
 link_to "http://google.com"
   # => <a href="http://google.com">http://google.com</a>
 
@@ -64,6 +90,8 @@ link_to("http://google.com"){ tag(:span, 'google') }
 ### `mail_to`
 
 ```ruby
+template_helpers(Deas::ErbTags::MailTo)
+
 mail_to "me@domain.com"
   # => <a href="mailto:me@domain.com">me@domain.com</a>
 
@@ -77,6 +105,8 @@ mail_to "me@domain.com", :disabled => true
 ### `image_tag`
 
 ```ruby
+template_helpers(Deas::ErbTags::ImageTag)
+
 image_tag '/logo.jpg'  #  => <img src="/logo.jpg" />
 ```
 

data/lib/deas-erbtags.rb

@@ -2,7 +2,7 @@ require 'deas-erbtags/version'
 require 'deas-erbtags/utils'
 
 require 'deas-erbtags/tag'
-require 'deas-erbtags/capture_tag'
+require 'deas-erbtags/capture'
 require 'deas-erbtags/link_to'
 require 'deas-erbtags/mail_to'
 require 'deas-erbtags/image_tag'
@@ -14,7 +14,7 @@ module Deas::ErbTags
 
   def self.included(receiver)
     receiver.class_eval do
-      include Tag, CaptureTag, LinkTo, MailTo, ImageTag
+      include Tag, Capture, LinkTo, MailTo, ImageTag
     end
   end
 

data/lib/deas-erbtags/capture.rb

@@ -0,0 +1,56 @@
+require 'deas-erbtags/tag'
+
+module Deas::ErbTags
+  module Capture
+
+    def self.included(receiver)
+      receiver.class_eval{ include Tag, Methods }
+    end
+
+    module Methods
+
+      def erb_outvar_name
+        self.sinatra_call.settings.erb[:outvar]
+      end
+
+      def erb_outvar
+        instance_variable_get(self.erb_outvar_name)
+      end
+
+      def capture(content)
+        self.erb_outvar << "#{content}\n"
+      end
+
+      def capture_tag(name, *args, &content)
+        opts = args.last.kind_of?(::Hash) ? args.pop : {}
+        outvar = self.erb_outvar_name
+        captured_content = begin
+          orig_outvar = self.erb_outvar
+          instance_variable_set(outvar, "\n")
+
+          result = instance_eval(&content) if !content.nil?
+
+          if instance_variable_get(outvar) == "\n"
+            "\n#{result}"
+          else
+            instance_variable_get(outvar)
+          end
+        ensure
+          instance_variable_set(outvar, orig_outvar)
+        end
+
+        self.capture tag(name, "#{captured_content}\n", opts)
+      end
+
+      def capture_render(*args, &block)
+        self.capture self.render(*args, &block)
+      end
+
+      def capture_partial(*args, &block)
+        self.capture self.partial(*args, &block)
+      end
+
+    end
+
+  end
+end

data/lib/deas-erbtags/link_to.rb

@@ -1,11 +1,11 @@
 require 'deas-erbtags/tag'
-require 'deas-erbtags/capture_tag'
+require 'deas-erbtags/capture'
 
 module Deas::ErbTags
   module LinkTo
 
     def self.included(receiver)
-      receiver.class_eval{ include Tag, CaptureTag, Method }
+      receiver.class_eval{ include Tag, Capture, Method }
     end
 
     module Method

data/lib/deas-erbtags/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::ErbTags
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/support/factory.rb

@@ -21,6 +21,15 @@ module Factory
           })
         })
       end
+
+      def render(*args, &block)
+        [args, block].inspect
+      end
+
+      def partial(*args, &block)
+        [args, block].inspect
+      end
+
     end
 
     template_class.new

data/test/unit/capture_tests.rb

@@ -0,0 +1,80 @@
+require 'assert'
+require 'deas-erbtags/tag'
+require 'deas-erbtags/capture'
+
+module Deas::ErbTags::Capture
+
+  class BaseTests < 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 :capture, :capture_tag, :capture_render, :capture_partial
+
+    should "include the `Tag` module" do
+      assert_includes Deas::ErbTags::Tag, subject.class.included_modules
+    end
+
+  end
+
+  class CaptureTagTests < BaseTests
+
+    should "create content by capturing content from a given block" do
+      div_div = subject.tag(:div, "\n#{subject.tag(:div, "\ninner\n")}\n\n", {
+        :id => 'outer'
+      }) + "\n"
+      buf_content_div = subject.capture_tag(:div, :id => 'outer') do
+        capture_tag(:div){ 'inner' }
+      end
+
+      assert_equal div_div, buf_content_div
+    end
+
+    should "create content by returning content from a given block" do
+      div_div = subject.tag(:div, "\n#{subject.tag(:div, "inner")}\n", {
+        :id => 'outer'
+      }) + "\n"
+      returned_content_div = subject.capture_tag(:div, :id => 'outer') do
+        tag(:div, 'inner')
+      end
+
+      assert_equal div_div, returned_content_div
+    end
+
+    should "create empty tags if no block given" do
+      empty_div = subject.tag(:div, "\n\n", :id => 'outer') + "\n"
+      assert_equal empty_div, subject.capture_tag(:div, :id => 'outer')
+    end
+
+  end
+
+  class CaptureRenderTests < BaseTests
+
+    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
+    end
+
+  end
+
+  class CapturePartialTests < BaseTests
+
+    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
+    end
+
+  end
+
+end

data/test/unit/deas-erbtags_tests.rb

@@ -14,7 +14,7 @@ module Deas::ErbTags
 
     should "include all of the individual modules" do
       exp_modules = [
-        Tag, CaptureTag, LinkTo, MailTo, ImageTag
+        Tag, Capture, LinkTo, MailTo, ImageTag
       ]
 
       exp_modules.each do |m|

data/test/unit/link_to_tests.rb

@@ -1,6 +1,6 @@
 require 'assert'
 require 'deas-erbtags/tag'
-require 'deas-erbtags/capture_tag'
+require 'deas-erbtags/capture'
 require 'deas-erbtags/link_to'
 
 module Deas::ErbTags::LinkTo
@@ -18,8 +18,8 @@ module Deas::ErbTags::LinkTo
       assert_includes Deas::ErbTags::Tag, subject.class.included_modules
     end
 
-    should "include the `CaptureTag` module" do
-      assert_includes Deas::ErbTags::CaptureTag, subject.class.included_modules
+    should "include the `Capture` module" do
+      assert_includes Deas::ErbTags::Capture, subject.class.included_modules
     end
 
     should "create an anchor tag with no content or href" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas-erbtags
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -50,7 +50,7 @@ files:
 - Rakefile
 - deas-tags.gemspec
 - lib/deas-erbtags.rb
-- lib/deas-erbtags/capture_tag.rb
+- lib/deas-erbtags/capture.rb
 - lib/deas-erbtags/image_tag.rb
 - lib/deas-erbtags/link_to.rb
 - lib/deas-erbtags/mail_to.rb
@@ -60,7 +60,7 @@ files:
 - log/.gitkeep
 - test/helper.rb
 - test/support/factory.rb
-- test/unit/capture_tag_tests.rb
+- test/unit/capture_tests.rb
 - test/unit/deas-erbtags_tests.rb
 - test/unit/image_tag_tests.rb
 - test/unit/link_to_tests.rb
@@ -104,7 +104,7 @@ summary: Deas template helpers for creating HTML tags using Erb.
 test_files: 
 - test/helper.rb
 - test/support/factory.rb
-- test/unit/capture_tag_tests.rb
+- test/unit/capture_tests.rb
 - test/unit/deas-erbtags_tests.rb
 - test/unit/image_tag_tests.rb
 - test/unit/link_to_tests.rb

data/lib/deas-erbtags/capture_tag.rb

@@ -1,37 +0,0 @@
-require 'deas-erbtags/tag'
-
-module Deas::ErbTags
-  module CaptureTag
-
-    def self.included(receiver)
-      receiver.class_eval{ include Tag, Method }
-    end
-
-    module Method
-
-      def capture_tag(name, *args)
-        opts = args.last.kind_of?(::Hash) ? args.pop : {}
-        outvar = self.sinatra_call.settings.erb[:outvar]
-        captured_content = begin
-          orig_outvar = instance_variable_get(outvar)
-          instance_variable_set(outvar, "\n")
-
-          result = yield if block_given?
-
-          if instance_variable_get(outvar) == "\n"
-            "\n#{result}"
-          else
-            instance_variable_get(outvar)
-          end
-        ensure
-          instance_variable_set(outvar, orig_outvar)
-        end
-
-        tag_markup = tag(name, "#{captured_content}\n", opts)
-        instance_variable_get(outvar) << "#{tag_markup}\n"
-      end
-
-    end
-
-  end
-end

data/test/unit/capture_tag_tests.rb

@@ -1,49 +0,0 @@
-require 'assert'
-require 'deas-erbtags/tag'
-require 'deas-erbtags/capture_tag'
-
-module Deas::ErbTags::CaptureTag
-
-  class BaseTests < Assert::Context
-    desc "the `CaptureTag` module"
-    setup do
-      @template = Factory.template(Deas::ErbTags::CaptureTag)
-    end
-    subject{ @template }
-
-    should have_imeth :capture_tag
-
-    should "include the `Tag` module" do
-      assert_includes Deas::ErbTags::Tag, subject.class.included_modules
-    end
-
-    should "create content by capturing content from a given block" do
-      div_div = subject.tag(:div, "\n#{subject.tag(:div, "\ninner\n")}\n\n", {
-        :id => 'outer'
-      }) + "\n"
-      buf_content_div = subject.capture_tag(:div, :id => 'outer') do
-        subject.capture_tag(:div){ subject._out_buf << 'inner' }
-      end
-
-      assert_equal div_div, buf_content_div
-    end
-
-    should "create content by returning content from a given block" do
-      div_div = subject.tag(:div, "\n#{subject.tag(:div, "\ninner\n")}\n\n", {
-        :id => 'outer'
-      }) + "\n"
-      returned_content_div = subject.capture_tag(:div, :id => 'outer') do
-        subject.capture_tag(:div){ 'inner' }
-      end
-
-      assert_equal div_div, returned_content_div
-    end
-
-    should "create empty tags if no block given" do
-      empty_div = subject.tag(:div, "\n\n", :id => 'outer') + "\n"
-      assert_equal empty_div, subject.capture_tag(:div, :id => 'outer')
-    end
-
-  end
-
-end