htmlmin 0.0.1 → 0.0.2

data/README.md

@@ -1,14 +1,14 @@
 # Introduction
 
-HTMLMIN (HTML minimizer) is a HTML minimizer written in Ruby wich acts like a slot machine.
+HTMLMin (HTML minimizer) is a HTML minimizer written in Ruby wich acts like a slot machine.
 
-This document describes installation, usage, available minifications and development roadmap of HTMLMIN.
+This document describes installation, usage, available minifications and development roadmap of HTMLMin.
 
 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.1
+**Important**: this project is in beta and may contain bugs. Current version: 0.0.2
 
 # Installation
 
@@ -61,4 +61,4 @@ Idea & implementation&nbsp;— Alexandr Borisov (<aishek@gmail.com>)
 
 # Licence
 
-HTMLMIN is licensed under [MIT](https://github.com/afelix/csso/blob/master/MIT-LICENSE.txt)
+HTMLMin is licensed under [MIT](https://github.com/afelix/csso/blob/master/MIT-LICENSE.txt)

data/lib/htmlmin/slot_machines/comment.rb

@@ -14,6 +14,8 @@ module HTMLMin
           when '-'
             add_to_buffer char
             change_state_to :comment_start_end
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
             add_to_result char
@@ -22,21 +24,29 @@ module HTMLMin
       end
 
       def comment_start_end(char)
+        return if char == HTMLMin::Minifier::END_OF_FILE
+        
         add_to_buffer char
         change_state_to :comment
       end
 
       def comment(char)
+        return if char == HTMLMin::Minifier::END_OF_FILE
+
         add_to_buffer char
         change_state_to :comment_end_1 if char == '-'
       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)
       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

data/lib/htmlmin/slot_machines/common.rb

@@ -28,6 +28,8 @@ module HTMLMin
           when "a".."z", "A".."Z"
             add_to_buffer char
             change_state_to :tag_begin
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
             add_to_result char
@@ -52,6 +54,8 @@ module HTMLMin
           when 'D'
             add_to_buffer char
             change_state_to :doctype_begin_1
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
             add_to_result char
@@ -68,8 +72,14 @@ 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
+          when HTMLMin::Minifier::END_OF_FILE
+            unshift_spaces_from_buffer
+            flush_buffer
           else
             flush_buffer
             add_to_result char
@@ -84,6 +94,8 @@ module HTMLMin
           when "<"
             add_to_buffer char
             change_state_to :tag_or_tagend_or_comment_or_doctype_begin            
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             add_to_result char
             change_state_to :start

data/lib/htmlmin/slot_machines/doctype.rb

@@ -13,6 +13,8 @@ module HTMLMin
             change_state_to :doctype_begin_2
           when "\s", "\n", "\r", "\t", " "
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -29,6 +31,8 @@ module HTMLMin
           when "\s", "\n", "\r", "\t", " "
             flush_buffer
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -45,6 +49,8 @@ module HTMLMin
           when "\s", "\n", "\r", "\t", " "
             flush_buffer
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -61,6 +67,8 @@ module HTMLMin
           when "\s", "\n", "\r", "\t", " "
             flush_buffer
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -77,6 +85,8 @@ module HTMLMin
           when "\s", "\n", "\r", "\t", " "
             flush_buffer
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -93,6 +103,8 @@ module HTMLMin
           when "\s", "\n", "\r", "\t", " "
             flush_buffer
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -109,6 +121,8 @@ module HTMLMin
           when "\s", "\n", "\r", "\t"
             flush_buffer
             change_state_to_text_prespaced char
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
 
@@ -118,14 +132,20 @@ module HTMLMin
       end
       
       def doctype(char)
-        add_to_buffer char
-        if char == '>'          
-          unshift_spaces_from_buffer
-          flush_buffer
+        case char
+          when '>'
+            add_to_buffer char
+
+            unshift_spaces_from_buffer
+            flush_buffer
           
-          add_to_result "\n" 
-          change_state_to :start
-        end
+            add_to_result "\n" 
+            change_state_to :start
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
+          else
+            add_to_buffer char
+        end        
       end
       
     end

data/lib/htmlmin/slot_machines/tag.rb

@@ -11,6 +11,8 @@ module HTMLMin
           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
@@ -28,6 +30,8 @@ module HTMLMin
             flush_buffer
 
             change_state_to :tag_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
             change_state_to :start
@@ -35,12 +39,17 @@ module HTMLMin
       end
 
       def tag_begin(char)
-        add_to_buffer char
         case char
           when "/"
+            add_to_buffer char
             change_state_to :tag_end_expected
           when ">"
+            add_to_buffer char
             change_state_to :tag_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
+          else
+            add_to_buffer char
         end
       end
       
@@ -49,6 +58,8 @@ module HTMLMin
           when '>'
             add_to_buffer char
             change_state_to :tag_ended
+          when HTMLMin::Minifier::END_OF_FILE
+            flush_buffer
           else
             flush_buffer
             change_state_to :start
@@ -58,7 +69,7 @@ module HTMLMin
       def tag_ended(char)
         case char
           when "\s", "\n", "\r", "\t", " "
-            add_to_result char unless @settings[:minify_whitespaces]
+            add_to_buffer char unless @settings[:minify_whitespaces]
           when '<'
             save_state
             
@@ -67,6 +78,9 @@ module HTMLMin
             
             add_to_buffer char
             change_state_to :tag_or_tagend_or_comment_or_doctype_begin
+          when HTMLMin::Minifier::END_OF_FILE
+            unshift_spaces_from_buffer
+            flush_buffer
           else
             unshift_spaces_from_buffer
             flush_buffer            

data/lib/htmlmin/version.rb

@@ -1,3 +1,3 @@
 module Htmlmin
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/htmlmin.rb

@@ -9,6 +9,8 @@ module HTMLMin
   end
   
   class Minifier
+    END_OF_FILE = ''
+
     extend HTMLMin::Buffer
     extend HTMLMin::SlotMachines::Common
     extend HTMLMin::SlotMachines::Comment
@@ -25,6 +27,7 @@ module HTMLMin
         :debug => false
       }
       
+      
       def minify(html, options = {})
         init_settings options
         
@@ -55,15 +58,15 @@ module HTMLMin
           char = input[pos]
           
           self.send @state, char
-          debug_log if @settings[:debug]
+          debug_log(char) if @settings[:debug]
         
           pos += 1
         end
-        self.send @state, ''
+        self.send @state, HTMLMin::Minifier::END_OF_FILE
       end
       
-      def debug_log
-        p "char: #{char}, state: #{@state.to_s}, buffer: #{@result_buffer.join('')}"
+      def debug_log(char)
+        p "char: #{char}, new state: #{@state.to_s}, buffer: '#{@result_buffer.join}', result: '#{@result}'"
       end
       
       def save_state

data/test/input/comment_7.txt

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

data/test/input/comment_8.txt

@@ -0,0 +1,7 @@
+<!-- tag start -->
+<p>
+<!-- text begin -->
+Fix me
+<!-- <p>Fix me</p> - it's a paragraph -->
+</p>
+<!-- tag end -->

data/test/options/comment_7.rb

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

data/test/options/comment_8.rb

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

data/test/output/comment_7.txt

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

data/test/output/comment_8.txt

@@ -0,0 +1,6 @@
+
+<p>
+
+Fix me
+
+</p>

data/test/test_htmlmin.rb

@@ -7,6 +7,7 @@ class HTMLMinTest < Test::Unit::TestCase
 
     INPUT_DIR = "test/input"
     OUTPUT_DIR = "test/output"
+    OPTIONS_DIR = "test/options"
     EXTENSION = "txt"
     
     def create_test_methods_from_data
@@ -22,7 +23,12 @@ class HTMLMinTest < Test::Unit::TestCase
         self.send :define_method, method_name do
           input = File.read "#{INPUT_DIR}/#{basename}.#{EXTENSION}"
           output = File.read "#{OUTPUT_DIR}/#{basename}.#{EXTENSION}"
-          minified = HTMLMin.minify(input)
+
+          options = {}
+          options_filename = "#{OPTIONS_DIR}/#{basename}.rb"
+          options = eval File.read options_filename if File.exists? options_filename
+
+          minified = HTMLMin.minify(input, options)
 
           assert_equal output, minified, "Minified '#{basename}' not equals to output!"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmlmin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-21 00:00:00.000000000Z
+date: 2011-08-22 00:00:00.000000000Z
 dependencies: []
 description: HTMLMin is a HTML-code minification tool implemented in Ruby. It works
   like a slot machine.
@@ -39,6 +39,8 @@ files:
 - test/input/comment_4.txt
 - test/input/comment_5.txt
 - test/input/comment_6.txt
+- test/input/comment_7.txt
+- test/input/comment_8.txt
 - test/input/doctype_1.txt
 - test/input/doctype_2.txt
 - test/input/tag_1.txt
@@ -46,6 +48,8 @@ files:
 - test/input/text_1.txt
 - test/input/text_2.txt
 - test/input/text_3.txt
+- test/options/comment_7.rb
+- test/options/comment_8.rb
 - test/output/cc_1.txt
 - test/output/comment_1.txt
 - test/output/comment_2.txt
@@ -53,6 +57,8 @@ files:
 - test/output/comment_4.txt
 - test/output/comment_5.txt
 - test/output/comment_6.txt
+- test/output/comment_7.txt
+- test/output/comment_8.txt
 - test/output/doctype_1.txt
 - test/output/doctype_2.txt
 - test/output/tag_1.txt
@@ -94,6 +100,8 @@ test_files:
 - test/input/comment_4.txt
 - test/input/comment_5.txt
 - test/input/comment_6.txt
+- test/input/comment_7.txt
+- test/input/comment_8.txt
 - test/input/doctype_1.txt
 - test/input/doctype_2.txt
 - test/input/tag_1.txt
@@ -101,6 +109,8 @@ test_files:
 - test/input/text_1.txt
 - test/input/text_2.txt
 - test/input/text_3.txt
+- test/options/comment_7.rb
+- test/options/comment_8.rb
 - test/output/cc_1.txt
 - test/output/comment_1.txt
 - test/output/comment_2.txt
@@ -108,6 +118,8 @@ test_files:
 - test/output/comment_4.txt
 - test/output/comment_5.txt
 - test/output/comment_6.txt
+- test/output/comment_7.txt
+- test/output/comment_8.txt
 - test/output/doctype_1.txt
 - test/output/doctype_2.txt
 - test/output/tag_1.txt