temple 0.1.1 → 0.1.2

data/lib/temple.rb

@@ -1,5 +1,5 @@
 module Temple
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   
   autoload :Core,       'temple/core'
   autoload :Engine,     'temple/engine'
@@ -18,6 +18,9 @@ module Temple
     autoload :MultiFlattener, 'temple/filters/multi_flattener'
     autoload :StaticMerger,   'temple/filters/static_merger'
     autoload :DynamicInliner, 'temple/filters/dynamic_inliner'
-    autoload :Escapable,      'temple/filters/escapable'
+  end
+
+  module HTML
+    autoload :Fast,           'temple/html/fast'
   end
 end

data/lib/temple/core.rb

@@ -25,8 +25,6 @@ module Temple
   # === [:static, string]
   #            
   # Static indicates that the given string should be appended to the result.
-  # Every \n will be also cause a newline in the generated code. \r\n on the
-  # other hand, only causes a newline in the result.
   #       
   # Example:
   #       
@@ -35,18 +33,13 @@ module Temple
   #   _buf << "Hello World"
   #         
   #   [:static, "Hello \n World"]
-  #   # is the same as:
-  #   _buf << "Hello
-  #   World"
-  #         
-  #   [:static, "Hello \r\n World"]
   #   # is the same as
   #   _buf << "Hello\nWorld"
   #       
   # === [:dynamic, ruby]
   #      
   # Dynamic indicates that the given Ruby code should be evaluated and then
-  # appended to the result. Any \n causes a newline in the generated code.
+  # appended to the result.
   #     
   # The Ruby code must be a complete expression in the sense that you can pass
   # it to eval() and it would not raise SyntaxError.
@@ -129,4 +122,4 @@ module Temple
       end
     end
   end
-end
+end

data/lib/temple/engine.rb

@@ -47,7 +47,7 @@ module Temple
     
     def initialize(options = {})
       @chain = self.class.filters.map do |filter, args, blk|
-        opt = args.last.is_a?(Hash) ? args.pop : {}
+        opt = args.last.is_a?(Hash) ? args.last : {}
         opt = args.inject(opt) do |memo, ele|
           memo[ele] = options[ele] if options.has_key?(ele)
           memo
@@ -61,4 +61,4 @@ module Temple
       @chain.inject(thing) { |m, e| e.compile(m) }
     end
   end
-end
+end

data/lib/temple/filters/multi_flattener.rb

@@ -4,19 +4,22 @@ module Temple
       def initialize(options = {})
         @options = {}
       end
-      
+
       def compile(exp)
-        return exp unless exp.first == :multi
+        exp.first == :multi ? on_multi(*exp[1..-1]) : exp
+      end
+      
+      def on_multi(*exps)
         # If the multi contains a single element, just return the element
-        return compile(exp[1]) if exp.length == 2
+        return compile(exps.first) if exps.length == 1
         result = [:multi]
         
-        exp[1..-1].each do |e|
-          e = compile(e)
-          if e.first == :multi
-            result.concat(e[1..-1])
+        exps.each do |exp|
+          exp = compile(exp)
+          if exp.first == :multi
+            result.concat(exp[1..-1])
           else
-            result << e
+            result << exp
           end
         end
         
@@ -24,4 +27,4 @@ module Temple
       end
     end
   end
-end
+end

data/lib/temple/generator.rb

@@ -26,15 +26,7 @@ module Temple
     end
     
     def self.to_ruby(str)
-      str.inspect.gsub(/(\\r)?\\n/m) do |str|
-        if $`[-1] == ?\\
-          str
-        elsif $1
-          "\\n"
-        else
-          "\n"
-        end
-      end
+      str.inspect
     end
     
     def to_ruby(str)
@@ -83,4 +75,4 @@ module Temple
       @options[:buffer] = prev_buffer
     end
   end
-end
+end

data/lib/temple/html/fast.rb

@@ -0,0 +1,159 @@
+module Temple
+  module HTML
+    class Fast
+      DEFAULT_OPTIONS = {
+        :format => :xhtml,
+        :attr_wrapper => "'",
+        :autoclose => %w[meta img link br hr input area param col base]
+      }
+      
+      def initialize(options = {})
+        @options = DEFAULT_OPTIONS.merge(options)
+        
+        unless [:xhtml, :html4, :html5].include?(@options[:format])
+          raise "Invalid format #{@options[:format].inspect}"
+        end
+        
+      end
+      
+      def xhtml?
+        @options[:format] == :xhtml
+      end
+      
+      def html?
+        html5? or html4?
+      end
+      
+      def html5?
+        @options[:format] == :html5
+      end
+      
+      def html4?
+        @options[:format] == :html4
+      end
+      
+      def compile(exp)
+        case exp[0]
+        when :multi, :capture
+          send("on_#{exp[0]}", *exp[1..-1])
+        when :html
+          send("on_#{exp[1]}", *exp[2..-1])
+        else
+          exp
+        end
+      end
+      
+      def on_multi(*exp)
+        [:multi, *exp.map { |e| compile(e) }]
+      end
+      
+      def on_doctype(type)
+        trailing_newlines = type[/(\A|[^\r])(\n+)\Z/, 2].to_s
+        
+        text = type.to_s.downcase.strip
+        if text.index("xml") == 0
+          if html?
+            return [:multi].concat([[:newline]] * trailing_newlines.size)
+          end
+          
+          wrapper = @options[:attr_wrapper]
+          str = "<?xml version=#{wrapper}1.0#{wrapper} encoding=#{wrapper}#{text.split(' ')[1] || "utf-8"}#{wrapper} ?>"
+        end
+        
+        str = "<!DOCTYPE html>" if html5?
+        
+        str ||= if xhtml?
+          case text
+          when /^1\.1/;     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
+          when /^5/;        '<!DOCTYPE html>'
+          when "strict";    '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
+          when "frameset";  '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">'
+          when "mobile";    '<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">'
+          when "basic";     '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">'
+          else              '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
+          end
+        elsif html4?
+          case text
+            when "strict";    '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'
+            when "frameset";  '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">'
+            else              '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'
+          end
+        end
+        
+        str << trailing_newlines
+        [:static, str]
+      end
+      
+      def on_comment(content)
+        [:multi,
+          [:static, "<!--"],
+          compile(content),
+          [:static, "-->"]]
+      end
+      
+      def on_tag(name, attrs, content)
+        ac = @options[:autoclose].include?(name)
+        result = [:multi]
+        result << [:static, "<#{name}"]
+        result << compile(attrs)
+        result << [:static, " /"] if ac && xhtml?
+        result << [:static, ">"]
+        result << compile(content)
+        result << [:static, "</#{name}>"] if !ac
+        result
+      end
+      
+      def on_attrs(*exp)
+        if exp.all? { |e| attr_easily_compilable?(e) }
+          [:multi, *merge_basicattrs(exp).map { |e| compile(e) }]
+        else
+          raise "[:html, :attrs] currently only support basicattrs"
+        end
+      end
+      
+      def attr_easily_compilable?(exp)
+        exp[1] == :basicattr and
+        exp[2][0] == :static
+      end
+      
+      def merge_basicattrs(attrs)
+        result = []
+        position = {}
+        
+        attrs.each do |(html, type, (name_type, name), value)|
+          if pos = position[name]
+            case name
+            when 'class', 'id'
+              value = [:multi,
+                result[pos].last,  # previous value
+                [:static, (name == 'class' ? ' ' : '_')], # delimiter
+                value]             # new value
+            end
+            
+            result[pos] = [name, value]
+          else
+            position[name] = result.size
+            result << [name, value]
+          end
+        end
+        
+        final = []
+        result.each_with_index do |(name, value), index|
+          final << [:html, :basicattr, [:static, name], value]
+        end
+        final
+      end
+      
+      def on_basicattr(name, value)
+        [:multi,
+          [:static, " "],
+          name,
+          [:static, "="],
+          [:static, @options[:attr_wrapper]],
+          value,
+          [:static, @options[:attr_wrapper]]]
+      end
+    end
+  end
+end
+

data/lib/temple/parsers/erb.rb

@@ -25,7 +25,7 @@ module Temple
           if scanner.stag.nil?
             case token
             when Compiler::PercentLine
-              result << [:static, content] if content.size > 0
+              append_static(result, content) if content.size > 0
               content = ''
               result << [:block, token.to_s.strip]
               result << [:newline]
@@ -35,12 +35,12 @@ module Temple
               scanner.stag = token
             when "\n"
               content << "\n"
-              result << [:static, content]
+              append_static(result, content)
               content = ''
             when '<%%'
               result << [:static, '<%']
             else
-              result << [:static, token]
+              append_static(result, token)
             end
           else
             case token
@@ -71,6 +71,13 @@ module Temple
         
         result
       end
+
+      def append_static(result, content)
+        result << [:static, content]
+        content.count("\n").times do
+          result << [:newline]
+        end
+      end
     end                      
   end
-end
+end

data/lib/temple/utils.rb

@@ -16,5 +16,14 @@ module Temple
       # That has to be the only token.
       lexer.token.nil?
     end
+
+    def empty_exp?(exp)
+      case exp[0]
+      when :multi
+        exp[1..-1].all? { |e| e[0] == :newline }
+      else
+        false
+      end
+    end
   end
-end
+end

data/temple.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{temple}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Magnus Holm"]
   s.date = %q{2010-01-23}
   s.email = %q{judofyr@gmail.com}
-  s.files = [".yardopts", "LICENSE", "README.md", "Rakefile", "lib/temple.rb", "lib/temple/core.rb", "lib/temple/engine.rb", "lib/temple/engines/erb.rb", "lib/temple/filters/dynamic_inliner.rb", "lib/temple/filters/escapable.rb", "lib/temple/filters/multi_flattener.rb", "lib/temple/filters/static_merger.rb", "lib/temple/generator.rb", "lib/temple/parsers/erb.rb", "lib/temple/utils.rb", "temple.gemspec", "test/engines/hello.erb", "test/engines/test_erb.rb", "test/engines/test_erb_m17n.rb", "test/filters/test_dynamic_inliner.rb", "test/filters/test_escapable.rb", "test/filters/test_static_merger.rb", "test/helper.rb", "test/test_generator.rb", "test/test_temple.rb"]
+  s.files = [".yardopts", "LICENSE", "README.md", "Rakefile", "lib/temple.rb", "lib/temple/core.rb", "lib/temple/engine.rb", "lib/temple/engines/erb.rb", "lib/temple/filters/dynamic_inliner.rb", "lib/temple/filters/multi_flattener.rb", "lib/temple/filters/static_merger.rb", "lib/temple/generator.rb", "lib/temple/html/fast.rb", "lib/temple/parsers/erb.rb", "lib/temple/utils.rb", "temple.gemspec", "test/engines/hello.erb", "test/engines/test_erb.rb", "test/engines/test_erb_m17n.rb", "test/filters/test_dynamic_inliner.rb", "test/filters/test_static_merger.rb", "test/helper.rb", "test/test_generator.rb", "test/test_temple.rb"]
   s.homepage = %q{http://dojo.rubyforge.org/}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}

data/test/filters/test_dynamic_inliner.rb

@@ -9,7 +9,7 @@ class TestTempleFiltersDynamicInliner < TestFilter(:DynamicInliner)
     ])
     
     assert_equal([:multi,
-      [:dynamic, "\"Hello World\n Have a nice day\""]
+      [:dynamic, '"Hello World\n Have a nice day"']
     ], exp)
   end
 
@@ -96,7 +96,7 @@ class TestTempleFiltersDynamicInliner < TestFilter(:DynamicInliner)
     ])
     
     assert_equal([:multi,
-      [:dynamic, ["\"Hello \n\"", '"#{@world}"', '""'].join("\\\n")],
+      [:dynamic, ['"Hello \n"', '"#{@world}"', '""'].join("\\\n")]
     ], exp)
   end
   
@@ -113,4 +113,4 @@ class TestTempleFiltersDynamicInliner < TestFilter(:DynamicInliner)
       [:block, "world"]
     ], exp)
   end
-end
+end

data/test/test_generator.rb

@@ -93,30 +93,8 @@ class TestTempleGenerator < Test::Unit::TestCase
   
   def test_to_ruby
     simple = Simple.new
-    
-    {
-      "Hello"              =>   'Hello',
-      "Hello\r\nWorld"     =>   'Hello\nWorld',
-      "Hello\nWorld"       => %w|Hello World|,
-      "Hello\n\r\n\nWorld" => %w|Hello \n World|,
-      "\r\n\nHelloWorld\n" => %w|\n HelloWorld .|,
-      "\nHelloWorld\r\n"   => %w|. HelloWorld\n|,
-    }.
-    each do |actual, expected|
-      if expected.is_a?(Array)
-        expected = expected.map do |x|
-          if x == "."
-            # Use the dot so we can easily match a newline
-            # at the end or the beginning.
-            ""
-          else
-            x
-          end
-        end.join("\n") 
-      end
-      
-      expected = '"' + expected + '"'
-      assert_equal(expected, simple.to_ruby(actual))
-    end
+
+    assert_equal('"Hello"', simple.to_ruby("Hello"))
+    assert_equal('"Hello\nWorld"', simple.to_ruby("Hello\nWorld"))
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Magnus Holm
@@ -36,10 +36,10 @@ files:
 - lib/temple/engine.rb
 - lib/temple/engines/erb.rb
 - lib/temple/filters/dynamic_inliner.rb
-- lib/temple/filters/escapable.rb
 - lib/temple/filters/multi_flattener.rb
 - lib/temple/filters/static_merger.rb
 - lib/temple/generator.rb
+- lib/temple/html/fast.rb
 - lib/temple/parsers/erb.rb
 - lib/temple/utils.rb
 - temple.gemspec
@@ -47,7 +47,6 @@ files:
 - test/engines/test_erb.rb
 - test/engines/test_erb_m17n.rb
 - test/filters/test_dynamic_inliner.rb
-- test/filters/test_escapable.rb
 - test/filters/test_static_merger.rb
 - test/helper.rb
 - test/test_generator.rb

data/lib/temple/filters/escapable.rb

@@ -1,32 +0,0 @@
-require 'cgi'
-
-module Temple
-  module Filters
-    class Escapable
-      def initialize(options = {})
-        @escaper = options[:escaper] || 'CGI.escapeHTML((%s).to_s)'
-      end
-      
-      def compile(exp)
-        return exp if !exp.is_a?(Enumerable) || exp.is_a?(String)
-        
-        if is_escape?(exp)
-          case exp[1][0]
-          when :static
-            [:static, eval(@escaper % exp[1][1].inspect)]
-          when :dynamic, :block
-            [exp[1][0], @escaper % exp[1][1]]
-          else
-            raise "Escapable can only handle :static, :dynamic and :block for the moment."
-          end
-        else
-          exp.map { |e| compile(e) }
-        end
-      end
-      
-      def is_escape?(exp)
-        exp.respond_to?(:[]) && exp[0] == :escape
-      end
-    end
-  end
-end

data/test/filters/test_escapable.rb

@@ -1,28 +0,0 @@
-require File.dirname(__FILE__) + '/../helper'
-
-class TestTempleFiltersEscapable < TestFilter(:Escapable)
-  def test_escape
-    exp = @filter.compile([:multi,
-      [:escape, [:dynamic, "@hello"]],
-      [:escape, [:block, "@world"]]
-    ])
-    
-    assert_equal([:multi,
-      [:dynamic, "CGI.escapeHTML((@hello).to_s)"],
-      [:block, "CGI.escapeHTML((@world).to_s)"]
-    ], exp)
-  end
-
-  def test_escape_static_content
-    exp = @filter.compile([:multi,
-      [:escape, [:static, "<hello>"]],
-      [:escape, [:block, "@world"]]
-    ])
-    
-    assert_equal([:multi,
-      [:static, "&lt;hello&gt;"],
-      [:block, "CGI.escapeHTML((@world).to_s)"]
-    ], exp)
-  end
-end
-