temple 0.5.4 → 0.5.5

data/CHANGES

@@ -1,3 +1,7 @@
+0.5.5
+
+  * HTML pretty: Do not remove empty lines, add newline after doctype
+
 0.5.4
 
   * HTML::AttributeMerger fixed, it didn't remove first empty attribute values

data/lib/temple/html/pretty.rb

@@ -8,7 +8,7 @@ module Temple
                                         fieldset figure footer form head h1 h2 h3 h4 h5 h6
                                         header hgroup hr html li link meta nav ol p
                                         rp rt ruby section script style table tbody td tfoot
-                                        th thead title tr ul video).freeze,
+                                        th thead title tr ul video doctype).freeze,
                      :pre_tags => %w(code pre textarea).freeze
 
       def initialize(opts = {})
@@ -26,7 +26,7 @@ module Temple
       def on_static(content)
         if @pretty
           content = content.gsub("\n", indent) if @pre_tags !~ content
-          @last = content.sub!(/\r?\n\s*$/, ' ') ? nil : :noindent
+          @last = :noindent
         end
         [:static, content]
       end
@@ -50,8 +50,8 @@ module Temple
       end
 
       def on_html_doctype(type)
-        @last = nil
-        super
+        return super unless @pretty
+        [:multi, [:static, tag_indent('doctype')], super]
       end
 
       def on_html_comment(content)
@@ -90,7 +90,6 @@ module Temple
         [:code, "#{@pre_tags_name} = /#{@pre_tags.source}/"]
       end
 
-      # Return indentation if not in pre tag
       def indent
         "\n" + (options[:indent] || '') * @indent
       end

data/lib/temple/version.rb

@@ -1,3 +1,3 @@
 module Temple
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: temple
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &6391160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6391160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &6390120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6390120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6389580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6389580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - judofyr@gmail.com
@@ -140,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Template compilation framework in Ruby
@@ -166,4 +181,3 @@ test_files:
 - test/test_grammar.rb
 - test/test_hash.rb
 - test/test_utils.rb
-has_rdoc: