front-compiler 1.0.6 → 1.1.0

data/lib/front_compiler.rb

@@ -6,7 +6,7 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))).uniq!
 
 class FrontCompiler
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
   
   def initialize
     @html_compactor = HTMLCompactor.new

data/lib/front_compiler/css_source.rb

@@ -28,6 +28,7 @@ class FrontCompiler::CssSource < FrontCompiler::SourceCode
       gsub!(/\s+/im, ' ')
       gsub!(/\s*(\+|>|\||~|\{|\}|,|\)|\(|;|:|\*)\s*/im, '\1')
       gsub!(/;\}/, '}')
+      gsub!(/\)([^;}\s])/, ') \1')
       strip!
     end
   end

data/lib/front_compiler/java_script.rb

@@ -38,7 +38,7 @@ class FrontCompiler::JavaScript < FrontCompiler::SourceCode
       gsub!(/\s+/im, ' ') # cutting down all spaces to the minimum
       gsub!(/\s*(=|\+|\-|<|>|\?|\|\||&&|\!|\{|\}|,|\)|\(|;|\]|\[|:|\*|\/)\s*/im, '\1')
       gsub!(/;(\})/, '\1') # removing unnecessary semicolons
-      gsub!(/([^a-z\d_\$]typeof)\s+([a-z\d\$_]+)/im, '\1(\2)') # converting the typeof calls
+      gsub!(/([^a-z\d_\$]typeof)\(([^\)]+)\)\s*/im, '\1 \2') # converting the typeof calls
       strip!
     end
   end

data/lib/front_compiler/java_script/names_compactor.rb

@@ -4,7 +4,7 @@
 # This module is a part of the JavaScript class and taken out
 # just to keep the things simple
 # 
-# Copyright (C) Nikolay V. Nemshilov aka St.
+# Copyright (C) 2008-2010 Nikolay Nemshilov
 #
 class FrontCompiler
   class JavaScript < FrontCompiler::SourceCode
@@ -24,6 +24,7 @@ class FrontCompiler
           ([a-z\d\\$\s_,]*)   # arguments list
           \)\s*               # end of the function definition
       }imx
+      
       def compact_names_of(src)
         offset = 0
         while pos = src.index(FUNCTION_START_RE, offset)
@@ -71,11 +72,23 @@ class FrontCompiler
       
       # makes decisions about the names cutting down
       def guess_names_map(body, names)
-        names_map = { }
-        used_renames = []
+        # collecting a list of short var names
+        @replacements ||= ('a'...'z').to_a.
+          concat(('A'...'Z').to_a).
+          concat(('aa'...'zz').to_a).
+          concat(('a'...'z').collect{ |c| ('A'...'Z').collect{|n| c + n}}.flatten).
+          concat(('A'...'Z').collect{ |c| ('a'...'z').collect{|n| c + n}}.flatten).
+          concat(('AA'...'ZZ').to_a)
         
-        @replacements ||= ('a'...'z').to_a.concat(('A'...'Z').to_a)
+        # sorting the names by their impact on the size
+        names_impact = get_names_impact_map(body, names)
+        names.sort! do |a, b|
+          names_impact[b] <=> names_impact[a]
+        end
         
+        # finding the new variable names
+        names_map = { }
+        used_renames = []
         names.each do |name|
           [name[/[a-z]/i]||'a'].concat(@replacements).each do |rename|
             if !used_renames.include?(rename) and !body.match(/[^\w\d_\.\$]#{rename}[^\w\d_\$]/)
@@ -117,19 +130,21 @@ class FrontCompiler
         end
         
         # getting the vars definitions
-        body.scan(/[\s\(:;=\{\[^$]+var\s(.*?)(;|$)/im) do |match|
+        body.scan(/[\s\(:;=\{\[^$]+var\s(.*?)(;|\Z)/im) do |match|
           line = $1.dup
           
           # removing arrays and objects definitions out of the line
           ['[]', '{}'].each do |token|
-            while pos = line.index(token=='[]' ? /\[.*?\]/ : /\{.*?\}/)
-              line[pos, $&.size] = ''
+            offset = 0
+            while pos = line.index(token=='[]' ? /\[.*?\]/ : /\{.*?\}/, offset)
+              block = find_block(token, pos, line)
+              line[pos, block.size] = ''
+              
+              offset = pos + 1
             end
           end
           
-          
           # removing objects definitions
-          
           names.concat(line.split(",").collect{ |token|
               token[/[\w\d_\$]+/i]
             }.compact)
@@ -137,6 +152,17 @@ class FrontCompiler
         
         names
       end
+      
+      # builds the map of names size impact on the body
+      def get_names_impact_map(body, names)
+        impact_map = {}
+        
+        names.each do |name|
+          impact_map[name] = body.scan(/[^\w\d_\.\$]#{name}[^\w\d_\$]/).size
+        end
+        
+        impact_map
+      end
     end
   end
 end

data/lib/front_compiler/source_code.rb

@@ -66,7 +66,12 @@ protected
     
     # bgingin the strings back
     outtakes.reverse.each do |s|
-      gsub! s[:replacement], s[:original].gsub('\\','\\\\\\\\') # <- escapes reescaping
+      original = s[:original]
+      
+      # converting quotes into 
+      original.gsub! "'", '"' if /\A'[^'"]+'\Z/ =~ original
+      
+      gsub! s[:replacement], original.gsub('\\','\\\\\\\\') # <- escapes reescaping
     end
     @in_string_safe_mode = false
     

data/spec/lib/front_compiler/css_source_spec.rb

@@ -32,7 +32,7 @@ describe FrontCompiler::CssSource do
       }
 
       a:after {
-        content: '/* */';
+        content: "/* */";
       }
     }
   end
@@ -81,9 +81,9 @@ describe FrontCompiler::CssSource do
       form p label { 
         display: block;
       }
-    }).remove_trailing_spaces!.should == ""\
-    "html,body{cusor:pointer;color:red}div>p~label:after{"\
-    "content:'           ';text-decoration:underline}"\
+    }).remove_trailing_spaces!.should == "" \
+    "html,body{cusor:pointer;color:red}div>p~label:after{" \
+    "content:\"           \";text-decoration:underline}" \
     "form p label{display:block}"
   end
   
@@ -104,8 +104,16 @@ describe FrontCompiler::CssSource do
         content: "something";
      }
     }).to_javascript.should == 
-      'document.write("<style type=\\"text/css\\">'+
-        'div,p{padding:10pt;background:url(\'something\');content:\"something\"}'+
+      'document.write("<style type=\\"text/css\\">' \
+        'div,p{padding:10pt;background:url(\\"something\\");content:\"something\"}' \
       '</style>");'
   end
+  
+  it "should keep the no-repeat option with a space in front" do
+    css(%{
+      div {
+        background: url("boo.hoo") no-repeat 0 0 scroll #fff;
+      }
+    }).compact!.should == 'div{background:url("boo.hoo") no-repeat 0 0 scroll #fff}'
+  end
 end

data/spec/lib/front_compiler/java_script/names_compactor_spec.rb

@@ -166,13 +166,13 @@ describe FrontCompiler::JavaScript::NamesCompactor do
       }
     }).should == %{
       function(b) {
-        function c() {
+        function a() {
           function f() {
             var m = b * 2;
             b(m);
           }
         }
-        var a = c(b);
+        var c = a(b);
       }
     }
   end
@@ -216,4 +216,148 @@ describe FrontCompiler::JavaScript::NamesCompactor do
       }
     }
   end
+  
+  it "should process the multi-lined variable definitions with complex constructions in them" do
+    compact(%{
+      function() {
+        var boo = [],
+            hoo = {
+              doo: [[1], [2], [3], {
+                moo: {
+                  zoo: [[[[[1]]]]]
+                }
+              }]
+            },
+            foo = function() {
+              
+            };
+            
+        foo(boo, hoo);
+      }
+    }).should == %{
+      function() {
+        var b = [],
+            h = {
+              doo: [[1], [2], [3], {
+                moo: {
+                  zoo: [[[[[1]]]]]
+                }
+              }]
+            },
+            f = function() {
+              
+            };
+            
+        f(b, h);
+      }
+    }
+  end
+  
+  it "should process multilined variables with cross-calls" do
+    compact(%{
+      function() {
+        var boo = "boo", hoo = {
+          moo: boo,
+          doo: {
+            zoo: boo
+          }
+        }
+      }
+    }).should == %{
+      function() {
+        var b = "boo", h = {
+          moo: b,
+          doo: {
+            zoo: b
+          }
+        }
+      }
+    }
+  end
+  
+  it "should process several variable definitions in a mixed situation" do
+    compact(%{
+      function() {
+        var boo = "boo", hoo = "hoo";
+        
+        function () {
+          return boo + hoo + moo + noo();
+        }
+        
+        var moo = "moo",
+            zoo = "zoo",
+            doo = "doo";
+            
+        function noo() {
+          return boo + hoo + zoo;
+        }
+        
+        return boo + hoo + zoo + doo;
+      }
+    }).should == %{
+      function() {
+        var b = "boo", h = "hoo";
+        
+        function () {
+          return b + h + m + n();
+        }
+        
+        var m = "moo",
+            z = "zoo",
+            d = "doo";
+            
+        function n() {
+          return b + h + z;
+        }
+        
+        return b + h + z + d;
+      }
+    }
+  end
+  
+  it "should negotiate the var names pushing the better optimizations upper" do
+    compact(%{
+      function() {
+        var a, b, c, d;
+        
+        var aaron = 'aaron',
+            bobby = 'bobby',
+            carry = 'carry',
+            dicky = 'dicky';
+        
+        return aaron +
+               bobby + bobby +
+               carry + carry + carry +
+               dicky + dicky + dicky + dicky;
+      }
+    }).should == %{
+      function() {
+        var a, b, c, d;
+        
+        var h = "aaron",
+            g = "bobby",
+            f = "carry",
+            e = "dicky";
+        
+        return h +
+               g + g +
+               f + f + f +
+               e + e + e + e;
+      }
+    }
+  end
+  
+  it "should not screw with external variable in a case like that" do
+    compact(%{
+      function() {
+        for (var i=0, natives = [Array, Function, Number, String, Date, RegExp]; i < natives.length; i++) {
+        }
+      }
+    }).should == %{
+      function() {
+        for (var i=0, n = [Array, Function, Number, String, Date, RegExp]; i < n.length; i++) {
+        }
+      }
+    }
+  end
 end

data/spec/lib/front_compiler/java_script_spec.rb

@@ -23,13 +23,13 @@ describe FrontCompiler::JavaScript do
     js(%{
       
       var str1 = "asdfsdf \\n\\n\\n asd";
-      var str2 = 'asdfasdf';
+      var str2 = "asdfasdf";
 
 
 
     }).remove_empty_lines!.should == %{
       var str1 = "asdfsdf \\n\\n\\n asd";
-      var str2 = 'asdfasdf';
+      var str2 = "asdfasdf";
     }
   end
   
@@ -50,11 +50,51 @@ describe FrontCompiler::JavaScript do
     js(%{
       var str = "asdf \\\\ \\n /* asdf */";
       var str = /\\D/;
-      var str = '\\D';
+      var str = "\\D";
     }).remove_comments!.should == %{
       var str = "asdf \\\\ \\n /* asdf */";
       var str = /\\D/;
-      var str = '\\D';
+      var str = "\\D";
     }
   end
+  
+  it "should convert single quotes to doubles in simple cases" do 
+    js(%{
+      var str = 'asdfasdfdsaf';
+      var str = 'asdfasdfasdfa"sdfasdf';
+    }).remove_comments!.should == %{
+      var str = "asdfasdfdsaf";
+      var str = 'asdfasdfasdfa"sdfasdf';
+    }
+  end
+  
+  it "should optimize the typeof() calls in javascript" do
+    js(%Q{
+      var t = typeof(something);
+      if (typeof(something) == "boo")
+        boo();
+      else if (typeof something == "hoo")
+        hoo();
+        
+      switch (typeof(something)) {
+        case "boo": hoo();
+      }
+      
+      switch (typeof something) {
+        case "boo": hoo();
+      }
+        
+      return typeof(value) !== "undefined" &&
+        typeof(value.hasOwnProperty) !== "undefined"
+    }).remove_trailing_spaces!.should == "" \
+      'var t=typeof something;' \
+      'if(typeof something=="boo")' \
+        'boo();' \
+      'else if(typeof something=="hoo")' \
+        'hoo();' \
+      'switch(typeof something){case "boo":hoo()}' \
+      'switch(typeof something){case "boo":hoo()}' \
+      'return typeof value!=="undefined"&&' \
+        'typeof value.hasOwnProperty!=="undefined"'
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: front-compiler
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Nikolay Nemshilov
@@ -9,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 +03:00
+date: 2010-06-20 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
-description: FrontCompiler is a Ruby based JavaScript/CSS/HTML compressor. It provides the basic JavaScript/CSS/HTML minifying feature. Plus it can create albeit packed JavaScript files, can inline CSS inside JavaScript, works with DRYed CSS files and also can work as a RubyOnRails plugin.
+description: FrontCompiler is a Ruby based JavaScript/CSS/HTML compressor. It provides the basic JavaScript/CSS/HTML minifying feature. Plus it can create albeit packed JavaScript files, can inline CSS inside of JavaScript, works with DRYed CSS files and also can work as a RubyOnRails plugin.
 email: nemshilov@gmail.com
 executables: 
 - frontcc
@@ -50,6 +56,7 @@ files:
 - CHANGELOG
 - Rakefile
 - init.rb
+- bin/frontcc
 has_rdoc: true
 homepage: http://github.com/MadRabbit/frontcompiler
 licenses: []
@@ -60,21 +67,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: FrontCompiler is a Ruby based JavaScript/CSS/HTML compressor