temple 0.2.0 → 0.3.0

data/test/test_grammar.rb

@@ -0,0 +1,52 @@
+require 'helper'
+
+describe Temple::Grammar do
+  it 'should match core expressions' do
+    Temple::Grammar.should.match [:multi]
+    Temple::Grammar.should.match [:multi, [:multi]]
+    Temple::Grammar.should.match [:static, 'Text']
+    Temple::Grammar.should.match [:dynamic, 'Text']
+    Temple::Grammar.should.match [:code, 'Text']
+    Temple::Grammar.should.match [:capture, 'Text', [:multi]]
+    Temple::Grammar.should.match [:newline]
+  end
+
+  it 'should not match invalid core expressions' do
+    Temple::Grammar.should.not.match [:multi, 'String']
+    Temple::Grammar.should.not.match [:static]
+    Temple::Grammar.should.not.match [:dynamic, 1]
+    Temple::Grammar.should.not.match [:code, :sym]
+    Temple::Grammar.should.not.match [:capture, [:multi]]
+    Temple::Grammar.should.not.match [:newline, [:multi]]
+  end
+
+  it 'should match control flow expressions' do
+    Temple::Grammar.should.match [:if, 'Condition', [:multi]]
+    Temple::Grammar.should.match [:if, 'Condition', [:multi], [:multi]]
+    Temple::Grammar.should.match [:block, 'Loop', [:multi]]
+    Temple::Grammar.should.match [:case, 'Arg', ['Cond1', [:multi]], ['Cond1', [:multi]], [:else, [:multi]]]
+    Temple::Grammar.should.not.match [:case, 'Arg', [:sym, [:multi]]]
+    Temple::Grammar.should.match [:cond, ['Cond1', [:multi]], ['Cond2', [:multi]], [:else, [:multi]]]
+    Temple::Grammar.should.not.match [:cond, [:sym, [:multi]]]
+  end
+
+  it 'should match escape expression' do
+    Temple::Grammar.should.match [:escape, true, [:multi]]
+    Temple::Grammar.should.match [:escape, false, [:multi]]
+  end
+
+  it 'should match html expressions' do
+    Temple::Grammar.should.match [:html, :doctype, 'Doctype']
+    Temple::Grammar.should.match [:html, :comment, [:multi]]
+    Temple::Grammar.should.match [:html, :tag, 'Tag', [:multi]]
+    Temple::Grammar.should.match [:html, :tag, 'Tag', [:multi], [:multi]]
+    Temple::Grammar.should.match [:html, :tag, 'Tag', [:multi], [:static, 'Text']]
+    Temple::Grammar.should.match [:html, :tag, 'Tag', [:html, :attrs, [:html, :attr, 'id',
+                                  [:static, 'val']]], [:static, 'Text']]
+  end
+
+  it 'should not match lone html attributes' do
+    Temple::Grammar.should.not.match [:html, :attr, 'id', [:multi]]
+    Temple::Grammar.should.not.match [:html, :attrs]
+  end
+end

data/test/test_hash.rb

@@ -0,0 +1,39 @@
+require 'helper'
+
+describe Temple::ImmutableHash do
+  it 'has read accessor' do
+    hash = Temple::ImmutableHash.new({:a => 1},{:b => 2, :a => 3})
+    hash[:a].should.equal 1
+    hash[:b].should.equal 2
+  end
+
+  it 'has include?' do
+    hash = Temple::ImmutableHash.new({:a => 1},{:b => 2, :a => 3})
+    hash.should.include :a
+    hash.should.include :b
+    hash.should.not.include :c
+  end
+
+  it 'has values' do
+    Temple::ImmutableHash.new({:a => 1},{:b => 2, :a => 3}).values.sort.should.equal [1,2]
+  end
+
+  it 'has keys' do
+    Temple::ImmutableHash.new({:a => 1},{:b => 2, :a => 3}).keys.should.equal [:a,:b]
+  end
+
+  it 'has to_a' do
+    Temple::ImmutableHash.new({:a => 1},{:b => 2, :a => 3}).to_a.should.equal [[:a, 1], [:b, 2]]
+  end
+end
+
+describe Temple::MutableHash do
+  it 'has write accessor' do
+    parent = {:a => 1}
+    hash = Temple::MutableHash.new(parent)
+    hash[:a].should.equal 1
+    hash[:a] = 2
+    hash[:a].should.equal 2
+    parent[:a].should.equal 1
+  end
+end

data/test/test_utils.rb

@@ -1,5 +1,9 @@
 require 'helper'
 
+class UniqueTest
+  include Temple::Utils
+end
+
 describe Temple::Utils do
   it 'has empty_exp?' do
     Temple::Utils.empty_exp?([:multi]).should.be.true
@@ -10,6 +14,13 @@ describe Temple::Utils do
     Temple::Utils.empty_exp?([:multi, [:newline], [:multi, [:dynamic, 'text']]]).should.be.false
   end
 
+  it 'has unique_name' do
+    u = UniqueTest.new
+    u.unique_name.should.equal '_uniquetest1'
+    u.unique_name.should.equal '_uniquetest2'
+    UniqueTest.new.unique_name.should.equal '_uniquetest1'
+  end
+
   it 'has escape_html' do
     Temple::Utils.escape_html('<').should.equal '&lt;'
   end
@@ -26,41 +37,3 @@ describe Temple::Utils do
     end
   end
 end
-
-describe Temple::Utils::ImmutableHash do
-  it 'has read accessor' do
-    hash = Temple::Utils::ImmutableHash.new({:a => 1},{:b => 2, :a => 3})
-    hash[:a].should.equal 1
-    hash[:b].should.equal 2
-  end
-
-  it 'has include?' do
-    hash = Temple::Utils::ImmutableHash.new({:a => 1},{:b => 2, :a => 3})
-    hash.should.include :a
-    hash.should.include :b
-    hash.should.not.include :c
-  end
-
-  it 'has values' do
-    Temple::Utils::ImmutableHash.new({:a => 1},{:b => 2, :a => 3}).values.sort.should.equal [1,2]
-  end
-
-  it 'has keys' do
-    Temple::Utils::ImmutableHash.new({:a => 1},{:b => 2, :a => 3}).keys.should.equal [:a,:b]
-  end
-
-  it 'has to_a' do
-    Temple::Utils::ImmutableHash.new({:a => 1},{:b => 2, :a => 3}).to_a.should.equal [[:a, 1], [:b, 2]]
-  end
-end
-
-describe Temple::Utils::MutableHash do
-  it 'has write accessor' do
-    parent = {:a => 1}
-    hash = Temple::Utils::MutableHash.new(parent)
-    hash[:a].should.equal 1
-    hash[:a] = 2
-    hash[:a].should.equal 2
-    parent[:a].should.equal 1
-  end
-end

metadata

@@ -2,7 +2,7 @@
 name: temple
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Magnus Holm
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +02:00
-default_executable: 
+date: 2011-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tilt
@@ -49,6 +48,8 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .yardopts
+- CHANGES
+- EXPRESSIONS.md
 - LICENSE
 - README.md
 - Rakefile
@@ -56,36 +57,52 @@ files:
 - lib/temple/engine.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/control_flow.rb
 - lib/temple/filters/dynamic_inliner.rb
-- lib/temple/filters/escape_html.rb
+- lib/temple/filters/eraser.rb
+- lib/temple/filters/escapable.rb
 - lib/temple/filters/multi_flattener.rb
 - lib/temple/filters/static_merger.rb
+- lib/temple/filters/validator.rb
 - lib/temple/generators.rb
+- lib/temple/grammar.rb
+- lib/temple/hash.rb
 - lib/temple/html/dispatcher.rb
 - lib/temple/html/fast.rb
+- lib/temple/html/filter.rb
 - lib/temple/html/pretty.rb
-- lib/temple/mixins.rb
+- lib/temple/mixins/dispatcher.rb
+- lib/temple/mixins/engine_dsl.rb
+- lib/temple/mixins/grammar_dsl.rb
+- lib/temple/mixins/options.rb
+- lib/temple/mixins/template.rb
 - lib/temple/templates.rb
 - lib/temple/templates/rails.rb
 - lib/temple/templates/tilt.rb
 - lib/temple/utils.rb
 - lib/temple/version.rb
 - temple.gemspec
+- test/filters/test_control_flow.rb
 - test/filters/test_dynamic_inliner.rb
-- test/filters/test_escape_html.rb
+- test/filters/test_eraser.rb
+- test/filters/test_escapable.rb
 - test/filters/test_multi_flattener.rb
 - test/filters/test_static_merger.rb
 - test/helper.rb
 - test/html/test_fast.rb
 - test/html/test_pretty.rb
+- test/mixins/test_dispatcher.rb
+- test/mixins/test_grammar_dsl.rb
 - test/test_engine.rb
 - test/test_erb.rb
+- test/test_filter.rb
 - test/test_generator.rb
+- test/test_grammar.rb
+- test/test_hash.rb
 - test/test_utils.rb
-has_rdoc: true
 homepage: http://dojo.rubyforge.org/
 licenses: []
 
@@ -109,19 +126,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Template compilation framework in Ruby
 test_files: 
+- test/filters/test_control_flow.rb
 - test/filters/test_dynamic_inliner.rb
-- test/filters/test_escape_html.rb
+- test/filters/test_eraser.rb
+- test/filters/test_escapable.rb
 - test/filters/test_multi_flattener.rb
 - test/filters/test_static_merger.rb
 - test/helper.rb
 - test/html/test_fast.rb
 - test/html/test_pretty.rb
+- test/mixins/test_dispatcher.rb
+- test/mixins/test_grammar_dsl.rb
 - test/test_engine.rb
 - test/test_erb.rb
+- test/test_filter.rb
 - test/test_generator.rb
+- test/test_grammar.rb
+- test/test_hash.rb
 - test/test_utils.rb

data/lib/temple/filters/debugger.rb

@@ -1,26 +0,0 @@
-module Temple
-  module Filters
-    # Filter which prints Temple expression
-    class Debugger < Filter
-      default_options[:debug_pretty] = true
-
-      def initialize(opts = {})
-        super
-        require 'pp' if options[:debug_pretty]
-      end
-
-      def call(exp)
-        if options[:debug]
-          puts options[:debug_prefix] if options[:debug_prefix]
-          if options[:debug_pretty]
-            pp exp
-          else
-            p exp
-          end
-          puts
-        end
-        exp
-      end
-    end
-  end
-end

data/lib/temple/filters/escape_html.rb

@@ -1,33 +0,0 @@
-module Temple
-  module Filters
-    class EscapeHTML < Filter
-      include Temple::HTML::Dispatcher
-
-      temple_dispatch :html
-
-      # Activate the usage of html_safe? if it is available (for Rails 3 for example)
-      default_options[:use_html_safe] = ''.respond_to?(:html_safe?)
-
-      def initialize(opts = {})
-        super
-        @escape = false
-      end
-
-      def on_escape(flag, exp)
-        old = @escape
-        @escape = flag
-        compile(exp)
-      ensure
-        @escape = old
-      end
-
-      def on_static(value)
-        [:static, @escape ? (options[:use_html_safe] ? escape_html_safe(value) : escape_html(value)) : value]
-      end
-
-      def on_dynamic(value)
-        [:dynamic, @escape ? "Temple::Utils.escape_html#{options[:use_html_safe] ? '_safe' : ''}((#{value}))" : value]
-      end
-    end
-  end
-end