closure 1.4.3 → 1.5.0

data/lib/closure/compiler.rb

@@ -14,15 +14,15 @@
 
 
 class Closure
-  
+
   class Compiler
-    
+
     class Error < StandardError
     end
-    
+
     # Java won't let you change working directories and the Closure Compiler
     # doesn't allow setting a base path.  No problem, we can do it.
-    
+
     # These are filename options and will be expanded to a new base.
     OUTPUT_OPTIONS = %w{
       --js_output_file
@@ -32,7 +32,7 @@ class Closure
       --variable_map_output_file
       --module_output_path_prefix
     }
-    
+
     # These are filename options and will be expanded to a new base.
     # These will have their modification times checked against js_output_file.
     INPUT_OPTIONS = %w{
@@ -41,7 +41,7 @@ class Closure
       --property_map_input_file
       --variable_map_input_file
     }
-    
+
     # Compile Javascript. Checks file modification times
     # but does not support namespaces like {Goog#compile} does.
     # @param (Array) args Arguments for the compiler.
@@ -88,28 +88,18 @@ class Closure
       end
       Compilation.new(env, js_output_file, log) << stdout
     end
-    
-    
+
+
     class Compilation
       attr_reader :log
       attr_reader :js_output_file
-      
+
       def initialize(env, js_output_file=nil, log=nil)
         @javascript = []
         @env = env
         @js_output_file = js_output_file
         @log = log
       end
-      
-      # @private deprecated
-      def to_response_with_console
-        response = to_response
-        if response.class == Rack::Response
-          msg = "#to_response_with_console deprecated, use #to_response"
-          response.write "try{console.warn(#{msg.dump})}catch(err){};\n"
-        end
-        response
-      end
 
       # Turn the compiled javascript into a Rack::Response object.
       # Success and warning messages, which aren't raised like errors,
@@ -136,7 +126,7 @@ class Closure
         end
         response
       end
-      
+
       # Appends a string to the javascript.
       # @param [String] javascript
       def <<(javascript)
@@ -156,10 +146,10 @@ class Closure
         end
       end
       alias :to_s :javascript
-      
+
     end
-    
-    
+
+
     # Closure Script extends compiler.jar by transforming the arguments in novel ways.
     # The most obvious augmentation is to support --ns for compiling namespaces.
     # We can also expand paths to a new base, work with modules, and much more.
@@ -183,8 +173,8 @@ class Closure
         end
         args
       end
-  
-        
+
+
       # The javascript snippet for module info
       # @param [Array<Hash>] mods
       def self.module_info(mods)
@@ -207,8 +197,8 @@ class Closure
         end.join ",\n"
         js += "\n};\n"
       end
-    
-    
+
+
       # The javascript snippet for compiled module file locations
       # @param [Array<Hash>] mods
       def self.module_uris_compiled(mods, sources, prefix)
@@ -219,8 +209,8 @@ class Closure
         end.join ",\n"
         js += "\n};\n"
       end
-      
-      
+
+
       # Main function to convert --ns arguments into --js arguments.
       # Returns module info when modules are processed.
       # @param [Array<String>] args
@@ -234,8 +224,8 @@ class Closure
         end
         mods
       end
-      
-      
+
+
       # Extracts the values for a options in the arguments.
       # Use Array#last to emulate compiler.jar for single options.
       # Will collect from an array of options.
@@ -248,17 +238,17 @@ class Closure
         args_index = 0
         while args_index < args.length
           if options.include? args[args_index]
-            values << args[args_index+1] 
+            values << args[args_index+1]
           end
           args_index = args_index + 2
         end
         values
       end
-      
-      
+
+
       private
-      
-      
+
+
       # Converts --ns arguments into --js arguments
       # @param [Array<String>] args
       def self.module_augment(args, sources, mods, env)
@@ -285,8 +275,8 @@ class Closure
           end
         end
       end
-      
-      
+
+
       # Converts --ns arguments into --js arguments
       # @param [Array<String>] args
       def self.namespace_augment(args, sources, files, env)
@@ -309,7 +299,7 @@ class Closure
         end
       end
 
-      
+
       # Insanity-inducing recursive explorer to find common files in child modules.
       # Try every branch in the tree and bubble up common files as we see them.
       def self.walk_modules(sources, mods, env, seek=nil, mods_seen=[], files_seen=[])
@@ -344,7 +334,7 @@ class Closure
         end
         files
       end
-      
+
 
       # @param [Array<String>] args
       # @return [Array<Hash>] mods
@@ -362,7 +352,7 @@ class Closure
             mod_args.unshift args.delete_at args_index
           elsif option == '--module'
             if mod_args.empty?
-              raise "No --js or --ns files for --module #{value}" 
+              raise "No --js or --ns files for --module #{value}"
             end
             mod = value.split ':'
             if mod[1] == '*'
@@ -392,7 +382,7 @@ class Closure
           mods
         end
       end
-      
+
     end
   end
 end

data/lib/closure/goog.rb

@@ -14,9 +14,9 @@
 
 
 class Closure
-  
+
   # Scripts render with an instance named goog in the context.
-  
+
   class Goog
 
     def initialize(env, sources, render_stack)
@@ -25,7 +25,7 @@ class Closure
       @render_stack = render_stack
       @dependencies = []
     end
-    
+
     # You can add additional files to have their mtimes scanned.
     # Perhaps you want to use a .yml file to define build options.
     # Closure::Script calls this for every render so you don't need
@@ -34,13 +34,13 @@ class Closure
       dependency = File.expand_path dependency, File.dirname(@render_stack.last)
       @dependencies << dependency unless @dependencies.include? dependency
     end
-    
-    # If you change any javascript sources then you need to tell Script.
+
+    # If your Script changes any javascript sources then call this.
     # This is a lazy refresh, you may call it repeatedly.
     def refresh
       @sources.invalidate @env
     end
-    
+
     # Convert soy templates to javascript.  Accepts all arguments that
     # SoyToJsSrcCompiler.jar support plus it expands filename globs.
     # All source filenames are relative to the script calling #soy_to_js.
@@ -125,11 +125,11 @@ class Closure
       ensure
         if pre_js_tempfile
           pre_js_tempfile.close
-          pre_js_tempfile.unlink 
+          pre_js_tempfile.unlink
         end
       end
     end
-    
+
     # Calculate the deps src for a filename.
     # @param (String) filename
     # @return (String) http path info with forward caching query.
@@ -159,7 +159,7 @@ class Closure
     def base_js
       @sources.base_js(@env)
     end
-    
+
     # This is where base.js looks to find deps.js by default.  You will always
     # be served a Closure Script generated deps.js from this location.
     # Very old Library versions may get confused by the forward caching query
@@ -183,12 +183,12 @@ class Closure
     # @example
     #  goog.each {|directory, path| ... }
     def each
-      @sources.each do |directory, path| 
+      @sources.each do |directory, path|
         yield directory, path
       end
     end
     include Enumerable
-    
+
   end
-  
+
 end

data/lib/closure/server.rb

@@ -21,9 +21,9 @@ class Closure
   #  sources = Closure::Sources.new
   #  sources.add '/myapp', '../src'
   #  run Closure::Server.new sources
-  
+
   class Server
-    
+
     # @param (Sources) sources An instance configured with your scripts.
     # @param (home_page) home_page Optional file or closure-script to serve as root.
     def initialize(sources, home_page = nil)
@@ -31,7 +31,7 @@ class Closure
       @home_page = home_page
       @working_dir = Dir.getwd
     end
-    
+
     # Rack interface.
     # @param (Hash) env Rack environment.
     # @return (Array)[status, headers, body]
@@ -74,9 +74,9 @@ class Closure
       end
       not_found
     end
-    
+
     private
-    
+
     # Status 404 with X-Cascade => pass.
     # @return (Array)[status, headers, body]
     def not_found
@@ -90,5 +90,5 @@ class Closure
     end
 
   end
-  
+
 end

data/lib/closure/show_exceptions.rb

@@ -14,7 +14,7 @@
 
 
 class Closure
-  
+
   # This is Rack middleware to show Ruby exceptions.  It is automatically loaded when
   # using Closure::Middleware.  It works very much like Rack::ShowExceptions but will
   # use the Javascript console when it can detect the request was for javascript.
@@ -22,9 +22,9 @@ class Closure
   # If Javascript detection isn't working because you're not using .js.erb for the
   # extension, add this as the first line of your script:
   #     <% @response.headers['Content-Type'] = 'application/javascript' %>
-  
+
   class ShowExceptions
-    
+
     # @private - internal use only
     class Javascript
       def initialize(app)
@@ -36,7 +36,7 @@ class Closure
       rescue Closure::Compiler::Error => e
         raise e unless env[Script::ENV_ERROR_CONTENT_TYPE] == 'application/javascript'
         body = 'try{console.error('
-        body += '"Closure Compiler: %s\n\n", '
+        body += '"Closure Compiler: %s\n", '
         body += "#{e.message.rstrip.dump}"
         body += ')}catch(err){}'
         body
@@ -47,7 +47,7 @@ class Closure
       rescue Closure::Templates::Error => e
         raise e unless env[Script::ENV_ERROR_CONTENT_TYPE] == 'application/javascript'
         body = 'try{console.error('
-        body += '"Closure Templates: 1 error(s)\n\n", '
+        body += '"Closure Templates: 1 error(s)\n$s", '
         body += "#{e.message.rstrip.dump}"
         body += ')}catch(err){}'
         body
@@ -58,10 +58,13 @@ class Closure
       rescue StandardError, LoadError, SyntaxError => e
         raise e unless env[Script::ENV_ERROR_CONTENT_TYPE] == 'application/javascript'
         body = 'try{console.error('
-        body += '"Closure Script: %s\n\n", '
-        body += "#{e.class.to_s.dump}, "
+        if e.class.to_s == e.message.rstrip
+            body += '"Closure Script: %s\n%s", '
+        else
+            body += '"Closure Script: %s\n\n%s\n\n%s", '
+            body += "#{e.class.to_s.dump}, "
+        end
         body += "#{e.message.rstrip.dump}, "
-        body += '"\n\n", '
         body += "#{e.backtrace.join("\n").dump}"
         body += ')}catch(err){}'
         body
@@ -70,14 +73,14 @@ class Closure
           "Content-Length" => body.size.to_s},
          [body]]
       end
-      
+
     end
-    
+
     # @private - internal use only
     class Html < Rack::ShowExceptions
       #TODO make our own someday
     end
-  
+
     def initialize(app)
       @app = Html.new(Javascript.new(app))
     end
@@ -87,4 +90,4 @@ class Closure
     end
   end
 
-end
+end

data/lib/closure/version.rb

@@ -14,5 +14,5 @@
 
 
 class Closure
-  VERSION = "1.4.3"
+  VERSION = "1.5.0"
 end

data/scripts/git.erb

@@ -0,0 +1,183 @@
+<%
+# Copyright 2011 The Closure Script Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'rexml/document'
+require 'thread'
+
+# This is an example of a complex Closure Script.
+# It would be easier to read and more performant if split up
+# into an includable .rb file and multiple templates.
+# But speed isn't a problem and the single file format makes
+# it just a touch easier to share and move around.
+
+# Example usage:
+#   render 'git', :git_name => 'Closure Library', :git_path => 'closure-library',
+#          :git_url => 'http://closure-library.googlecode.com/git/trunk/'
+#
+# Include as many as you want and they can all be updating at once.
+# Don't supply any locals if you just want Closure::Git for manual use.
+
+class Closure::Git
+
+  # Repository objects are held in global class variable.
+  # Checking out runs in a background thread.
+  # repo = Closure::Git['lib-folder', 'http://git.example.org/trunk']
+  @repos ||= {}
+  def self.[](path, url=nil, name=nil)
+    repo = @repos[path]
+    raise "url and name requried for setup" if !repo and (!url or !name)
+    repo = @repos[path] ||= new(path, url)
+    repo.name ||= url
+    repo.name = name if name
+    repo
+  end
+
+  # Configurable Subversion shell command
+  def self.git; @git ||= 'git'; end
+  def self.git=(git); @git = git; end
+
+  def initialize(path, url)
+    @semaphore = Mutex.new
+    @running = false
+    @path = path
+    @url = url
+    @name = ''
+    @log = nil
+  end
+
+  attr_reader :running
+  attr_reader :path
+  attr_reader :url
+  attr_accessor :name
+  attr_accessor :log
+
+  # Update or checkout a Git repository.
+  # Closure Script is thread-safe and so is this.
+  # Although the locks in Subversion would prevent it
+  # from corrupting (one would hope), we don't want our
+  # global object to be in an indeterminate state with two
+  # threads running because submit was hit twice.
+  def update(version='TODO')
+    @semaphore.synchronize do
+      return if running
+      @running = true
+      Thread.new do
+        @log = "Cloning. Stand by..."
+        @local_revision = 'CLONING'
+        cmd = "#{self.class.git.dump} clone #{url.dump} #{path.dump}"
+        @log = "$ #{cmd}\n" + `#{cmd} 2>&1`
+        @local_revision = nil
+        @running = false
+      end
+    end
+  end
+
+  def info(location)
+    result = `#{self.class.git.dump} -C #{location.dump} name-rev --name-only HEAD`
+    return result if $? == 0
+    return nil
+  end
+
+  def local_revision
+    return @local_revision if @local_revision
+    @local_revision = info(path)
+  end
+
+end
+
+
+if defined? git_path and defined? git_url and defined? git_name
+  git = Closure::Git[git_path, git_url, git_name]
+  if defined? git_update
+    git.update git_update
+  end
+elsif params['git_path']
+  git = Closure::Git[params['git_path']]
+  if post?
+    git.update params['git_update']
+    response.redirect params['return_to']
+  end
+end
+
+
+if get? and git and render_stack.size > 1
+  is_running = !!git.running
+  action = expand_src File.join File.dirname(__FILE__), File.basename(__FILE__, File.extname(__FILE__))
+-%>
+<form action='<%=h action %>' method="post">
+  <input type="hidden" name="git_path" value="<%=h git_path %>" size="8" />
+  <input type="hidden" name="return_to" value="<%=h path %>" size="8" />
+
+  <%=h git.name %>
+  <% if is_running -%>
+    is cloning.
+  <% elsif git.local_revision -%>
+    installed: <%=h git.local_revision %>
+  <% else -%>
+    not installed.
+  <% end -%>
+  &nbsp;&nbsp;
+
+  <% if is_running %>
+    <% unless @git_document_reload_on_page
+         @git_document_reload_on_page = true -%>
+         <script type="text/javascript" charset="utf-8">
+           setTimeout("document.location.reload()", 2500);
+         </script>
+  <%   end
+     elsif !git.local_revision -%>
+    <input type="submit" value="Clone" />
+    &nbsp;&nbsp;
+  <% end -%>
+
+  <% if is_running -%>
+    Stand by...
+  <% elsif git.log -%>
+    <% unless git.local_revision -%>
+    <span style="color:red">ERROR: </span>
+    <% end -%>
+    <a href="<%= action %>?git_path=<%=u git.path %>&return_to=<%=u path %>">VIEW LOG</a>
+  <% end -%>
+
+</form>
+<% elsif get? and git -%>
+<!DOCTYPE html>
+<html>
+  <head>
+    <style type="text/css" media="screen">
+      body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}
+      select,input,button,textarea,button{font:99% arial,helvetica,clean,sans-serif;}
+      table{font-size:inherit;font:100%;}
+      pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
+      th {text-align: right; padding: 2px 10px 2px 0px}
+    </style>
+  </head>
+  <body>
+    <a href="<%=h params['return_to'] %>">Back</a>
+    <h1><%=h git.name %></h1>
+    <table border="0" cellspacing="0" cellpadding="0">
+      <tr><th>Local folder:</th><td><%=h git.path %></td></tr>
+      <tr><th>Local revision:</th><td><%=h git.local_revision %></td></tr>
+      <tr><th>Repository URL:</th><td><%=h git.url %></td></tr>
+    </table>
+    <% if git.log -%>
+      <h2>Results of last run:</h2>
+      <pre><%=h git.log %></pre>
+      <a href="<%=h params['return_to'] %>">Back</a>
+      <% git.log = nil %>
+    <% end -%>
+  </body>
+</html>
+<% end -%>

data/scripts/hello/compiler.js.erb

@@ -1,10 +1,10 @@
-<% 
+<%
 # Closure Compiler is run from a Script.  To obtain
 # the dynamically generated javascript from this file:
 # http://localhost:8080/hello/compiler.js
 
 # These are the same options as compiler.jar.  Two exceptions:
-# 1. No --compilation_level will load the original sources 
+# 1. No --compilation_level will load the original sources
 #    instead of using the compiler.jar default.
 # 2. The --ns argument compiles a namespace.  Closure Script simply
 #    turns these into --js arguments before calling the compiler.

data/scripts/hello/hello.js

@@ -8,4 +8,4 @@ myapp.hello = function(subject) {
   document.write(myapp.legume.hello({subject:subject}));
 }
 
-goog.exportSymbol('hello', myapp.hello)
+goog.exportSymbol('hello', myapp.hello)

data/scripts/hello/index.erb

@@ -1,6 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta content="text/html;charset=utf-8" http-equiv="Content-Type">
+    <meta content="utf-8" http-equiv="encoding">
+    <style type="text/css" media="screen">
+      html {font-family: sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;}
+      button,input,optgroup,select,textarea {font-family: sans-serif; font-size: inherit;}
+    </style>
     <script src='compiler.js?<%= query_string %>'></script>
   </head>
   <body>

data/scripts/hello/legume.js

@@ -1,20 +1,25 @@
 // This file was automatically generated from legume.soy.
 // Please don't edit this file by hand.
 
+/**
+ * @fileoverview Templates in namespace myapp.legume.
+ */
+
 goog.provide('myapp.legume');
 
 goog.require('soy');
-goog.require('soy.StringBuilder');
+goog.require('soydata');
 
 
 /**
  * @param {Object.<string, *>=} opt_data
- * @param {soy.StringBuilder=} opt_sb
+ * @param {(null|undefined)=} opt_ignored
  * @return {string}
- * @notypecheck
+ * @suppress {checkTypes|uselessCode}
  */
-myapp.legume.hello = function(opt_data, opt_sb) {
-  var output = opt_sb || new soy.StringBuilder();
-  output.append('\tHello ', soy.$$escapeHtml(opt_data.subject), '!');
-  return opt_sb ? '' : output.toString();
+myapp.legume.hello = function(opt_data, opt_ignored) {
+  return 'Hello ' + soy.$$escapeHtml(opt_data.subject) + '!';
 };
+if (goog.DEBUG) {
+  myapp.legume.hello.soyTemplateName = 'myapp.legume.hello';
+}