htmlmin 0.0.3 → 0.0.4

data/README.md

@@ -8,7 +8,7 @@ Please report issues on [Github] (https://github.com/aishek/htmlmin/issues).
 
 For feedback, suggestions, etc. write to <aishek@gmail.com>.
 
-**Important**: this project is in beta and may contain bugs. Current version: 0.0.2
+**Important**: this project is in beta and may contain bugs. Current version: 0.0.4
 
 # Installation
 
@@ -23,6 +23,7 @@ Usage:
     require 'htmlmin'
     options = {
       :remove_comments => true,
+      :remove_conditional_comments => true, # only downlevel-hidden conditional comments e.g. <!--[if expression]> HTML <![endif]-->
       :minify_whitespaces => true,
       :max_line_len => 32768, # 0 - disable this safety feature
     }
@@ -41,8 +42,8 @@ Usage:
 * ~~Minify whitespaces after tag start and tag stop~~
 * ~~Minify whitespaces in text~~
 * ~~Remove comments~~
-* Do not remove conditional comments
-* Keep lines not longer that 30k (config option)
+* ~~Do not remove conditional comments~~
+* ~~Keep lines not longer that 30k (config option)~~
 * Do not perform minify in script and style tag's content
 * Do not perform minify in code, samp, pre tags's content
 * Replace entities with numeric entities for shorter strings

data/lib/htmlmin.rb

@@ -1,5 +1,6 @@
 require "htmlmin/version"
 require "htmlmin/buffer"
+require "htmlmin/state"
 require "htmlmin/max_line_len"
 require "htmlmin/slot_machines"
 
@@ -13,16 +14,18 @@ module HTMLMin
     END_OF_FILE = ''
 
     extend HTMLMin::Buffer
+    extend HTMLMin::State
     extend HTMLMin::MaxLineLen
     extend HTMLMin::SlotMachines::Common
     extend HTMLMin::SlotMachines::Comment
     extend HTMLMin::SlotMachines::Doctype
     extend HTMLMin::SlotMachines::Tag
-    
-    class << self
+
+    class << self     
       
       DEFAULT_OPTIONS = {
         :remove_comments => true,
+        :preserve_conditional_comments => true,
         
         :minify_whitespaces => true,
 
@@ -30,9 +33,8 @@ module HTMLMin
 
         :debug => false
       }
-      
-      
-      def minify(html, options = {})
+            
+      def minify(html, options = {})      
         init_settings options
         
         @result = ''
@@ -52,8 +54,9 @@ module HTMLMin
       def init_slot_machine
         init_max_line_len
         clear_buffer
-        @state = :text_prespaced
-        @prev_state = nil
+        
+        reset_saved_state
+        @state = :start
       end
       
       def run_slot_machine(html)
@@ -73,18 +76,7 @@ module HTMLMin
       def debug_log(char)
         p "char: #{char}, new state: #{@state.to_s}, buffer: '#{@result_buffer.join}', result: '#{@result}'"
       end
-      
-      def save_state
-        @prev_state = @state
-      end
-      
-      def restore_state
-        return false if @prev_state.nil?
-
-        @state = @prev_state
-        return true
-      end
-      
+                  
     end
     
     

data/lib/htmlmin/slot_machines/comment.rb

@@ -8,54 +8,385 @@ module HTMLMin
 
       def comment_begin_1(char)
         case char
-          when "\s", "\n", "\r", "\t", " "
-            flush_buffer
-            change_state_to_text_prespaced char
           when '-'
+            unshift_spaces_from_buffer if saved_state_unshiftable?
+            reset_saved_state
+            
             add_to_buffer char
-            change_state_to :comment_start_end
+            change_state_to :comment_or_cc
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+
             flush_buffer
+
             add_to_result char
             change_state_to :start
         end
       end
+      
+      def comment_or_cc(char)
+        case char
+          when '['
+            add_to_buffer char
+            change_state_to :cc
+          when '-'
+            add_to_buffer char
+            change_state_to :comment_end_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :comment
+        end        
+      end
+      
+      def cc(char)
+        case char
+          when ']'
+            add_to_buffer char
+            change_state_to :cc_1
+          when '-'
+            add_to_buffer char
+            change_state_to :comment_end_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+        end        
+      end
+      
+      def cc_1(char)
+        case char
+          when '>'
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+          when '-'
+            add_to_buffer char
+            change_state_to :comment_end_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :comment
+        end        
+      end
+      
+      # wait for <![endif]-->,
+      # if --> then it just a simple comment
+      def cc_begin_ended(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+        end        
+      end
+      
+      def cc_begin_ended_1(char)
+        case char
+          when '<'
+            add_to_buffer char
+          when '!'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_2
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+        end        
+      end
 
-      def comment_start_end(char)
-        return if char == HTMLMin::Minifier::END_OF_FILE
-        
-        add_to_buffer char
-        change_state_to :comment
+      def cc_begin_ended_2(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '['
+            add_to_buffer char
+            change_state_to :cc_begin_ended_3
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
       end
 
-      def comment(char)
-        return if char == HTMLMin::Minifier::END_OF_FILE
+      def cc_begin_ended_3(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when 'e'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_4
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_4(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when 'n'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_5
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_5(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when 'd'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_6
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_6(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when 'i'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_7
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_7(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when 'f'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_8
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_8(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when ']'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_9
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_1
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
 
-        add_to_buffer char
-        change_state_to :comment_end_1 if char == '-'
+      def cc_begin_ended_9(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_10
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_10(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_11
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_11(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '>'
+            add_to_buffer char
+            clear_buffer if @settings[:remove_conditional_comments]
+            flush_buffer
+
+            change_state_to :entity_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+      
+      def cc_begin_ended_simple_1(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '-'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_simple_2
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+
+      def cc_begin_ended_simple_2(char)
+        case char
+          when '<'
+            add_to_buffer char
+            change_state_to :cc_begin_ended_1
+          when '>'
+            add_to_buffer char
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+
+            change_state_to :entity_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          else
+            add_to_buffer char
+            change_state_to :cc_begin_ended
+        end        
+      end
+      
+      def comment(char)
+        case char
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          when '-'
+            add_to_buffer char
+            change_state_to :comment_end_1
+          else
+            add_to_buffer char
+        end
       end
 
       def comment_end_1(char)
-        return if char == HTMLMin::Minifier::END_OF_FILE
-        
-        add_to_buffer char
-        change_state_to (char == '-' ? :comment_end_2 : :comment)
+        case char
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          when '-'
+            add_to_buffer char
+            change_state_to :comment_end_2
+          else
+            add_to_buffer char
+            change_state_to :comment
+        end
       end
 
       def comment_end_2(char)
-        return if char == HTMLMin::Minifier::END_OF_FILE
-
-        if char == '>'
-          clear_buffer
-          change_state_to :start unless restore_state
-        else
-          add_to_buffer char
-          change_state_to :comment
+        case char
+          when HTMLMin::Minifier::END_OF_FILE
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          when '>'
+            add_to_buffer char
+            clear_buffer if @settings[:remove_comments]
+            flush_buffer
+          
+            change_state_to :entity_ended
+          else
+            add_to_buffer char
+            change_state_to :comment
         end
       end
-      
+                  
     end
     
   end

data/lib/htmlmin/slot_machines/common.rb

@@ -5,67 +5,61 @@ module HTMLMin
     module Common
 
       private
-      
-      def add_to_result(char)
-        @result += char
-        
-        check_max_line_len(char) if @settings[:max_line_len] > 0
-      end
-        
-      def change_state_to(new_state)
-        @state = new_state
-      end
-        
+            
       def tag_or_tagend_or_comment_or_doctype_begin(char)
         case char
-          when "\s", "\n", "\r", "\t", " "
-            flush_buffer
-            change_state_to_text_prespaced char
-          when "/"
-            add_to_buffer char
-            change_state_to :tag_end
           when "!"
             add_to_buffer char
             change_state_to :comment_or_doctype_begin
-          when "a".."z", "A".."Z"
+          when "/"
+            add_to_buffer char
+            change_state_to :tagend_body_expected
+          when 'a'..'z', 'A'..'Z'
             add_to_buffer char
-            change_state_to :tag_begin
+            change_state_to :tag
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+
             flush_buffer
+
             add_to_result char
             change_state_to :start
         end
       end
-
+      
       def comment_or_doctype_begin(char)
         case char
-          when "\s", "\n", "\r", "\t", " "
-            flush_buffer
-            change_state_to_text_prespaced char
           when "-"
-            if @settings[:remove_comments]
-              add_to_buffer char
-              change_state_to :comment_begin_1
-            else
-              flush_buffer
-              add_to_result char
-              change_state_to :start
-            end
+            add_to_buffer char
+            change_state_to :comment_begin_1
           when 'D'
             add_to_buffer char
             change_state_to :doctype_begin_1
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+
             flush_buffer
+
             add_to_result char
             change_state_to :start
         end
       end
-
-      def text_prespaced(char)              
+      
+      def add_to_result(char)
+        @result += char
+        
+        check_max_line_len(char) if @settings[:max_line_len] > 0
+      end
+        
+      def change_state_to(new_state)
+        @state = new_state
+      end
+      
+      def spaces(char)              
         case char
           when "\s", "\n", "\r", "\t", " "
             if @settings[:minify_whitespaces]
@@ -74,28 +68,25 @@ module HTMLMin
               add_to_buffer char
             end
           when "<"
-            flush_buffer unless @settings[:minify_whitespaces]
-
-            unshift_spaces_from_buffer
-            add_to_buffer char
-            change_state_to :tag_or_tagend_or_comment_or_doctype_begin
+            flush_buffer if saved_state_empty?
+            change_state_to_tag_or_tagend_or_comment_or_doctype_begin char
           when HTMLMin::Minifier::END_OF_FILE
-            unshift_spaces_from_buffer
             flush_buffer
           else
+            reset_saved_state
             flush_buffer
+
             add_to_result char
             change_state_to :start
         end
       end
-  
+        
       def start(char)
         case char
           when "\s", "\n", "\r", "\t"
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when "<"
-            add_to_buffer char
-            change_state_to :tag_or_tagend_or_comment_or_doctype_begin            
+            change_state_to_tag_or_tagend_or_comment_or_doctype_begin char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
@@ -103,11 +94,35 @@ module HTMLMin
             change_state_to :start
         end
       end
-    
-      def change_state_to_text_prespaced(char)
-        add_to_buffer (@settings[:minify_whitespaces] ? ' ' : char)
-        change_state_to :text_prespaced
+      
+      def entity_ended(char)
+        return if char == HTMLMin::Minifier::END_OF_FILE
+
+        case char
+          when "\s", "\n", "\r", "\t", " "
+            save_state
+            change_state_to_spaces char
+          when "<"
+            change_state_to_tag_or_tagend_or_comment_or_doctype_begin char
+          else
+            add_to_result char
+            change_state_to :start
+        end
       end
+      
+      def change_state_to_tag_or_tagend_or_comment_or_doctype_begin(char)
+        add_to_buffer char            
+        change_state_to :tag_or_tagend_or_comment_or_doctype_begin
+      end
+      
+      def change_state_to_spaces(char)
+        if @settings[:minify_whitespaces]
+          add_to_buffer ' '
+        else
+          add_to_result char
+        end
+        change_state_to :spaces
+      end    
     
     end
     

data/lib/htmlmin/slot_machines/doctype.rb

@@ -12,46 +12,60 @@ module HTMLMin
             add_to_buffer char
             change_state_to :doctype_begin_2
           when "\s", "\n", "\r", "\t", " "
-            change_state_to_text_prespaced char
+            reset_saved_state
+            
+            flush_buffer
+          
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
 
             add_to_result char
             change_state_to :start
-        end
+        end          
       end
-      
+
       def doctype_begin_2(char)
         case char
           when "C"
             add_to_buffer char
             change_state_to :doctype_begin_3
           when "\s", "\n", "\r", "\t", " "
+            reset_saved_state
+            
             flush_buffer
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
 
             add_to_result char
             change_state_to :start
         end
       end
-      
+
       def doctype_begin_3(char)
         case char
           when "T"
             add_to_buffer char
             change_state_to :doctype_begin_4
           when "\s", "\n", "\r", "\t", " "
+            reset_saved_state
+            
             flush_buffer
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
 
             add_to_result char
@@ -65,11 +79,15 @@ module HTMLMin
             add_to_buffer char
             change_state_to :doctype_begin_5
           when "\s", "\n", "\r", "\t", " "
+            reset_saved_state
+            
             flush_buffer
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
 
             add_to_result char
@@ -83,11 +101,15 @@ module HTMLMin
             add_to_buffer char
             change_state_to :doctype_begin_6
           when "\s", "\n", "\r", "\t", " "
+            reset_saved_state
+            
             flush_buffer
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
 
             add_to_result char
@@ -101,31 +123,42 @@ module HTMLMin
             add_to_buffer char
             change_state_to :doctype_begin_7
           when "\s", "\n", "\r", "\t", " "
+            reset_saved_state
+            
             flush_buffer
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
 
             add_to_result char
             change_state_to :start
         end
       end
-
+      
       def doctype_begin_7(char)
         case char
           when " "
+            unshift_spaces_from_buffer if saved_state_unshiftable?
+            reset_saved_state
+            
             add_to_buffer char
             change_state_to :doctype
           when "\s", "\n", "\r", "\t"
+            reset_saved_state
+            
             flush_buffer
-            change_state_to_text_prespaced char
+            change_state_to_spaces char
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+            
             flush_buffer
-
+      
             add_to_result char
             change_state_to :start
         end
@@ -136,18 +169,18 @@ module HTMLMin
           when '>'
             add_to_buffer char
 
-            unshift_spaces_from_buffer
             flush_buffer
           
             add_to_result "\n" 
-            change_state_to :start
+            change_state_to :entity_ended
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            
             add_to_buffer char
         end        
       end
-      
+          
     end
     
   end

data/lib/htmlmin/slot_machines/tag.rb

@@ -6,90 +6,69 @@ module HTMLMin
 
       private
 
-      def tag_end(char)
+      def tag(char)
         case char
-          when "a".."z", "A".."Z"
-            add_to_buffer char
-            change_state_to :tag_end_body
-          when HTMLMin::Minifier::END_OF_FILE
-            flush_buffer
-          else
-            flush_buffer
-            change_state_to :start
-        end
-      end
-
-      def tag_end_body(char)
-        case char
-          when "a".."z", "A".."Z"
+          when 'a'..'z', 'A'..'Z'
             add_to_buffer char
           when '>'
+            unshift_spaces_from_buffer if saved_state_unshiftable?
+            
             add_to_buffer char
-
-            unshift_spaces_from_buffer
             flush_buffer
-
-            change_state_to :tag_ended
+          
+            change_state_to :entity_ended
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+
             flush_buffer
+
+            add_to_result char
             change_state_to :start
         end
       end
 
-      def tag_begin(char)
+      def tagend_body_expected(char)
         case char
-          when "/"
-            add_to_buffer char
-            change_state_to :tag_end_expected
-          when ">"
+          when 'a'..'z', 'A'..'Z'
             add_to_buffer char
-            change_state_to :tag_ended
-          when HTMLMin::Minifier::END_OF_FILE
-            flush_buffer
-          else
-            add_to_buffer char
-        end
-      end
-      
-      def tag_end_expected(char)
-        case char
-          when '>'
-            add_to_buffer char
-            change_state_to :tag_ended
+            change_state_to :tagend_body
           when HTMLMin::Minifier::END_OF_FILE
             flush_buffer
           else
+            reset_saved_state
+
             flush_buffer
+
+            add_to_result char
             change_state_to :start
         end
       end
-      
-      def tag_ended(char)
+
+      def tagend_body(char)
         case char
-          when "\s", "\n", "\r", "\t", " "
-            add_to_buffer char unless @settings[:minify_whitespaces]
-          when '<'
-            save_state
-            
-            unshift_spaces_from_buffer
-            flush_buffer
+          when 'a'..'z', 'A'..'Z'
+            add_to_buffer char
+          when '>'
+            unshift_spaces_from_buffer if saved_state_unshiftable?
             
             add_to_buffer char
-            change_state_to :tag_or_tagend_or_comment_or_doctype_begin
+            flush_buffer
+          
+            change_state_to :entity_ended
           when HTMLMin::Minifier::END_OF_FILE
-            unshift_spaces_from_buffer
             flush_buffer
           else
-            unshift_spaces_from_buffer
-            flush_buffer            
-            
+            reset_saved_state
+
+            flush_buffer
+
             add_to_result char
             change_state_to :start
         end
       end
-
+      
     end
 
   end

data/lib/htmlmin/state.rb

@@ -0,0 +1,25 @@
+module HTMLMin
+  
+  module State
+    
+    private 
+
+    def save_state
+      @prev_state = @state
+    end
+    
+    def reset_saved_state
+      @prev_state = nil
+    end
+    
+    def saved_state_empty?
+      @prev_state.nil?
+    end
+    
+    def saved_state_unshiftable?
+      @prev_state == :entity_ended
+    end
+    
+  end
+  
+end

data/lib/htmlmin/version.rb

@@ -1,3 +1,3 @@
 module Htmlmin
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/input/cc_1.txt

@@ -5,4 +5,5 @@
 <!--[if gte IE 8]>
 <p>Internet Explorer 8 or later</p>
 <![endif]-->
+<![if expression]> HTML <![endif]>
 </html>

data/test/input/cc_2.txt

@@ -0,0 +1,9 @@
+<html>
+<!--[if lte IE 7]>
+<p>Internet Explorer 7 or older</p>
+<![endif]-->
+<!-- comment should be removed -->
+<!--[if lte IE 7]>
+<p>also should be removed</p>
+-->
+</html>

data/test/input/doctype_3.txt

@@ -0,0 +1,6 @@
+
+ <!-- hello before doctype -->
+
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><!-- no way comment -->
+       
+       <html>

data/test/input/tag_3.txt

@@ -0,0 +1,3 @@
+<p> hello </p>
+<p> how <em>are</em> you? </p>
+<p> <small> <strong> nothing?</strong> </small> </p>

data/test/options/cc_1.rb

@@ -0,0 +1,8 @@
+{
+  :remove_comments => true,
+  :remove_conditional_comments => true,
+  
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/cc_2.rb

@@ -0,0 +1,8 @@
+{
+  :remove_comments => true,
+  :remove_conditional_comments => false,
+  
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/comment_1.rb

@@ -0,0 +1,8 @@
+{
+  :remove_comments => true,
+  :preserve_conditional_comments => false,
+  
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/comment_6.rb

@@ -0,0 +1,8 @@
+{
+  :remove_comments => true,
+
+  :minify_whitespaces => true,
+  :max_line_len => 0,
+
+  :debug => false
+}

data/test/options/comment_7.rb

@@ -2,6 +2,6 @@
   :remove_comments => false,
 
   :minify_whitespaces => true,
-  :debug => false,
-  :max_line_len => 0
+  :max_line_len => 0,
+  :debug => false
 }

data/test/options/comment_8.rb

@@ -2,6 +2,5 @@
   :remove_comments => true,
 
   :minify_whitespaces => false,
-  :debug => false,
   :max_line_len => 0
 }

data/test/options/doctype_3.rb

@@ -0,0 +1,8 @@
+{
+  :remove_comments => true,
+  :preserve_conditional_comments => false,
+  
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/options/tag_2.rb

@@ -0,0 +1,8 @@
+{
+  :minify_whitespaces => true,
+  
+  :max_line_len => 0,
+  :remove_comments => true,
+  :preserve_conditional_comments => false,  
+  :debug => false
+}

data/test/options/tag_3.rb

@@ -0,0 +1,8 @@
+{
+  :remove_comments => true,
+  :preserve_conditional_comments => false,
+  
+  :max_line_len => 0,
+  :minify_whitespaces => true,
+  :debug => false
+}

data/test/output/cc_1.txt

@@ -1 +1 @@
-<html></html>
+<html> <![if expression]> HTML <![endif]> </html>

data/test/output/cc_2.txt

@@ -0,0 +1,3 @@
+<html><!--[if lte IE 7]>
+<p>Internet Explorer 7 or older</p>
+<![endif]--></html>

data/test/output/comment_6.txt

@@ -1 +1 @@
-<p>Fix me</p>
+<p> Fix me </p>

data/test/output/comment_7.txt

@@ -1 +1,2 @@
-<!-- this comment should stay here --><!-- this should also -- because this is not comment<!-- and no whitespaces! -->
+<!-- this comment should stay here --><!-- this should also -- because this is not comment
+<!-- and no whitespaces! -->

data/test/output/doctype_3.txt

@@ -0,0 +1,2 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>

data/test/output/tag_1.txt

@@ -1 +1 @@
-<p><em>nothing at all</em></p>
+<p><em> nothing at all</em></p>

data/test/output/tag_3.txt

@@ -0,0 +1 @@
+<p> hello </p><p> how <em>are</em> you? </p><p><small><strong> nothing?</strong></small></p>

data/test/output/text_3.txt

@@ -1 +1 @@
-<p>please, stay with me</p>
+<p> please, stay with me </p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmlmin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-08-26 00:00:00.000000000Z
 dependencies: []
 description: HTMLMin is a HTML-code minification tool implemented in Ruby. It works
   like a slot machine.
@@ -32,8 +32,10 @@ files:
 - lib/htmlmin/slot_machines/common.rb
 - lib/htmlmin/slot_machines/doctype.rb
 - lib/htmlmin/slot_machines/tag.rb
+- lib/htmlmin/state.rb
 - lib/htmlmin/version.rb
 - test/input/cc_1.txt
+- test/input/cc_2.txt
 - test/input/comment_1.txt
 - test/input/comment_2.txt
 - test/input/comment_3.txt
@@ -44,22 +46,32 @@ files:
 - test/input/comment_8.txt
 - test/input/doctype_1.txt
 - test/input/doctype_2.txt
+- test/input/doctype_3.txt
 - test/input/line_length_1.txt
 - test/input/line_length_2.txt
 - test/input/line_length_3.txt
 - test/input/line_length_4.txt
 - test/input/tag_1.txt
 - test/input/tag_2.txt
+- test/input/tag_3.txt
 - test/input/text_1.txt
 - test/input/text_2.txt
 - test/input/text_3.txt
+- test/options/cc_1.rb
+- test/options/cc_2.rb
+- test/options/comment_1.rb
+- test/options/comment_6.rb
 - test/options/comment_7.rb
 - test/options/comment_8.rb
+- test/options/doctype_3.rb
 - test/options/line_length_1.rb
 - test/options/line_length_2.rb
 - test/options/line_length_3.rb
 - test/options/line_length_4.rb
+- test/options/tag_2.rb
+- test/options/tag_3.rb
 - test/output/cc_1.txt
+- test/output/cc_2.txt
 - test/output/comment_1.txt
 - test/output/comment_2.txt
 - test/output/comment_3.txt
@@ -70,12 +82,14 @@ files:
 - test/output/comment_8.txt
 - test/output/doctype_1.txt
 - test/output/doctype_2.txt
+- test/output/doctype_3.txt
 - test/output/line_length_1.txt
 - test/output/line_length_2.txt
 - test/output/line_length_3.txt
 - test/output/line_length_4.txt
 - test/output/tag_1.txt
 - test/output/tag_2.txt
+- test/output/tag_3.txt
 - test/output/text_1.txt
 - test/output/text_2.txt
 - test/output/text_3.txt
@@ -107,6 +121,7 @@ specification_version: 3
 summary: HTMLMin is a HTML-code minification tool
 test_files:
 - test/input/cc_1.txt
+- test/input/cc_2.txt
 - test/input/comment_1.txt
 - test/input/comment_2.txt
 - test/input/comment_3.txt
@@ -117,22 +132,32 @@ test_files:
 - test/input/comment_8.txt
 - test/input/doctype_1.txt
 - test/input/doctype_2.txt
+- test/input/doctype_3.txt
 - test/input/line_length_1.txt
 - test/input/line_length_2.txt
 - test/input/line_length_3.txt
 - test/input/line_length_4.txt
 - test/input/tag_1.txt
 - test/input/tag_2.txt
+- test/input/tag_3.txt
 - test/input/text_1.txt
 - test/input/text_2.txt
 - test/input/text_3.txt
+- test/options/cc_1.rb
+- test/options/cc_2.rb
+- test/options/comment_1.rb
+- test/options/comment_6.rb
 - test/options/comment_7.rb
 - test/options/comment_8.rb
+- test/options/doctype_3.rb
 - test/options/line_length_1.rb
 - test/options/line_length_2.rb
 - test/options/line_length_3.rb
 - test/options/line_length_4.rb
+- test/options/tag_2.rb
+- test/options/tag_3.rb
 - test/output/cc_1.txt
+- test/output/cc_2.txt
 - test/output/comment_1.txt
 - test/output/comment_2.txt
 - test/output/comment_3.txt
@@ -143,12 +168,14 @@ test_files:
 - test/output/comment_8.txt
 - test/output/doctype_1.txt
 - test/output/doctype_2.txt
+- test/output/doctype_3.txt
 - test/output/line_length_1.txt
 - test/output/line_length_2.txt
 - test/output/line_length_3.txt
 - test/output/line_length_4.txt
 - test/output/tag_1.txt
 - test/output/tag_2.txt
+- test/output/tag_3.txt
 - test/output/text_1.txt
 - test/output/text_2.txt
 - test/output/text_3.txt