express_templates 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3c10e4c45bfe51e0e1c5cd04c6bd0215e0d09dd
-  data.tar.gz: a788a2153dc72e22d889f0d1f8101a4449fea6d1
+  metadata.gz: 07e430ee29720a9e7a29b668bdafdb09eaa997cc
+  data.tar.gz: 1002363331e515438fc97bebf78918d4beaca39d
 SHA512:
-  metadata.gz: b57148d71a0ca84f898b7711283bb50ac2dc25215b2c0c05f612b63875057e0578838f06c92027f463700d7a6341cc4ef4a837d43b394d6d6287e07b0f791b53
-  data.tar.gz: c95398d9d2248738b56b4886a8b649b300d2a93077329eca1d91e0d670af0c8ca3ceaa7dac0afbbd97b6cfeb640380aca5f154f2adc413b7c0d38460afd21134
+  metadata.gz: 1d80b5b553bb5f14693789a7d6d129c7930ecd585af21ffadb5bf5793db6a2f82e5d9f6c0f8dc7da1a6ceb87df0d6e747d879287da1e3a5c2050105ed105169b
+  data.tar.gz: 81021e19f25c8b01bf185f3a92e39d1f89c50a001c0e37c7fcade904a862038dbce3803d5d169a990abf9001111c34b47bf27e06ab51f2786608311ee6e72ccb

data/lib/express_templates/components/capabilities/parenting.rb

@@ -55,18 +55,25 @@ module ExpressTemplates
 
           def compile
             locals = (expand_locals rescue nil).inspect
-            compiled_children = nil
             args = %w(self)
             args << locals
-            Indenter.for(:compile) do |indent, indent_with_newline|
-              compiled_children = children.map { |child| indent_with_newline + child.compile }.join("+")
-              compiled_children.gsub!('"+"', '') # avoid unnecessary string concatenation
-              args << compiled_children unless compiled_children.empty?
-            end
+            compiled_children = compile_children
+            args << compiled_children unless compiled_children.empty?
             closing_paren = compiled_children.empty? ? ')' : "\n#{Indenter.for(:compile)})"
             "#{self.class.to_s}.render_with_children(#{args.join(', ')}#{closing_paren}"
           end
 
+          def compile_children
+            compiled_children = nil
+            Indenter.for(:compile) do |indent, indent_with_newline|
+              compiled_children = children.map do |child|
+                indent_with_newline +
+                (child.compile rescue %Q("#{child}")) # Bare strings may be children
+              end.join("+")
+              compiled_children.gsub!('"+"', '') # avoid unnecessary string concatenation
+            end
+            return compiled_children
+          end
         end
       end
     end

data/lib/express_templates/components/content_for.rb

@@ -0,0 +1,36 @@
+module ExpressTemplates
+  module Components
+    # Provide a wrapper for the content_for helper which
+    # accepts a block of express template code.
+    #
+    # Example:
+    #
+    # ```ruby
+    # content_for(:header) {
+    #   h1 "Title"
+    # }
+    # ```
+    class ContentFor < Container
+      include Capabilities::Configurable
+      def compile
+        children_markup = compile_children
+        content_label = @args[0]
+        result = %Q|content_for(:#{content_label}|
+        if children_markup.empty?
+          if @args[1].kind_of?(String)
+            children_markup = @args[1]
+            # append children as argument
+            result << %Q|, "#{children_markup}".html_safe)|
+          else
+            # no markup specified - must be referencing the content
+            result << ")"
+          end
+        else
+          # append children in block form
+          result << %Q|) { (#{children_markup.gsub(/^\s+/, '')}).html_safe }|
+        end
+        %Q("\#\{#{result}\}")
+      end
+    end
+  end
+end

data/lib/express_templates/components.rb

@@ -9,3 +9,4 @@ require 'express_templates/components/container'
 require 'express_templates/components/row'
 require 'express_templates/components/column'
 require 'express_templates/components/form_rails_support'
+require 'express_templates/components/content_for'

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/components/content_for_test.rb

@@ -0,0 +1,60 @@
+require 'test_helper'
+
+class ContentForTest < ActiveSupport::TestCase
+
+  class Context
+    def content_for(label, markup=nil, &block)
+      @blocks ||= {}
+      if block || markup
+        @blocks[label] = block ? block.call : markup
+        nil
+      else
+        @blocks[label]
+      end
+    end
+  end
+
+  test "content_for accepts a block of express template" do
+    fragment = -> {
+      content_for(:whatever) { h1 'hello' }
+    }
+    context = Context.new
+    markup = ExpressTemplates.render(context, &fragment)
+    assert_equal %Q(<h1>hello</h1>), context.content_for(:whatever)
+  end
+
+  test "content_for accepts a second argument which contains markup" do
+    fragment = -> {
+      content_for :title, "Foo"
+    }
+    context = Context.new
+    markup = ExpressTemplates.render(context, &fragment)
+    assert_equal 'Foo', context.content_for(:title)
+  end
+
+  test "content_for without a body returns the markup" do
+    fragment = -> {
+      content_for :title
+    }
+    context = Context.new
+    context.content_for :title, "Foo"
+    markup = ExpressTemplates.render(context, &fragment)
+    assert_equal 'Foo', markup
+  end
+
+  test "content_for body is html_safe" do
+    arg_frag = -> {
+      content_for :title, "<h1>Foo</h1>"
+    }
+    context = Context.new
+    markup = ExpressTemplates.render(context, &arg_frag)
+    assert context.content_for(:title).html_safe?
+
+    block_frag = -> {
+      content_for(:title) { h1 "Foo" }
+    }
+    markup = ExpressTemplates.render(context, &block_frag)
+    assert context.content_for(:title).html_safe?
+  end
+
+end