express_templates 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e00189a36058717818d7a7c66638c0164fcef6
-  data.tar.gz: 559bf6b66e66bf2caacd9c7594a9227ed2208cee
+  metadata.gz: fa578b4bff63a2306c2281d561cf315fa245230c
+  data.tar.gz: e717b4ddb4f8d244ed21cd48a39c4613c98f3738
 SHA512:
-  metadata.gz: bfbbac386e1b3db30466f8517dc7c9a82f65ebce01c548357ba2754399f3808ef9601eb157cc78775fc67f571930f06dfc4da57ed7ee57e267b5624ad9a82b83
-  data.tar.gz: 20b4d748cb8780f9366ae4875f1795af827ce0db5b59c128d096a5cb47de38d7639bb90d55d53183ce4df2349341d68d52e6084f328e510090cc899ae706fb07
+  metadata.gz: 76620daed87fdd884e9ea2089858c76d7fb1bac437af8c8983bea28c904b718f98f63cab711ce41762d40a59e709eced84744a17431d6d56076c0fc45ae39337
+  data.tar.gz: f5f198c833e6afbb2dd92eda33deb1fe81f384947ccf5972f4dc11825d675a30e84105bfa010a978729ea15f8bda89e5161684309fbb087f26e8d3ce17b31016

data/lib/express_templates/compiler.rb

@@ -15,8 +15,8 @@ module ExpressTemplates
         Thread.current[:first_whitepace_removed] = nil if Thread.current[:first_whitepace_removed].eql?(0)
       end
 
-      return compiled.join("+").gsub('"+"', '').tap do |s|
-        puts("\n"+template.inspect+"\n"+s) if ENV['DEBUG'].eql?('true')
+      return Interpolator.transform(compiled.join("+").gsub('"+"', '')).tap do |s|
+        puts("\n"+template.inspect+"\nSource:\n#{template.try(:source)}\nInterpolated:\n#{s}\n") if ENV['DEBUG'].eql?('true')
       end
     end
 

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

@@ -54,7 +54,7 @@ module ExpressTemplates
             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
+                (child.respond_to?(:compile) ? child.compile : child.inspect) # Bare strings may be children
               end.join("+\n")
               compiled_children.gsub!('"+"', '') # avoid unnecessary string concatenation
             end

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

@@ -136,7 +136,7 @@ module ExpressTemplates
                   define_method(:#{name}) do |*args|
                     helper_args = %w(self)
                     helper_args += args.map(&:inspect)
-                    '\#\{#{self.to_s}._#{name}('+_interpolate(helper_args).join(', ')+')\}'
+                    '{{#{self.to_s}._#{name}('+_interpolate(helper_args).join(', ')+')}}'
                   end
 
                   # called during rendering in view context

data/lib/express_templates/components/content_for.rb

@@ -15,21 +15,23 @@ module ExpressTemplates
       def compile
         children_markup = compile_children
         content_label = @args[0]
-        result = %Q|content_for(:#{content_label}|
+        result = %Q|\ncontent_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)|
+            result << %Q|, "#{children_markup}".html_safe).to_s|
           else
             # no markup specified - must be referencing the content
-            result << ")"
+            result << ").to_s"
           end
         else
           # append children in block form
-          result << %Q|) { (#{children_markup.gsub(/^\s+/, '')}).html_safe }|
+          result << %Q|) {
+  (#{children_markup.gsub(/^\s+/, '')}).html_safe
+}.to_s|
         end
-        %Q("\#\{#{result}\}")
+        result
       end
     end
   end

data/lib/express_templates/interpolator.rb

@@ -0,0 +1,36 @@
+require 'parslet'
+
+module ExpressTemplates
+  class Interpolator < Parslet::Parser
+    rule(:lbrace)         { str('{{') }
+    rule(:rbrace)         { str('}}') }
+    rule(:delim)          { lbrace | rbrace }
+    rule(:lpart)          { (lbrace.absnt? >> any).repeat.as(:lpart) }
+    rule(:rpart)          { (rbrace.absnt? >> any).repeat.as(:rpart) }
+    rule(:expression)     { (text_with_interpolations).as(:expression) }
+    rule(:interpolation)  { (lbrace>>expression>>rbrace).as(:interpolation) }
+    rule(:text)           { (delim.absnt? >> any).repeat(1) }
+    rule(:text_with_interpolations) { (text.as(:text) | interpolation).repeat }
+    root(:text_with_interpolations)
+
+    def self.transform(s)
+      begin
+        Transformer.new.apply(new.parse(s)).flatten.join
+      rescue Parslet::ParseFailed => failure
+        puts s
+        puts failure.cause.ascii_tree
+        raise failure
+      end
+    end
+  end
+
+  class Transformer < Parslet::Transform
+    rule(:interpolation => simple(:expression)) {
+      '#{'+expression+'}'
+    }
+    rule(:expression => sequence(:exp))      do
+      exp.map(&:to_s).join.gsub('\\"', '"')
+    end
+    rule(:text => simple(:s)) { s.to_s }
+  end
+end

data/lib/express_templates/markup/tag.rb

@@ -24,8 +24,6 @@ module ExpressTemplates
             value.each_pair.map {|k,v| %Q(data-#{k}=\\"#{v}\\") }.join(" ")
           when value.kind_of?(Proc)
             %Q(#{name}=\\"\#{(#{value.source}).call}\\")
-          when code = value.to_s.match(/^\{\{(.*)\}\}$/).try(:[], 1)
-            %Q(#{name}=\\"\#{#{code}}\\")
           else
             %Q(#{name}=\\"#{value}\\")
           end
@@ -73,11 +71,7 @@ module ExpressTemplates
             if child.respond_to?(:compile)
               child.compile
             else
-              if code = child.to_s.match(/\{\{(.*)\}\}/).try(:[], 1)
-                %Q("\#\{#{code}\}")
-              else
-                %Q("#{child}")
-              end
+              %Q("#{child}")
             end
           end
           unless ruby_fragments.empty?

data/lib/express_templates/markup/wrapper.rb

@@ -13,7 +13,7 @@ module ExpressTemplates
 
       def compile
         # insure nils do not blow up view
-        %Q("\#\{#{_compile}\}")
+        %Q(%Q({{#{_compile}}}))
       end
 
       def to_template
@@ -29,12 +29,24 @@ module ExpressTemplates
           string = "#{name}"
 
           if !@args.empty?
-            args_string = args.slice(0..-2).map(&:inspect).map(&:_remove_double_braces).join(', ')
+
+            args_string = args.slice(0..-2).map do |arg|
+              if arg.respond_to?(:gsub) && arg.match(/^\{\{(.*)\}\}$/)
+                # strip double braces because otherwise these will be converted
+                # to "#{arg}" during final interpolation which is generally not
+                # the intention for arguments to helpers as these are ruby expressions
+                # not necessarily returning strings
+                $1
+              else
+                arg.inspect # 'value' or :value or ['a', 'b', 'c'] or {:key => 'value'}
+              end
+            end.join(', ')
+
             last_arg = ''
             if args.last.is_a?(Hash) # expand a hash
               last_arg = _convert_hash_to_argument_string(args.last)
             else
-              last_arg = args.last.inspect._remove_double_braces
+              last_arg = args.last.inspect
             end
             args_string << (args_string.empty? ? last_arg : ", #{last_arg}")
             string << "(#{args_string})"
@@ -80,9 +92,3 @@ module ExpressTemplates
     end
   end
 end
-
-class String
-  def _remove_double_braces
-    match(/\{\{(.*)\}\}/).try(:[], 1) || self
-  end
-end

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/express_templates.rb

@@ -8,6 +8,7 @@ module ExpressTemplates
   require 'express_templates/renderer'
   require 'express_templates/expander'
   require 'express_templates/compiler'
+  require 'express_templates/interpolator'
   extend Renderer
   extend Compiler
   if defined?(Rails)

data/test/components/base_test.rb

@@ -38,7 +38,7 @@ class BaseTest < ActiveSupport::TestCase
 
   test "helpers defined in component are evaluated in context" do
     compiled = Helpers.new.compile
-    assert_equal "<h1>bar</h1>", Context.new.instance_eval(compiled)
+    assert_equal "<h1>bar</h1>", Context.new.instance_eval(Interpolator.transform(compiled))
   end
 
 end

data/test/components/conditionality_test.rb

@@ -30,7 +30,7 @@ class ConditionalityTest < ActiveSupport::TestCase
   end
 
   test "when supplied condition is true, renders the component" do
-    compiled_src = ConditionalRenderer.new.compile
+    compiled_src = Interpolator.transform(ConditionalRenderer.new.compile)
     assert_equal '<h1>Something</h1>', present_title_context.instance_eval(compiled_src)
   end
 

data/test/components/iterating_test.rb

@@ -17,13 +17,14 @@ class IteratingTest < ActiveSupport::TestCase
   test "#for_each expands to view logic" do
     compiled = ForEachLogic.new.compile
     assert_equal %q((@things.each_with_index.map do |thing, thing_index|
-"<span>#{thing}</span>"
-end).join), compiled
+"<span>"+%Q(#{thing})+"</span>"
+end).join), Interpolator.transform(compiled)
   end
 
   test "#for_each iterates markup for each value" do
     compiled = ForEachLogic.new.compile
-    assert_equal '<span>bar</span><span>baz</span>', Context.new.instance_eval(compiled)
+    assert_equal '<span>bar</span><span>baz</span>',
+                 Context.new.instance_eval(Interpolator.transform(compiled))
   end
 
   class ForEachDeclarativeForm < ECB
@@ -36,7 +37,8 @@ end).join), compiled
 
   test ".for_each offers declarative form" do
     compiled = ForEachLogic.new.compile
-    assert_equal '<span>bar</span><span>baz</span>', Context.new.instance_eval(compiled)
+    assert_equal '<span>bar</span><span>baz</span>',
+                  Context.new.instance_eval(Interpolator.transform(compiled))
   end
 
 
@@ -60,7 +62,8 @@ end).join), compiled
 
   test ".wrap_with wraps via _yield special handler" do
     compiled = MultiFragments.new.compile
-    assert_equal "<ul><li>bar</li><li>baz</li></ul>", Context.new.instance_eval(compiled)
+    assert_equal "<ul><li>bar</li><li>baz</li></ul>",
+                  Context.new.instance_eval(Interpolator.transform(compiled))
   end
 
   class EmptyState < ECB