assets_booster 0.0.1 → 0.0.2

data/.rspec

@@ -0,0 +1,2 @@
+--color
+

data/Rakefile

@@ -1,2 +1,6 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new('spec')
+task :default => :spec

data/asset_booster.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Corin Langosch"]
   s.email       = ["info@netskin.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/gucki/assets_booster"
   s.summary     = %q{Assets (javascripts, css) compression for rails applications}
   s.description = %q{Instead of sending down a dozen JavaScript and CSS files full of formatting and comments, this gem makes it simple to merge and compress these into one or more files, increasing speed and saving bandwidth.}
 
@@ -18,4 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency "rails", "~>3.0.5"
+  s.add_development_dependency "rspec", "~>2.5.0"
+  s.add_development_dependency "rainpress", "~>1.0"
 end
+

data/lib/assets_booster/compiler/closure.rb

@@ -1,14 +1,13 @@
 require 'uri'
 require 'net/http'
-
 module AssetsBooster
   module Compiler
     class Closure
-      def self.name
+      def name
         "Google Closure Compiler"
       end
                   
-      def self.compile(code)
+      def compile(code)
         post_data = {
           'js_code'=> code,
           'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
@@ -20,15 +19,18 @@ module AssetsBooster
         case res
         when Net::HTTPSuccess
           data = res.body.strip
+          if data =~ /^Error\(22\): Too many compiles performed recently./
+            raise RuntimeError, "Google's Closure Compiler complained: "+data
+          end
           if code.size > 0 && data.size < 1
             post_data['output_info'] = 'errors'
             res = Net::HTTP.post_form(uri, post_data)
-            raise CompileError.new("Google's Closure Compiler failed: "+res.body)
+            raise RuntimeError, "Google's Closure Compiler failed: "+res.body
           end
           data
         else
-          raise CompileError.new("HTTP request TO Google's Closure Compiler failed: "+res.to_s)
-        end     
+          raise RuntimeError, "HTTP request TO Google's Closure Compiler failed: "+res.to_s
+        end
       end
     end
   end

data/lib/assets_booster/compiler/dummy.rb

@@ -1,14 +1,11 @@
-require 'uri'
-require 'net/http'
-
 module AssetsBooster
   module Compiler
     class Dummy
-      def self.name
+      def name
         "Dummy Compiler"
       end
                   
-      def self.compile(code)
+      def compile(code)
         code
       end
     end

data/lib/assets_booster/compiler/jsmin.rb

@@ -37,193 +37,183 @@ module AssetsBooster
     class JSMin
             
       # class variables
-      @@EOF = -1
-      @@theA = ""
-      @@theB = ""
-      @@input = ""
-      @@output = ""
+      @EOF = -1
+      @theA = ""
+      @theB = ""
+      @input = ""
+      @output = ""
 
-      # singleton methods
-      class << self
-                
-        def name
-          "Douglas Crockford's JSMin"
-        end
-        
-        def compile(incoming)
-          @@output = StringIO.new("","w")
-          if incoming.is_a? String
-            @@input = StringIO.new(incoming,"r")
-          elsif incoming.kind_of? IO
-            @@input = incoming
-          else 
-            raise CompileError.new("JSMin can only compress strings or files.")
-          end
-          jsmin
-          @@output.string
-        end
-      
+      def name
+        "Douglas Crockford's JSMin"
+      end
       
-        protected
-          # isAlphanum -- return true if the character is a letter, digit, underscore,
-          # dollar sign, or non-ASCII character
-          def isAlphanum(c)
-             return false if !c || c == @@EOF
-             return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
-                     (c >= 'A' && c <= 'Z') || c == '_' || c == '$' ||
-                     c == '\\' || c[0].ord > 126)
-          end
+      def compile(code)
+        @input = StringIO.new(code, "r")
+        @output = StringIO.new("", "w")
+        jsmin
+        @output.string.strip
+      end
 
-          # get -- return the next character from stdin. Watch out for lookahead. If
-          # the character is a control character, translate it to a space or linefeed.
-          def get()
-            c = @@input.getc
-            return @@EOF if(!c)
-            c = c.chr
-            return c if (c >= " " || c == "\n" || c.unpack("c") == @@EOF)
-            return "\n" if (c == "\r")
-            return " "
-          end
+      protected
 
-          # Get the next character without getting it.
-          def peek()
-              lookaheadChar = @@input.getc
-              @@input.ungetc(lookaheadChar)
-              return lookaheadChar.chr
-          end
+      # isAlphanum -- return true if the character is a letter, digit, underscore,
+      # dollar sign, or non-ASCII character
+      def isAlphanum(c)
+         return false if !c || c == @EOF
+         return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
+                 (c >= 'A' && c <= 'Z') || c == '_' || c == '$' ||
+                 c == '\\' || c[0].ord > 126)
+      end
 
-          # mynext -- get the next character, excluding comments.
-          # peek() is used to see if a '/' is followed by a '/' or '*'.
-          def mynext()
-              c = get
-              if (c == "/")
-                  if(peek == "/")
-                      while(true)
-                          c = get
-                          if (c <= "\n")
-                          return c
-                          end
+      # get -- return the next character from stdin. Watch out for lookahead. If
+      # the character is a control character, translate it to a space or linefeed.
+      def get()
+        c = @input.getc
+        return @EOF if(!c)
+        c = c.chr
+        return c if (c >= " " || c == "\n" || c.unpack("c") == @EOF)
+        return "\n" if (c == "\r")
+        return " "
+      end
+
+      # Get the next character without getting it.
+      def peek()
+          lookaheadChar = @input.getc
+          @input.ungetc(lookaheadChar)
+          return lookaheadChar.chr
+      end
+
+      # mynext -- get the next character, excluding comments.
+      # peek() is used to see if a '/' is followed by a '/' or '*'.
+      def mynext()
+          c = get
+          if (c == "/")
+              if(peek == "/")
+                  while(true)
+                      c = get
+                      if (c <= "\n")
+                      return c
                       end
                   end
-                  if(peek == "*")
-                      get
-                      while(true)
-                          case get
-                          when "*"
-                             if (peek == "/")
-                                  get
-                                  return " "
-                              end
-                          when @@EOF
-                              raise "Unterminated comment"
+              end
+              if(peek == "*")
+                  get
+                  while(true)
+                      case get
+                      when "*"
+                         if (peek == "/")
+                              get
+                              return " "
                           end
+                      when @EOF
+                          raise "Unterminated comment"
                       end
                   end
               end
-              return c
           end
+          return c
+      end
 
 
-          # action -- do something! What you do is determined by the argument: 1
-          # Output A. Copy B to A. Get the next B. 2 Copy B to A. Get the next B.
-          # (Delete A). 3 Get the next B. (Delete B). action treats a string as a
-          # single character. Wow! action recognizes a regular expression if it is
-          # preceded by ( or , or =.
-          def action(a)
-              if(a==1)
-                  @@output.write $theA
-              end
-              if(a==1 || a==2)
-                  $theA = $theB
-                  if ($theA == "\'" || $theA == "\"")
-                      while (true)
-                          @@output.write $theA
+      # action -- do something! What you do is determined by the argument: 1
+      # Output A. Copy B to A. Get the next B. 2 Copy B to A. Get the next B.
+      # (Delete A). 3 Get the next B. (Delete B). action treats a string as a
+      # single character. Wow! action recognizes a regular expression if it is
+      # preceded by ( or , or =.
+      def action(a)
+          if(a==1)
+              @output.write $theA
+          end
+          if(a==1 || a==2)
+              $theA = $theB
+              if ($theA == "\'" || $theA == "\"")
+                  while (true)
+                      @output.write $theA
+                      $theA = get
+                      break if ($theA == $theB)
+                      raise "Unterminated string literal" if ($theA <= "\n")
+                      if ($theA == "\\")
+                          @output.write $theA
                           $theA = get
-                          break if ($theA == $theB)
-                          raise "Unterminated string literal" if ($theA <= "\n")
-                          if ($theA == "\\")
-                              @@output.write $theA
-                              $theA = get
-                          end
                       end
                   end
               end
-              if(a==1 || a==2 || a==3)
-                  $theB = mynext
-                  if ($theB == "/" && ($theA == "(" || $theA == "," || $theA == "=" ||
-                                       $theA == ":" || $theA == "[" || $theA == "!" ||
-                                       $theA == "&" || $theA == "|" || $theA == "?" ||
-                                       $theA == "{" || $theA == "}" || $theA == ";" ||
-                                       $theA == "\n"))
-                      @@output.write $theA
-                      @@output.write $theB
-                      while (true)
+          end
+          if(a==1 || a==2 || a==3)
+              $theB = mynext
+              if ($theB == "/" && ($theA == "(" || $theA == "," || $theA == "=" ||
+                                   $theA == ":" || $theA == "[" || $theA == "!" ||
+                                   $theA == "&" || $theA == "|" || $theA == "?" ||
+                                   $theA == "{" || $theA == "}" || $theA == ";" ||
+                                   $theA == "\n"))
+                  @output.write $theA
+                  @output.write $theB
+                  while (true)
+                      $theA = get
+                      if ($theA == "/")
+                          break
+                      elsif ($theA == "\\")
+                          @output.write $theA
                           $theA = get
-                          if ($theA == "/")
-                              break
-                          elsif ($theA == "\\")
-                              @@output.write $theA
-                              $theA = get
-                          elsif ($theA <= "\n")
-                              raise "Unterminated RegExp Literal"
-                          end
-                          @@output.write $theA
+                      elsif ($theA <= "\n")
+                          raise "Unterminated RegExp Literal"
                       end
-                      $theB = mynext
+                      @output.write $theA
                   end
+                  $theB = mynext
               end
           end
+      end
 
-          # jsmin -- Copy the input to the output, deleting the characters which are
-          # insignificant to JavaScript. Comments will be removed. Tabs will be
-          # replaced with spaces. Carriage returns will be replaced with linefeeds.
-          # Most spaces and linefeeds will be removed.
-          def jsmin
-              $theA = "\n"
-              action(3)
-              while ($theA != @@EOF)
-                  case $theA
+      # jsmin -- Copy the input to the output, deleting the characters which are
+      # insignificant to JavaScript. Comments will be removed. Tabs will be
+      # replaced with spaces. Carriage returns will be replaced with linefeeds.
+      # Most spaces and linefeeds will be removed.
+      def jsmin
+          $theA = "\n"
+          action(3)
+          while ($theA != @EOF)
+              case $theA
+              when " "
+                  if (isAlphanum($theB))
+                      action(1)
+                  else
+                      action(2)
+                  end
+              when "\n"
+                  case ($theB)
+                  when "{","[","(","+","-"
+                      action(1)
                   when " "
+                      action(3)
+                  else
                       if (isAlphanum($theB))
                           action(1)
                       else
                           action(2)
                       end
-                  when "\n"
-                      case ($theB)
-                      when "{","[","(","+","-"
+                  end
+              else
+                  case ($theB)
+                  when " "
+                      if (isAlphanum($theA))
                           action(1)
-                      when " "
-                          action(3)
                       else
-                          if (isAlphanum($theB))
-                              action(1)
-                          else
-                              action(2)
-                          end
+                          action(3)
                       end
-                  else
-                      case ($theB)
-                      when " "
+                  when "\n"
+                      case ($theA)
+                      when "}","]",")","+","-","\"","\\", "'", '"'
+                          action(1)
+                      else
                           if (isAlphanum($theA))
                               action(1)
                           else
                               action(3)
                           end
-                      when "\n"
-                          case ($theA)
-                          when "}","]",")","+","-","\"","\\", "'", '"'
-                              action(1)
-                          else
-                              if (isAlphanum($theA))
-                                  action(1)
-                              else
-                                  action(3)
-                              end
-                          end
-                      else
-                          action(1)
                       end
+                  else
+                      action(1)
                   end
               end
           end

data/lib/assets_booster/compiler/rainpress.rb

@@ -1,15 +1,15 @@
 module AssetsBooster
   module Compiler
     class Rainpress  
-      def self.name
+      def name
         'Rainpress'
       end
 
-      def self.compile(css)
+      def compile(css)
         require 'rainpress'
         ::Rainpress.compress(css)
       rescue LoadError => e
-        raise "To use the Rainpress CSS Compressor, please install the rainpress gem first"
+        raise LoadError, "To use the Rainpress CSS Compressor, please install the rainpress gem first"
       end
     end
   end

data/lib/assets_booster/compiler/uglify.rb

@@ -1,13 +1,15 @@
 module AssetsBooster
   module Compiler
     class Uglify  
-      def self.name
+      def name
         'UglifyJS running on Node.js'
       end
           
-      def self.compile(code)
-        raise CompileError.new("You need to install node.js in order to compile using UglifyJS.") unless %x[which node].length > 1
-        IO.popen("cd #{Pathname.new(File.join(File.dirname(__FILE__),'node-js')).realpath} && node uglify.js", "r+") do |io|
+      def compile(code)
+        nodejs = %x[which node].strip
+        raise LoadError, "You need to install node.js in order to compile using UglifyJS." unless nodejs.length > 1
+        np_path = Pathname.new(File.join(File.dirname(__FILE__), 'node-js')).realpath
+        IO.popen("#{nodejs} #{np_path}/uglify.js", "r+") do |io|
           io.write(code)
           io.close_write
           io.read