temple 0.1.4 → 0.1.5

data/lib/temple/engine.rb

@@ -22,33 +22,35 @@ module Temple
   #   engine.compile(something)
   #
   class Engine
+    include Mixins::Options
+
     def self.filters
       @filters ||= []
     end
 
-    def self.use(filter, *args, &blk)
-      filters << [filter, args, blk]
+    def self.use(filter, *options, &block)
+      filters << [filter, options, block]
     end
 
     # Shortcut for <tt>use Temple::Filters::parser</tt>
-    def self.filter(filter, *args, &blk)
-      use(Temple::Filters.const_get(filter), *args, &blk)
+    def self.filter(filter, *options, &block)
+      use(Temple::Filters.const_get(filter), *options, &block)
     end
 
     # Shortcut for <tt>use Temple::Generators::parser</tt>
-    def self.generator(compiler, *args, &blk)
-      use(Temple::Generators.const_get(compiler), *args, &blk)
+    def self.generator(compiler, *options, &block)
+      use(Temple::Generators.const_get(compiler), *options, &block)
     end
 
-    def initialize(options = {})
-      @chain = self.class.filters.map do |filter, args, blk|
-        opt = args.last.is_a?(Hash) ? args.last.dup : {}
-        opt = args.inject(opt) do |memo, ele|
-          memo[ele] = options[ele] if options.has_key?(ele)
-          memo
-        end
+    def initialize(opts = {})
+      super
 
-        filter.new(opt, &blk)
+      @chain = self.class.filters.map do |filter, opt, block|
+        result = {}
+        opt.each do |key|
+          result[key] = options[key] if options.has_key?(key)
+        end
+        filter.new(result, &block)
       end
     end
 

data/lib/temple/filters/debugger.rb

@@ -2,10 +2,21 @@ 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 compile(exp)
         if options[:debug]
-          puts options[:prefix] if options[:prefix]
-          puts exp.inspect
+          puts options[:debug_prefix] if options[:debug_prefix]
+          if options[:debug_pretty]
+            pp exp
+          else
+            p exp
+          end
           puts
         end
         exp

data/lib/temple/filters/escape_html.rb

@@ -3,8 +3,11 @@ module Temple
     class EscapeHTML < Filter
       temple_dispatch :escape, :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 on_escape_static(value)
-        [:static, options[:user_html_safe] ? escape_html_safe(value) : escape_html(value)]
+        [:static, options[:use_html_safe] ? escape_html_safe(value) : escape_html(value)]
       end
 
       def on_escape_dynamic(value)

data/lib/temple/html/pretty.rb

@@ -4,8 +4,9 @@ module Temple
       set_default_options :indent => '  ',
                           :pretty => true
 
-      INDENT_TAGS = %w(base div doctype form head html img input li link meta ol
-                       script style table tbody td th thead title tr ul).freeze
+      INDENT_TAGS = %w(base dd div dl doctype dt fieldset form head h1 h2 h3
+                       h4 h5 h6 hr html img input li link meta ol p script
+                       style table tbody td tfoot th thead title tr ul).freeze
 
       def initialize(opts = {})
         super
@@ -14,21 +15,13 @@ module Temple
       end
 
       def on_static(content)
-        if options[:pretty]
-          @last = nil
-          [:static, content.gsub("\n", indent)]
-        else
-          [:static, content]
-        end
+        @last = nil
+        [:static, options[:pretty] ? content.gsub("\n", indent) : content]
       end
 
       def on_dynamic(content)
-        if options[:pretty]
-          @last = nil
-          [:dynamic, %{(#{content}).to_s.gsub("\n", #{indent.inspect})}]
-        else
-          [:dynamic, content]
-        end
+        @last = nil
+        [:dynamic, options[:pretty] ? %{(#{content}).to_s.gsub("\n", #{indent.inspect})} : content]
       end
 
       def on_html_doctype(type)
@@ -61,6 +54,8 @@ module Temple
         result
       end
 
+      protected
+
       # Return indentation if not in pre tag
       def indent
         @stack.include?('pre') ? '' : ("\n" + ((options[:indent] || '') * @stack.size))

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/temple.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version = Temple::VERSION
 
   s.authors = ["Magnus Holm"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2010-11-09}
   s.email = %q{judofyr@gmail.com}
   s.homepage = %q{http://dojo.rubyforge.org/}
   s.require_paths = ["lib"]
@@ -17,5 +17,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
+  # Tilt is only development dependency because most parts of Temple
+  # can be used without it.
+  s.add_development_dependency('tilt')
   s.add_development_dependency('bacon')
 end

data/test/html/test_pretty.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+describe Temple::HTML::Pretty do
+  before do
+    @html = Temple::HTML::Pretty.new
+  end
+
+  it 'should indent nested tags' do
+    @html.compile([:html, :tag, 'div', [:multi], false,
+      [:html, :tag, 'p', [:multi], false, [:static, 'text']]
+    ]).should.equal [:multi,
+                     [:static, "<div"],
+                     [:multi],
+                     [:static, ">"],
+                     [:multi,
+                      [:static, "\n  <p"],
+                      [:multi],
+                      [:static, ">"],
+                      [:static, "text"],
+                      [:static, "</p>"]],
+                     [:static, "\n</div>"]]
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Magnus Holm
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: tilt
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
@@ -29,6 +29,18 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: 
 email: judofyr@gmail.com
 executables: []
@@ -69,6 +81,7 @@ files:
 - test/filters/test_static_merger.rb
 - test/helper.rb
 - test/html/test_fast.rb
+- test/html/test_pretty.rb
 - test/test_erb.rb
 - test/test_generator.rb
 - test/test_utils.rb
@@ -109,6 +122,7 @@ test_files:
 - test/filters/test_static_merger.rb
 - test/helper.rb
 - test/html/test_fast.rb
+- test/html/test_pretty.rb
 - test/test_erb.rb
 - test/test_generator.rb
 - test/test_utils.rb