jsc 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,14 @@
+== 0.1.3 / 2009-12-14
+
+BUG fix: now show every error in a file, not just the first
+Exception handling for: 
+* file to check not found
+* Name or service not known (SocketError)
+
+== 0.1.2 / 2009-12-12
+
+fix in --help option for jsc command when installed as gem
+
 == 0.1.0 / 2009-12-12
 
 * First gem release

data/README.rdoc

@@ -47,9 +47,7 @@ Compile a piece of code, check for errors:
 
   ruby bin/jsc -e "function("
 
-<b>NOTE</b>: the library is a single file, so you can include it and just call the JSCompiler.compile(file_name, operations, compilation_level) function everywhere in your code. Check the plugins dir for samples or snippets.
-
-<b>UPDATE 20091212</b>: bin file plugins/bin/google_closure_compiler not working at the moment due to changes in project name and structure
+<b>NOTE</b>: the library is a single file, so you can include it and just call one of the JSCompiler.compile* functions everywhere in your code.
 
 == EMACS SNIPPETS
 
@@ -67,7 +65,7 @@ Now, select the code to compile and run:
 
 == REQUIREMENTS:
 
-jsc require the {bones}[http://gemcutter.org/gems/bones] gem.
+jsc requires the {bones}[http://gemcutter.org/gems/bones] gem.
 
 == INSTALL:
 

data/Rakefile

@@ -31,7 +31,7 @@ Bones {
   authors  'sub'
   email  'fitzkarraldo@gmail.com'
   url  'http://github.com/sub/jsc'
-  version  '0.1.2'
+  version  '0.1.3'
   summary 'Simple Ruby API to Google Closure Compiler Web service'
 }
 

data/bin/jsc

@@ -82,10 +82,5 @@ unless ARGV.length > 0 or file
    exit 0
 end
 
-code = ARGV.shift
-
-if file
-    puts JSCompiler.compile_file(file_path, output_info, level)
-else
-    puts JSCompiler.compile(code, output_info, level)
-end
+arg = file_path.blank? ? ARGV.shift : file_path
+puts JSCompiler.compile(arg, file, output_info, level)

data/js/temp.js

@@ -0,0 +1 @@
+function hello(a){return; alert(\"Hello, \"+a)}hello(\"New user\")

data/lib/jsc/clo2.rb

@@ -0,0 +1,169 @@
+require 'rubygems'  # include RubyGems
+gem 'activesupport' # load ActiveSupport
+require 'activesupport' # include ActiveSupport
+require 'active_support/core_ext/integer/inflections'
+
+require 'json'
+require 'net/http'
+
+module JSCompiler
+
+# CONFIGURE this with the relative path to your javascript
+# folder (typically public/javascripts in a RAILS APP)
+# NO MORE NEEDED
+#JAVASCRIPTS_DIR = "js/"
+
+# Link to Google Closure Compiler service
+GOOGLE_SERVICE_ADDRESS = "http://closure-compiler.appspot.com/compile"
+# Default output_info parameter
+DEFAULT_SERVICE = "compiled_code"
+# Default compilation_level parameter
+DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
+
+  class << self
+
+    # Creates the <em>JSON</em> hash for the request and returns the hash to send along with the request
+    #
+    # Accepted parameters:
+    # * <b>code</b>: json_code parameter
+    # * <b>level</b>: compilation_level parameter
+    def create_json_request(code)
+      parameters = {
+    	"code" => code,
+	"level" => @level,
+	"format"   => "json",
+	"info"  => @op
+      }
+    end
+
+    # Sends the JSON request <em>data</em> hash to Google service and returns its response
+    #
+    def post_to_cc(data)
+      post_args = { 
+        'js_code' => data["code"],
+        'compilation_level' => data["level"],
+        'output_format' => data["format"],
+        'output_info' => data["info"]
+      }
+      # send the request
+      resp, data = Net::HTTP.post_form(URI.parse(GOOGLE_SERVICE_ADDRESS), post_args)
+    end
+
+    # Reads the <em>file_name</em> file and calls compile method on it
+    #
+    # Accepted parameters:
+    # * <b>file_name</b>: absolute path to file
+    # * <b>op</b>: output_info parameter
+    # * <b>level</b>: compilation_level parameter
+    def compile_file(file_name, op, level)
+      #    javascript_code = read_file(JAVASCRIPTS_DIR + file_name)
+      #    resp, data = post_to_cc(create_json_request(javascript_code, op, level))
+      #    parse_json_output(data, op)
+     
+      javascript_code = read_file(file_name)
+      compile(javascript_code, op, level)
+    end
+
+    # Compiles <em>javascript_code</em> code and returns parsed output
+    #
+    # Accepted parameters:
+    # * <b>req</b>: the code to compile
+    # * <b>op</b>: output_info parameter
+    # * <b>level</b>: compilation_level parameter
+    def compile(req, is_file, op, level)
+      @op = op.blank? ? DEFAULT_SERVICE : op
+      @level = level.blank? ? DEFAULT_LEVEL : level
+
+      js_code = is_file ? read_file(qualcosa) : qualcosa
+      resp, data = post_to_cc(create_json_request(js_code))
+      parse_json_output(data)
+    end
+
+    # Calls compile method for every file in <em>dir</em> directory
+    #
+    # Accepted parameters:
+    # * <b>dir</b>: the directory
+    # * <b>op</b>: output_info parameter
+    # * <b>level</b>: compilation_level parameter
+    def compile_dir(dir, op, level)
+      out = String.new
+      Dir.entries(dir).each do |file|
+        if File.extname(file) == ".js"
+          out << "Statistics for file #{file}...\n"
+          out << compile_file(file, op, level) + "\n***************\n"
+        end
+      end
+      return out
+    end
+
+    # Parses and returns JSON server <em>response</em>
+    #
+    # Accepted parameters:
+    # * <b>response</b>: the server response
+    def parse_json_output(response)
+      out = String.new
+      parsed_response = JSON.parse(response, :max_nesting => false)
+      #p response
+
+      if parsed_response.has_key?("serverErrors") 
+        result = parsed_response['serverErrors']
+        return "Server Error: #{result[0]['error']} - Error Code: #{result[0]['code']}"
+      end
+
+      case @op
+      when "compiled_code"
+        out = parsed_response['compiledCode']
+      when "statistics"
+        result = parsed_response['statistics']
+        out = create_statistics_output(result)
+      else "errors"
+        #case for errors or warnings
+        begin
+          result = parsed_response[@op]
+          unless result.nil?
+            result.each do |message|
+              out = "#{message['type']}: " + message[@op.singularize] + " at line #{message['lineno']} character #{message['charno']}\n"
+              out << message['line'] unless message['line'].nil?
+              return out
+            end
+          else
+            return "No #{@op}"
+          end
+        rescue
+          out = "Error parsing JSON output...Check your output"
+        end
+      end
+    end
+
+    # Reads file and returns its content
+    #
+    # Accepted parameters:
+    # * <b>file_name</b>: the absolute path to the file
+    def read_file(file_name)
+      begin
+        #      content = File.open(JAVASCRIPTS_DIR + file_name).read
+        content = File.open(file_name).read
+        return content, true
+      rescue
+        out = "ERROR reading #{file_name} file"
+        return out, false
+      end
+    end
+
+    # Parses and returns the <em>result</em> JSON server response
+    #
+    # Accepted parameters:
+    # * <b>result</b>: the already parsed JSON server response
+    def create_statistics_output(result)
+      size_improvement = result['originalSize'] - result['compressedSize']
+      size_gzip_improvement = result['originalGzipSize'] - result['compressedGzipSize']
+      rate_improvement = (size_improvement * 100)/result['originalSize']
+      rate_gzip_improvement = (size_gzip_improvement * 100)/result['originalGzipSize']
+      out = "Original Size: #{result['originalSize']} bytes (#{result['originalGzipSize']} bytes gzipped) \n"
+      out << "Compiled Size: #{result['compressedSize']} bytes (#{result['compressedGzipSize']} bytes gzipped) \n"
+      out << "\t Saved #{rate_improvement}% off the original size (#{rate_gzip_improvement}% off the gzipped size)"
+    end
+
+  end
+
+end

data/lib/jsc/closure_compiler.rb

@@ -6,13 +6,6 @@ require 'active_support/core_ext/integer/inflections'
 require 'json'
 require 'net/http'
 
-module JSCompiler
-
-# CONFIGURE this with the relative path to your javascript
-# folder (typically public/javascripts in a RAILS APP)
-# NO MORE NEEDED
-#JAVASCRIPTS_DIR = "js/"
-
 # Link to Google Closure Compiler service
 GOOGLE_SERVICE_ADDRESS = "http://closure-compiler.appspot.com/compile"
 # Default output_info parameter
@@ -20,6 +13,8 @@ DEFAULT_SERVICE = "compiled_code"
 # Default compilation_level parameter
 DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
 
+module JSCompiler
+
   class << self
 
     # Creates the <em>JSON</em> hash for the request and returns the hash to send along with the request
@@ -49,32 +44,36 @@ DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
       resp, data = Net::HTTP.post_form(URI.parse(GOOGLE_SERVICE_ADDRESS), post_args)
     end
 
-    # Reads the <em>file_name</em> file and calls compile method on it
+    # Compiles a file or a piece of code and returns parsed output
     #
     # Accepted parameters:
-    # * <b>file_name</b>: absolute path to file
+    # * <b>arg</b>: the code or the file path to compile
+    # * <b>is_file</b>: 0 => arg is code
+    #                   1 => arg is a file path
     # * <b>op</b>: output_info parameter
     # * <b>level</b>: compilation_level parameter
-    def compile_file(file_name, op, level)
-      #    javascript_code = read_file(JAVASCRIPTS_DIR + file_name)
-      #    resp, data = post_to_cc(create_json_request(javascript_code, op, level))
-      #    parse_json_output(data, op)
-     
-      javascript_code = read_file(file_name)
-      compile(javascript_code, op, level)
-    end
-
-    # Compiles <em>javascript_code</em> code and returns parsed output
-    #
-    # Accepted parameters:
-    # * <b>javascript_code</b>: the code to compile
-    # * <b>op</b>: output_info parameter
-    # * <b>level</b>: compilation_level parameter
-    def compile(javascript_code, op, level)
+    def compile(arg, is_file, op, level)
       @op = op.blank? ? DEFAULT_SERVICE : op
       @level = level.blank? ? DEFAULT_LEVEL : level
+      value = true
+
+      if is_file
+        js_code, value = read_file(arg)
+      else
+        js_code = arg
+      end
+      # js_code = is_file ? read_file(arg) : arg
+
+      unless value
+        return "Error reading file #{arg}"
+      end
+
+      begin
+        resp, data = post_to_cc(create_json_request(js_code))
+      rescue
+        return "Error calling the service...try again later"
+      end
 
-      resp, data = post_to_cc(create_json_request(javascript_code))
       parse_json_output(data)
     end
 
@@ -89,7 +88,7 @@ DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
       Dir.entries(dir).each do |file|
         if File.extname(file) == ".js"
           out << "Statistics for file #{file}...\n"
-          out << compile_file(file, op, level) + "\n***************\n"
+          out << compile(file, true, op, level) + "\n***************\n"
         end
       end
       return out
@@ -102,7 +101,6 @@ DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
     def parse_json_output(response)
       out = String.new
       parsed_response = JSON.parse(response, :max_nesting => false)
-      #p response
 
       if parsed_response.has_key?("serverErrors") 
         result = parsed_response['serverErrors']
@@ -121,10 +119,10 @@ DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
           result = parsed_response[@op]
           unless result.nil?
             result.each do |message|
-              out = "#{message['type']}: " + message[@op.singularize] + " at line #{message['lineno']} character #{message['charno']}\n"
-              out << message['line'] unless message['line'].nil?
-              return out
+              out << "#{message['type']}: " + message[@op.singularize] + " at line #{message['lineno']} character #{message['charno']}\n"
+              out << message['line'] + "\n" unless message['line'].nil?
             end
+            return out
           else
             return "No #{@op}"
           end
@@ -140,7 +138,6 @@ DEFAULT_LEVEL = "SIMPLE_OPTIMIZATIONS"
     # * <b>file_name</b>: the absolute path to the file
     def read_file(file_name)
       begin
-        #      content = File.open(JAVASCRIPTS_DIR + file_name).read
         content = File.open(file_name).read
         return content, true
       rescue

data/spec/{jsc.rb → jsc_spec.rb}

@@ -1,15 +1,36 @@
 
 require File.join(File.dirname(__FILE__), %w[spec_helper])
 
+        COMPILE_CODE = <<-EOU
+function hello(name) {
+  alert('Hello, ' + name)
+}
+hello('New user');
+EOU
+
+        ERROR_CODE = <<-EOU
+functiont hello(name) {
+  alert('Hello, ' + name)
+}
+hello('New user');
+        EOU
+
+        WARNING_CODE = <<-EOU
+function hello(name) {
+	return;
+  alert('Hello, ' + name)
+}
+hello('New user');
+        EOU
+
 describe JSCompiler do
 
    describe 'Use the web service through API' do
-    
+
     describe 'Put all keys in the request' do
 
       before do
-        code = "function hello(a){alert(\"Hello, \"+a)}hello(\"New user\");"
-        @request = JSCompiler.create_json_request(code)
+        @request = JSCompiler.create_json_request(COMPILE_CODE)
         @request['level'] = "SIMPLE_OPTIMIZATIONS"
         @request['info'] = "compiled_code"
       end
@@ -37,8 +58,7 @@ describe JSCompiler do
 
     describe 'create a JSON compile-code request (default request)' do
       before do
-        code = "function hello(a){alert(\"Hello, \"+a)}hello(\"New user\");"
-        @request = JSCompiler.create_json_request(code)
+        @request = JSCompiler.create_json_request(COMPILE_CODE)
         @request['level'] = "SIMPLE_OPTIMIZATIONS"
         @request['info'] = "compiled_code"
       end
@@ -62,8 +82,7 @@ describe JSCompiler do
 
     describe 'compile code and get compiled code' do
       before do
-        code = "function hello(a){alert(\"Hello, \"+a)}hello(\"New user\");"
-        @resp = JSCompiler.compile(code, "compiled_code", "SIMPLE_OPTIMIZATIONS")
+        @resp = JSCompiler.compile(COMPILE_CODE, false, "compiled_code", "SIMPLE_OPTIMIZATIONS")
       end
  
       it 'should receive the compiled code' do
@@ -73,30 +92,28 @@ describe JSCompiler do
     
     describe 'compile code and find errors' do
       before do
-        code = "functiont hello(a){alert(\"Hello, \"+a)}hello(\"New user\");"
-        @resp = JSCompiler.compile(code, "errors", "SIMPLE_OPTIMIZATIONS")
+        @resp = JSCompiler.compile(ERROR_CODE, false, "errors", "SIMPLE_OPTIMIZATIONS")
       end
       
       it 'should return the result string' do
         @resp.should match(/at line/)
       end
     end
-    
+
     describe 'compile code and find warnings' do
       before do
-        code = "function hello(a){return; alert(\"Hello, \"+a)}hello(\"New user\");"
-        @resp = JSCompiler.compile(code, "warnings", "SIMPLE_OPTIMIZATIONS")
+        @resp = JSCompiler.compile(WARNING_CODE, false, "warnings", "SIMPLE_OPTIMIZATIONS")
+      puts @resp
       end
       
       it 'should return the result string' do
         @resp.should match(/at line/)
       end  
     end
- 
+
     describe 'compile code and obtain statistics' do
       before do
-        code = "function hello(a){alert(\"Hello, \"+a)}hello(\"New user\");"
-        @resp = JSCompiler.compile(code, "statistics", "SIMPLE_OPTIMIZATIONS")
+        @resp = JSCompiler.compile(COMPILE_CODE, false, "statistics", "SIMPLE_OPTIMIZATIONS")
       end
   
       it 'should return the result string' do
@@ -109,12 +126,18 @@ describe JSCompiler do
     before do
       #test file
       @file_name = 'js/compiled_code.js'
+      @file_not_found = 'js/not_found.js'
     end
 
     it 'should return the code without errors' do
       result, value = JSCompiler.read_file(@file_name)
       value.should be_true
     end
+
+    it 'should return error if file not found' do
+      result, value = JSCompiler.read_file(@file_not_found)
+      result.should match(/ERROR reading /)
+    end
   end
 
   describe 'compile a whole directory' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsc
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - sub
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 +01:00
+date: 2009-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,28 +25,31 @@ dependencies:
 description: Simple Ruby API to Google Closure Compiler Web service.
 email: fitzkarraldo@gmail.com
 executables: 
+- "#jsc#"
 - jsc
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
 - README.rdoc
+- bin/#jsc#
 - bin/jsc
 files: 
-- .bnsignore
 - .gitignore
 - History.txt
 - README.rdoc
 - Rakefile
+- bin/#jsc#
 - bin/jsc
 - js/compiled_code.js
 - js/errors.js
+- js/temp.js
 - js/warnings.js
 - lib/jsc.rb
+- lib/jsc/clo2.rb
 - lib/jsc/closure_compiler.rb
-- plugins/bin/google_closure_compiler
 - plugins/jsc.el
-- spec/jsc.rb
+- spec/jsc_spec.rb
 - spec/spec_helper.rb
 - spec/wip_spec.rb
 - tasks/jsc.rake

data/.bnsignore

@@ -1,18 +0,0 @@
-# The list of files that should be ignored by Mr Bones.
-# Lines that start with '#' are comments.
-#
-# A .gitignore file can be used instead by setting it as the ignore
-# file in your Rakefile:
-#
-#   Bones {
-#     ignore_file  '.gitignore'
-#   }
-#
-# For a project with a C extension, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-announcement.txt
-coverage
-doc
-pkg

data/plugins/bin/google_closure_compiler

@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. .. lib google_closure_compiler]))
-
-# Give me errors!
-puts ClosureCompiler.compile_file("test_errors.js", "errors")
-puts "**************\n"
-
-# Read file and compile it!
-
-# function passing it the relative path of the file
-code_to_compile, result = ClosureCompiler.read_file('test.js')
-if result
-  compiled_code = ClosureCompiler.compile(code_to_compile, "compiled_code")
-  unless compiled_code.nil?
-    puts compiled_code
-  end
-else
-    puts "ERROR reading file\n"
-end
-puts "**************\n"
-
-# Give me statistics!
-code_to_compile = "function hello(a){alert(\"Hello, \"+a)}hello(\"New user\");"
-puts ClosureCompiler.compile(code_to_compile, "statistics")
-puts "**************\n"
-
-# Compile a whole directory
-js_dir = "js" # relative path to js directory
-puts "Compiling a WHOLE directory...\n"
-puts ClosureCompiler.compile_dir(js_dir, "statistics")
-puts "**************\n"
-
-# Execute every check on the file
-puts ClosureCompiler.compile_file("js/compiled_code.js", "compiled_code")
-puts "*******************"
-puts ClosureCompiler.compile_file("js/compiled_code.js", "warnings")
-puts "*******************"
-puts ClosureCompiler.compile_file("js/compiled_code.js", "errors")
-puts "*******************"
-puts ClosureCompiler.compile_file("js/compiled_code.js", "statistics")