temple 0.1.3 → 0.1.4

data/test/test_utils.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+describe Temple::Utils do
+  it 'has empty_exp?' do
+    Temple::Utils.empty_exp?([:multi]).should.be.true
+    Temple::Utils.empty_exp?([:multi, [:multi]]).should.be.true
+    Temple::Utils.empty_exp?([:multi, [:multi, [:newline]], [:newline]]).should.be.true
+    Temple::Utils.empty_exp?([:multi]).should.be.true
+    Temple::Utils.empty_exp?([:multi, [:multi, [:static, 'text']]]).should.be.false
+    Temple::Utils.empty_exp?([:multi, [:newline], [:multi, [:dynamic, 'text']]]).should.be.false
+  end
+
+  it 'has escape_html' do
+    Temple::Utils.escape_html('<').should.equal '&lt;'
+  end
+
+  it 'should escape unsafe html strings' do
+    with_html_safe(false) do
+      Temple::Utils.escape_html_safe('<').should.equal '&lt;'
+    end
+  end
+
+  it 'should not escape safe html strings' do
+    with_html_safe(true) do
+      Temple::Utils.escape_html_safe('<').should.equal '<'
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Magnus Holm
@@ -14,10 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 +01:00
+date: 2010-11-03 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: 
 email: judofyr@gmail.com
 executables: []
@@ -27,30 +38,40 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - .yardopts
 - LICENSE
 - README.md
 - Rakefile
 - lib/temple.rb
-- lib/temple/core.rb
 - lib/temple/engine.rb
-- lib/temple/engines/erb.rb
+- lib/temple/erb/engine.rb
+- lib/temple/erb/parser.rb
+- lib/temple/erb/template.rb
+- lib/temple/erb/trimming.rb
+- lib/temple/filter.rb
+- lib/temple/filters/debugger.rb
 - lib/temple/filters/dynamic_inliner.rb
+- lib/temple/filters/escape_html.rb
 - lib/temple/filters/multi_flattener.rb
 - lib/temple/filters/static_merger.rb
-- lib/temple/generator.rb
+- lib/temple/generators.rb
 - lib/temple/html/fast.rb
-- lib/temple/parsers/erb.rb
+- lib/temple/html/pretty.rb
+- lib/temple/mixins.rb
+- lib/temple/template.rb
 - lib/temple/utils.rb
+- lib/temple/version.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_escape_html.rb
+- test/filters/test_multi_flattener.rb
 - test/filters/test_static_merger.rb
 - test/helper.rb
+- test/html/test_fast.rb
+- test/test_erb.rb
 - test/test_generator.rb
-- test/test_temple.rb
+- test/test_utils.rb
 has_rdoc: true
 homepage: http://dojo.rubyforge.org/
 licenses: []
@@ -80,6 +101,14 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Template compilation framework in RUby
-test_files: []
-
+summary: Template compilation framework in Ruby
+test_files: 
+- test/filters/test_dynamic_inliner.rb
+- test/filters/test_escape_html.rb
+- test/filters/test_multi_flattener.rb
+- test/filters/test_static_merger.rb
+- test/helper.rb
+- test/html/test_fast.rb
+- test/test_erb.rb
+- test/test_generator.rb
+- test/test_utils.rb

data/lib/temple/engines/erb.rb

@@ -1,93 +0,0 @@
-require 'erb'
-
-module Temple
-  module Engines
-    # An engine which works in-place for ERB:
-    # 
-    #   require 'temple'
-    #   
-    #   template = Temple::Engine::ERB.new("<%= 1 + 1 %>")
-    #   template.result # => "2"
-    class ERB < ::ERB
-      OriginalERB = ::ERB
-      Optimizers = [Filters::StaticMerger.new, Filters::DynamicInliner.new]
-      
-      # The optional _filename_ argument passed to Kernel#eval when the ERB
-      # code is run
-      attr_accessor :filename
-      
-      # The Ruby code generated by ERB
-      attr_reader :src
-      
-      # The sexp generated by Temple
-      attr_reader :sexp
-      
-      # The optimized sexp generated by Temple
-      attr_reader :optimized_sexp
-      
-      # Sets the ERB constant to Temple::Engine::ERB
-      # 
-      # Example:
-      # 
-      #   require 'temple'
-      #   Temple::Engine::ERB.rock!
-      #   ERB == Temple::Engine::ERB
-      def self.rock!
-        Object.send(:remove_const, :ERB)
-        Object.send(:const_set, :ERB, self)
-      end
-      
-      # Sets the ERB constant back to regular ERB
-      # 
-      # Example:
-      # 
-      #   require 'temple'
-      #   original_erb = ERB
-      #   Temple::Engine::ERB.rock!
-      #   ERB.suck!
-      #   ERB == original_erb
-      
-      def self.suck!
-        Object.send(:remove_const, :ERB)
-        Object.send(:const_set, :ERB, OriginalERB)
-      end
-      
-      def initialize(str, safe_level = nil, trim_mode = nil, eoutvar = '_erbout', options = {})
-        @safe_level = safe_level
-        @trim_mode = trim_mode
-        @parser = Parsers::ERB.new(:trim_mode => @trim_mode)
-        
-        @generator = options[:generator] || Core::ArrayBuffer
-        
-        if @generator.is_a?(Class)
-          @generator = @generator.new(:buffer => eoutvar)
-        end
-        
-        @sexp = @parser.compile(str)
-        @optimized_sexp = Optimizers.inject(@sexp) { |m, e| e.compile(m) }
-        @src = @generator.compile(@optimized_sexp)
-        
-        if str.respond_to?(:encoding)
-          @enc = detect_magic_comment(str) || str.encoding
-          @src.insert(0, "#coding:#{@enc}\n")
-          @src << ".force_encoding(__ENCODING__)"
-        end
-      end
-      
-      def percent?
-        @trim_mode.is_a?(String) and @trim_mode.include?("%")
-      end
-      
-      def detect_magic_comment(s)
-        if /\A<%#(.*)%>/ =~ s or (percent? and /\A%#(.*)/ =~ s)
-  	      comment = $1
-  	      comment = $1 if comment[/-\*-\s*(.*?)\s*-*-$/]
-  	      if %r"coding\s*[=:]\s*([[:alnum:]\-_]+)" =~ comment
-  	        enc = $1.sub(/-(?:mac|dos|unix)/i, '')
-  	        enc = Encoding.find(enc)
-  	      end
-        end
-      end
-    end
-  end
-end

data/lib/temple/generator.rb

@@ -1,76 +0,0 @@
-module Temple
-  class Generator
-    DEFAULT_OPTIONS = {
-      :buffer => "_buf",
-    }
-    
-    def initialize(options = {})
-      @options = DEFAULT_OPTIONS.merge(options)
-      @compiling = false
-      @in_capture = nil
-    end
-
-    def capture_generator
-      @capture_generator ||=
-        @options[:capture_generator] || Temple::Core::StringBuffer
-    end
-
-    def compile(exp, single = false)
-      if @compiling || single
-        type, *args = exp
-        recv = @in_capture || self
-        recv.send("on_#{type}", *args)
-      else
-        begin
-          @compiling = true
-          [preamble, compile(exp), postamble].join(' ; ')
-        ensure
-          @compiling = false
-        end
-      end
-    end
-    
-    def buffer(str = '')
-      @options[:buffer] + str
-    end
-
-    def concat(str)
-      buffer " << (#{str})"
-    end
-
-    def self.to_ruby(str)
-      str.inspect
-    end
-    
-    def to_ruby(str)
-      Generator.to_ruby(str)
-    end
-    
-    # Sensible defaults
-    
-    def preamble;  '' end
-    def postamble; '' end
-    
-    def on_multi(*exp)
-      exp.map { |e| compile(e) }.join(" ; ")
-    end
-    
-    def on_newline
-      "\n"
-    end
-    
-    def on_capture(name, block)
-      before = @capture
-      @capture = capture_generator.new(:buffer => name)
-
-      [
-        @capture.preamble,
-        @capture.compile(block, true),
-        "#{name} = (#{@capture.postamble})"
-      ].join(' ; ')
-    ensure
-      @capture = before
-    end
-  end
-end
-

data/lib/temple/parsers/erb.rb

@@ -1,83 +0,0 @@
-require 'erb'
-
-module Temple
-  module Parsers
-    # Parses ERB exactly the same way as erb.rb.
-    class ERB
-      Compiler = ::ERB::Compiler
-      
-      def initialize(options = {})
-        @compiler = Compiler.new(options[:trim_mode])
-      end
-      
-      def compile(src)
-        if src.respond_to?(:encoding) && src.encoding.dummy?
-          raise ArgumentError, "#{src.encoding} is not ASCII compatible"
-        end
-        
-        result = [:multi]
-        
-        content = ''
-        scanner = @compiler.make_scanner(src)
-        scanner.scan do |token|
-          next if token.nil? 
-          next if token == ''
-          if scanner.stag.nil?
-            case token
-            when Compiler::PercentLine
-              append_static(result, content) if content.size > 0
-              content = ''
-              result << [:block, token.to_s.strip]
-              result << [:newline]
-            when :cr
-              result << [:newline]
-            when '<%', '<%=', '<%#'
-              scanner.stag = token
-            when "\n"
-              content << "\n"
-              append_static(result, content)
-              content = ''
-            when '<%%'
-              result << [:static, '<%']
-            else
-              append_static(result, token)
-            end
-          else
-            case token
-            when '%>'
-              case scanner.stag
-              when '<%'
-                if content[-1] == ?\n
-                  content.chop!
-                  result << [:block, content]
-                  result << [:newline]
-                else
-                  result << [:block, content]
-                end
-              when '<%='
-                result << [:dynamic, content]
-              when '<%#'
-                # nothing
-              end
-              scanner.stag = nil
-              content = ''
-            when '%%>'
-              content << '%>'
-            else
-              content << token
-            end
-          end
-        end
-        
-        result
-      end
-
-      def append_static(result, content)
-        result << [:static, content]
-        content.count("\n").times do
-          result << [:newline]
-        end
-      end
-    end                      
-  end
-end

data/test/engines/hello.erb

@@ -1,4 +0,0 @@
-= hello
-<% 3.times do |n| %>
-* <%= n %>
-<% end %>

data/test/engines/test_erb.rb

@@ -1,495 +0,0 @@
-require File.dirname(__FILE__) + '/../helper'
-require 'erb'
-
-NormalERB = ::ERB
-TempleERB = Temple::Engines::ERB
-
-class TestTempleEnginesERB < Test::Unit::TestCase
-  class MyError < RuntimeError ; end
-  
-  def test_rock_suck
-    assert_equal(NormalERB, ::ERB)
-    TempleERB.rock!
-    assert_equal(TempleERB, ::ERB)
-    TempleERB.suck!
-    assert_equal(NormalERB, ::ERB)
-  end
-  
-  def test_change_generator
-    gen = Temple::Core::StringBuffer
-    erb = TempleERB.new("Hello", nil, nil, 'foo', :generator => gen)
-    assert_match(/foo = ''/, erb.src)
-    
-    erb = TempleERB.new("Hello", nil, nil, 'foo', :generator => gen.new(:buffer => "bar"))
-    assert_match(/bar = ''/, erb.src)
-    assert_no_match(/foo/, erb.src)
-  end
-  
-  def test_optimizers
-    obj = Object.new
-    def obj.compile(exp)
-      [:static, "Hello World!"]
-    end
-    
-    TempleERB::Optimizers << obj
-    
-    erb = TempleERB.new("Hello")
-    assert_equal("Hello World!", erb.result)
-  ensure
-    TempleERB::Optimizers.delete(obj)
-  end
-
-  def test_without_filename
-    erb = TempleERB.new("<% raise ::TestTempleEnginesERB::MyError %>")
-    e = assert_raise(MyError) {
-      erb.result
-    }
-    assert_match(/\A\(erb\):1\b/, e.backtrace[0])
-  end
-
-  def test_with_filename
-    erb = TempleERB.new("<% raise ::TestTempleEnginesERB::MyError %>")
-    erb.filename = "test filename"
-    e = assert_raise(MyError) {
-      erb.result
-    }
-    assert_match(/\Atest filename:1\b/, e.backtrace[0])
-  end
-
-  def test_without_filename_with_safe_level
-    erb = TempleERB.new("<% raise ::TestTempleEnginesERB::MyError %>", 1)
-    e = assert_raise(MyError) {
-      erb.result
-    }
-    assert_match(/\A\(erb\):1\b/, e.backtrace[0])
-  end
-
-  def test_with_filename_and_safe_level
-    erb = TempleERB.new("<% raise ::TestTempleEnginesERB::MyError %>", 1)
-    erb.filename = "test filename"
-    e = assert_raise(MyError) {
-      erb.result
-    }
-    assert_match(/\Atest filename:1\b/, e.backtrace[0])
-  end
-end
-
-class TestTempleEnginesERBCore < Test::Unit::TestCase
-  def setup
-    @erb = TempleERB
-  end
-
-  def test_core
-    _test_core(nil)
-    _test_core(0)
-    _test_core(1)
-    _test_core(2)
-    _test_core(3)
-  end
-
-  def _test_core(safe)
-    erb = @erb.new("hello")
-    assert_equal("hello", erb.result)
-
-    erb = @erb.new("hello", safe, 0)
-    assert_equal("hello", erb.result)
-
-    erb = @erb.new("hello", safe, 1)
-    assert_equal("hello", erb.result)
-
-    erb = @erb.new("hello", safe, 2)
-    assert_equal("hello", erb.result)
-
-    src = <<EOS
-%% hi
-= hello
-<% 3.times do |n| %>
-% n=0
-* <%= n %>
-<% end %>
-EOS
-
-    ans = <<EOS
-%% hi
-= hello
-
-% n=0
-* 0
-
-% n=0
-* 1
-
-% n=0
-* 2
-
-EOS
-    erb = @erb.new(src)
-    assert_equal(ans, erb.result)
-    erb = @erb.new(src, safe, 0)
-    assert_equal(ans, erb.result)
-    erb = @erb.new(src, safe, '')
-    assert_equal(ans, erb.result)
-
-    ans = <<EOS
-%% hi
-= hello
-% n=0
-* 0% n=0
-* 1% n=0
-* 2
-EOS
-    erb = @erb.new(src, safe, 1)
-    assert_equal(ans.chomp, erb.result)
-    erb = @erb.new(src, safe, '>')
-    assert_equal(ans.chomp, erb.result)
-
-    ans  = <<EOS
-%% hi
-= hello
-% n=0
-* 0
-% n=0
-* 1
-% n=0
-* 2
-EOS
-
-    erb = @erb.new(src, safe, 2)
-    assert_equal(ans, erb.result)
-    erb = @erb.new(src, safe, '<>')
-    assert_equal(ans, erb.result)
-
-    ans = <<EOS
-% hi
-= hello
-
-* 0
-
-* 0
-
-* 0
-
-EOS
-    erb = @erb.new(src, safe, '%')
-    assert_equal(ans, erb.result)
-
-    ans = <<EOS
-% hi
-= hello
-* 0* 0* 0
-EOS
-    erb = @erb.new(src, safe, '%>')
-    assert_equal(ans.chomp, erb.result)
-
-    ans = <<EOS
-% hi
-= hello
-* 0
-* 0
-* 0
-EOS
-    erb = @erb.new(src, safe, '%<>')
-    assert_equal(ans, erb.result)
-  end
-
-  def test_safe_04
-    erb = @erb.new('<%=$SAFE%>', 4)
-    assert_equal('4', erb.result(TOPLEVEL_BINDING.taint))
-  end
-
-  class Foo; end
-
-  def test_def_class
-    erb = @erb.new('hello')
-    cls = erb.def_class
-    assert_equal(Object, cls.superclass)
-    assert(cls.new.respond_to?('result'))
-    cls = erb.def_class(Foo)
-    assert_equal(Foo, cls.superclass)
-    assert(cls.new.respond_to?('result'))
-    cls = erb.def_class(Object, 'erb')
-    assert_equal(Object, cls.superclass)
-    assert(cls.new.respond_to?('erb'))
-  end
-
-  def test_percent
-    src = <<EOS
-%n = 1
-<%= n%>
-EOS
-    assert_equal("1\n", TempleERB.new(src, nil, '%').result)
-
-    src = <<EOS
-<%
-%>
-EOS
-    ans = "\n"
-    assert_equal(ans, TempleERB.new(src, nil, '%').result)
-
-    src = "<%\n%>"
-    # ans = "\n"
-    ans = ""
-    assert_equal(ans, TempleERB.new(src, nil, '%').result)
-
-    src = <<EOS
-<%
-n = 1
-%><%= n%>
-EOS
-    assert_equal("1\n", TempleERB.new(src, nil, '%').result)
-
-    src = <<EOS
-%n = 1
-%% <% n = 2
-n.times do |i|%>
-%% %%><%%<%= i%><%
-end%>
-%%%
-EOS
-    ans = <<EOS
-% 
-% %%><%0
-% %%><%1
-%%
-EOS
-    assert_equal(ans, TempleERB.new(src, nil, '%').result)
-  end
-
-  def test_def_erb_method
-    klass = Class.new
-    klass.module_eval do
-      extend ERB::DefMethod
-      fname = File.join(File.dirname(File.expand_path(__FILE__)), 'hello.erb')
-      def_erb_method('hello', fname)
-    end
-    assert(klass.new.respond_to?('hello'))
-
-    assert(! klass.new.respond_to?('hello_world'))
-    erb = @erb.new('hello, world')
-    klass.module_eval do
-      def_erb_method('hello_world', erb)
-    end
-    assert(klass.new.respond_to?('hello_world'))
-  end
-
-  def test_def_method_without_filename
-    klass = Class.new
-    erb = TempleERB.new("<% raise ::TestTempleEnginesERB::MyError %>")
-    erb.filename = "test filename"
-    assert(! klass.new.respond_to?('my_error'))
-    erb.def_method(klass, 'my_error')
-    e = assert_raise(::TestTempleEnginesERB::MyError) {
-       klass.new.my_error
-    }
-    assert_match(/\A\(ERB\):1\b/, e.backtrace[0])
-  end
-
-  def test_def_method_with_fname
-    klass = Class.new
-    erb = TempleERB.new("<% raise ::TestTempleEnginesERB::MyError %>")
-    erb.filename = "test filename"
-    assert(! klass.new.respond_to?('my_error'))
-    erb.def_method(klass, 'my_error', 'test fname')
-    e = assert_raise(::TestTempleEnginesERB::MyError) {
-       klass.new.my_error
-    }
-    assert_match(/\Atest fname:1\b/, e.backtrace[0])
-  end
-
-  def test_escape
-    src = <<EOS
-1.<%% : <%="<%%"%>
-2.%%> : <%="%%>"%>
-3.
-% x = "foo"
-<%=x%>
-4.
-%% print "foo"
-5.
-%% <%="foo"%>
-6.<%="
-% print 'foo'
-"%>
-7.<%="
-%% print 'foo'
-"%>
-EOS
-    ans = <<EOS
-1.<% : <%%
-2.%%> : %>
-3.
-foo
-4.
-% print "foo"
-5.
-% foo
-6.
-% print 'foo'
-
-7.
-%% print 'foo'
-
-EOS
-    assert_equal(ans, TempleERB.new(src, nil, '%').result)
-  end
-
-  def test_keep_lineno
-    src = <<EOS
-Hello, 
-% x = "World"
-<%= x%>
-% raise("lineno")
-EOS
-
-    erb = TempleERB.new(src, nil, '%')
-    begin
-      erb.result
-      assert(false)
-    rescue
-      assert_match(/\A\(erb\):4\b/, $@[0].to_s)
-    end
-
-    src = <<EOS
-%>
-Hello, 
-<% x = "World%%>
-"%>
-<%= x%>
-EOS
-
-    ans = <<EOS
-%>Hello, 
-World%>
-EOS
-    assert_equal(ans, TempleERB.new(src, nil, '>').result)
-
-    ans = <<EOS
-%>
-Hello, 
-
-World%>
-EOS
-    assert_equal(ans, TempleERB.new(src, nil, '<>').result)
-
-    ans = <<EOS
-%>
-Hello, 
-
-World%>
-
-EOS
-    assert_equal(ans, TempleERB.new(src).result)
-
-    src = <<EOS
-Hello, 
-<% x = "World%%>
-"%>
-<%= x%>
-<% raise("lineno") %>
-EOS
-
-    erb = TempleERB.new(src)
-    begin
-      erb.result
-      assert(false)
-    rescue
-      assert_match(/\A\(erb\):5\b/, $@[0].to_s)
-    end
-
-    erb = TempleERB.new(src, nil, '>')
-    begin
-      erb.result
-      assert(false)
-    rescue
-      assert_match(/\A\(erb\):5\b/, $@[0].to_s)
-    end
-
-    erb = TempleERB.new(src, nil, '<>')
-    begin
-      erb.result
-      assert(false)
-    rescue
-      assert_match(/\A\(erb\):5\b/, $@[0].to_s)
-    end
-
-    src = <<EOS
-% y = 'Hello'
-<%- x = "World%%>
-"-%>
-<%= x %><%- x = nil -%> 
-<% raise("lineno") %>
-EOS
-
-    erb = TempleERB.new(src, nil, '-')
-    begin
-      erb.result
-      assert(false)
-    rescue
-      assert_match(/\A\(erb\):5\b/, $@[0].to_s)
-    end
-
-    erb = TempleERB.new(src, nil, '%-')
-    begin
-      erb.result
-      assert(false)
-    rescue
-      assert_match(/\A\(erb\):5\b/, $@[0].to_s)
-    end
-  end
-
-  def test_explicit
-    src = <<EOS
-<% x = %w(hello world) -%>
-NotSkip <%- y = x -%> NotSkip
-<% x.each do |w| -%>
-  <%- up = w.upcase -%>
-  * <%= up %>
-<% end -%>
- <%- z = nil -%> NotSkip <%- z = x %>
- <%- z.each do |w| -%>
-   <%- down = w.downcase -%>
-   * <%= down %>
-   <%- up = w.upcase -%>
-   * <%= up %>
- <%- end -%>
-KeepNewLine <%- z = nil -%> 
-EOS
-
-   ans = <<EOS
-NotSkip  NotSkip
-  * HELLO
-  * WORLD
- NotSkip 
-   * hello
-   * HELLO
-   * world
-   * WORLD
-KeepNewLine  
-EOS
-   assert_equal(ans, TempleERB.new(src, nil, '-').result)
-   assert_equal(ans, TempleERB.new(src, nil, '-%').result)
-  end
-
-  def test_url_encode
-    assert_equal("Programming%20Ruby%3A%20%20The%20Pragmatic%20Programmer%27s%20Guide",
-                 ERB::Util.url_encode("Programming Ruby:  The Pragmatic Programmer's Guide"))
-    
-    if "".respond_to?(:force_encoding)
-      assert_equal("%A5%B5%A5%F3%A5%D7%A5%EB",
-                  ERB::Util.url_encode("\xA5\xB5\xA5\xF3\xA5\xD7\xA5\xEB".force_encoding("EUC-JP")))
-    end
-  end
-end
-
-class TestTempleEnginesERBCoreWOStrScan < TestTempleEnginesERBCore
-  def setup
-    @save_map = ERB::Compiler::Scanner.instance_variable_get('@scanner_map')
-    map = {[nil, false]=>ERB::Compiler::SimpleScanner}
-    ERB::Compiler::Scanner.instance_variable_set('@scanner_map', map)
-    super
-  end
-
-  def teardown
-    ERB::Compiler::Scanner.instance_variable_set('@scanner_map', @save_map)
-  end
-end