temple 0.1.6 → 0.1.7

data/lib/temple/engine.rb

@@ -29,8 +29,9 @@ module Temple
     end
 
     def self.use(filter, *options, &block)
+      default_options = Hash === options.last ? options.pop : {}
       chain << proc do |opts|
-        filter.new(Hash[*opts.select {|k,v| options.include?(k) }.flatten], &block)
+        filter.new(default_options.merge(Hash[*opts.select {|k,v| options.include?(k) }.flatten]), &block)
       end
     end
 
@@ -44,8 +45,8 @@ module Temple
       use(Temple::Generators.const_get(compiler), *options, &block)
     end
 
-    def compile(thing)
-      chain.inject(thing) {|m, e| e.compile(m) }
+    def compile(input)
+      chain.inject(input) {|m, e| e.compile(m) }
     end
 
     protected

data/lib/temple/html/pretty.rb

@@ -3,7 +3,7 @@ module Temple
     class Pretty < Fast
       set_default_options :indent => '  ',
                           :pretty => true,
-                          :indent_tags => %w(base dd div dl doctype dt fieldset form head h1 h2 h3
+                          :indent_tags => %w(base body 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,
                           :pre_tags => %w(pre textarea).freeze
@@ -12,16 +12,21 @@ module Temple
         super
         @last = nil
         @indent = 0
+        @pretty = options[:pretty]
+      end
+
+      def compile(exp)
+        [:multi, preamble, compile!(exp)]
       end
 
       def on_static(content)
         @last = nil
-        [:static, options[:pretty] && !@preformatted ? content.gsub("\n", indent) : content]
+        [:static, @pretty ? content.gsub("\n", indent) : content]
       end
 
       def on_dynamic(content)
         @last = nil
-        [:dynamic, options[:pretty] && !@preformatted ? %{(#{content}).to_s.gsub("\n", #{indent.inspect})} : content]
+        [:dynamic, @pretty ? "Temple::Utils.indent((#{content}), #{indent.inspect}, _temple_pre_tags)" : content]
       end
 
       def on_html_doctype(type)
@@ -30,34 +35,40 @@ module Temple
       end
 
       def on_html_comment(content)
-        return super if !options[:pretty]
+        return super unless @pretty
         [:multi, [:static, indent], super]
       end
 
       def on_html_tag(name, attrs, closed, content)
-        return super if !options[:pretty] || @preformatted
+        return super unless @pretty
 
         closed ||= options[:autoclose].include?(name)
         raise "Closed tag #{name} has content" if closed && !empty_exp?(content)
 
+        @pretty = false
         result = [:multi, [:static, "#{tag_indent(name)}<#{name}"], compile!(attrs)]
         result << [:static, ' /'] if closed && xhtml?
         result << [:static, '>']
 
         @last = name
-        @preformatted = options[:pre_tags].include?(name)
+        @pretty = !options[:pre_tags].include?(name)
         @indent += 1
         result << compile!(content)
         @indent -= 1
 
         result << [:static, "#{tag_indent(name)}</#{name}>"] if !closed
         @last = name
-        @preformatted = false
+        @pretty = true
         result
       end
 
       protected
 
+      def preamble
+        regexp = options[:pre_tags].map {|t| "<#{t}" }.join('|')
+        [:block, "_temple_pre_tags = /#{regexp}/"]
+      end
+
       # Return indentation if not in pre tag
       def indent
         "\n" + (options[:indent] || '') * @indent

data/lib/temple/utils.rb

@@ -2,6 +2,10 @@ module Temple
   module Utils
     extend self
 
+    def indent(text, indent, pre_tags)
+      pre_tags =~ text ? text : text.gsub("\n", indent)
+    end
+
     # Returns an escaped copy of `html`.
     # Strings which are declared as html_safe are not escaped.
     #

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 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-22}
+  s.date = %q{2011-01-19}
   s.email = %q{judofyr@gmail.com}
   s.homepage = %q{http://dojo.rubyforge.org/}
   s.require_paths = ["lib"]

data/test/html/test_pretty.rb

@@ -7,18 +7,22 @@ describe Temple::HTML::Pretty do
 
   it 'should indent nested tags' do
     @html.compile([:html, :tag, 'div', [:multi], false,
-      [:html, :tag, 'p', [:multi], false, [:static, 'text']]
+      [:html, :tag, 'p', [:multi], false, [:multi, [:static, 'text'], [:dynamic, 'code']]]
     ]).should.equal [:multi,
-                     [:static, "<div"],
-                     [:multi],
-                     [:static, ">"],
+                     [:block, "_temple_pre_tags = /<pre|<textarea/"],
                      [:multi,
-                      [:static, "\n  <p"],
+                      [:static, "<div"],
                       [:multi],
                       [:static, ">"],
-                      [:static, "text"],
-                      [:static, "</p>"]],
-                     [:static, "\n</div>"]]
+                      [:multi,
+                       [:static, "\n  <p"],
+                       [:multi],
+                       [:static, ">"],
+                       [:multi,
+                        [:static, "text"],
+                       [:dynamic, 'Temple::Utils.indent((code), "\n    ", _temple_pre_tags)']],
+                       [:static, "</p>"]],
+                      [:static, "\n</div>"]]]
   end
 
 
@@ -26,15 +30,17 @@ describe Temple::HTML::Pretty do
     @html.compile([:html, :tag, 'pre', [:multi], false,
       [:html, :tag, 'p', [:multi], false, [:static, 'text']]
     ]).should.equal [:multi,
-                     [:static, "<pre"],
-                     [:multi],
-                     [:static, ">"],
+                     [:block, "_temple_pre_tags = /<pre|<textarea/"],
                      [:multi,
-                      [:static, "<p"],
+                      [:static, "<pre"],
                       [:multi],
                       [:static, ">"],
-                      [:static, "text"],
-                      [:static, "</p>"]],
-                     [:static, "</pre>"]]
+                      [:multi,
+                       [:static, "<p"],
+                       [:multi],
+                       [:static, ">"],
+                       [:static, "text"],
+                       [:static, "</p>"]],
+                      [:static, "</pre>"]]]
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Magnus Holm
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 +01:00
+date: 2011-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency