closure 1.3.1 → 1.4.2

data/docs/closure/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.7.2
+    &mdash; Documentation by YARD 0.7.3
   
 </title>
 
@@ -94,9 +94,9 @@
 </div>
     
     <div id="footer">
-  Generated on Tue Jul  5 15:45:36 2011 by 
+  Generated on Sun Oct 23 22:43:17 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.7.2 (ruby-1.9.2).
+  0.7.3 (ruby-1.9.2).
 </div>
 
   </body>

data/lib/closure.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'rack'
 require 'ostruct'
 require 'tempfile'
 
@@ -28,19 +29,6 @@ require 'tempfile'
 
 class Closure
   
-  autoload(:VERSION, 'closure/version')
-  autoload(:BeanShell, 'closure/beanshell')
-  autoload(:Script, 'closure/script')
-  autoload(:Sources, 'closure/sources')
-  autoload(:FileResponse, 'closure/file_response')
-  autoload(:Middleware, 'closure/middleware')
-  autoload(:Compiler, 'closure/compiler')
-  autoload(:Server, 'closure/server')
-  autoload(:Goog, 'closure/goog')
-  autoload(:Templates, 'closure/templates')
-  autoload(:ShowExceptions, 'closure/show_exceptions')
-  
-
   # Filesystem location of the Closure Script install.
   # Typically, where the gem was installed.  This is mainly used
   # internally but may be useful for experimental configurations.
@@ -53,7 +41,6 @@ class Closure
   # Scripts that are distributed with the gem.  These will help get you started quickly.
   BUILT_INS = {
     :soy => File.join(base_path, 'closure-templates'),
-    :externs => File.join(base_path, 'externs'),
     :docs => File.join(base_path, 'docs')
   }
   
@@ -61,7 +48,7 @@ class Closure
   # Easy config. This adds to the global instance of sources and
   # supports using the {BUILT_INS}.
   # @example
-  #   Closure.add_source :goog, '/goog'
+  #   Closure.add_source :soy, '/soy_js'
   #   Closure.add_source './myapp', '/myapp'
   # @overload add_source(directory, path=nil)
   # @overload add_source(built_in, path=nil)
@@ -135,7 +122,6 @@ class Closure
     end
     @@config
   end
-  require 'closure/engines'
   
   # Run the welcome server.  Handy for gem users.
   # @example
@@ -155,3 +141,4 @@ class Closure
   
 end
 
+Dir.glob(File.expand_path('**/*.rb', File.dirname(__FILE__))).each {|f| require f}

data/lib/closure/compiler.rb

@@ -184,49 +184,7 @@ class Closure
         args
       end
   
-      # Transforms arguments to support --module name:* syntax.
-      # @param [Array<String>] args
-      # @return [Array<Hash>] mods
-      def self.module_augment(args)
-        found_starred = false
-        found_numeric = false
-        js_files = []
-        mods = []
-        args_index = args.length
-        while args_index > 0
-          args_index = args_index - 2
-          option, value = args[args_index, 2]
-          if option == '--js'
-            js_files.unshift value
-          elsif option == '--module'
-            if js_files.empty?
-              raise "No --js files for --module #{value}" 
-            end
-            mod = value.split ':'
-            if mod[1] == '*'
-              mod[1] = js_files.size 
-              found_starred = true
-            else
-              found_numeric = true
-            end
-            mods.unshift({
-              :name => mod[0],
-              :requires => mod[2..-1],
-              :files => js_files
-            })
-            js_files = []
-            args[args_index+1] = mod.join ':'
-          end
-        end
-        unless js_files.empty? or mods.empty?
-          raise 'Automatic --module must appear before first --js option.'
-        end
-        if found_starred and found_numeric
-          raise 'Static and automatic --module options can not be mixed.'
-        end
-        mods
-      end
-      
+        
       # The javascript snippet for module info
       # @param [Array<Hash>] mods
       def self.module_info(mods)
@@ -262,6 +220,22 @@ class Closure
         js += "\n};\n"
       end
       
+      
+      # Main function to convert --ns arguments into --js arguments.
+      # Returns module info when modules are processed.
+      # @param [Array<String>] args
+      # @return [Array<Hash>] mods
+      def self.augment(args, sources, env={})
+        mods = extract_modules args
+        if mods
+          module_augment args, sources, mods, env
+        else
+          namespace_augment args, sources, [], env
+        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.
@@ -281,12 +255,42 @@ class Closure
         values
       end
       
+      
+      private
+      
+      
       # Converts --ns arguments into --js arguments
       # @param [Array<String>] args
-      # @return [Array<String>] args
-      def self.namespace_augment(args, sources, env={})
+      def self.module_augment(args, sources, mods, env)
+        walk_modules sources, mods, env
         files = []
-        files_index = 0
+        mods.each do |mod|
+          mod_args = mod[:args]
+          mod_files = (mod[:files] ||= [])
+          # We are adding the bubbled namespaces to the end.
+          # This allows moduleManager.setLoaded to fire earlier
+          # since the bubbled files are needed only for the children.
+          (mod[:bubble]||[]).each do |mod_bubble|
+            namespaces = sources.namespaces_for mod_bubble, env
+            namespaces.each do |ns|
+              mod_args << '--ns' << ns
+            end
+          end
+          namespace_augment(mod_args, sources, files, env)
+          args << '--module'
+          args << "#{mod[:name]}:#{mod_args.size / 2}:#{mod[:requires].join(',')}"
+          mod_args.each_slice(2) do |a,b|
+            args << a << b
+            mod_files << b
+          end
+        end
+      end
+      
+      
+      # Converts --ns arguments into --js arguments
+      # @param [Array<String>] args
+      def self.namespace_augment(args, sources, files, env)
+        files_index = files.length
         args_index = 0
         while args_index < args.length
           option, value = args[args_index, 2]
@@ -294,12 +298,7 @@ class Closure
             sources.files_for(value, files, env)
             replacement = []
             while files_index < files.length
-              if files[files_index] =~ /\.externs$/
-                # use_externs_hack = true
-                replacement.push '--externs'
-              else
-                replacement.push '--js'
-              end
+              replacement.push '--js'
               replacement.push files[files_index]
               files_index = files_index + 1
             end
@@ -308,7 +307,90 @@ class Closure
             args_index = args_index + 2
           end
         end
-        args
+      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=[])
+        files = []
+        mods_seen << seek
+        mods.each do |mod|
+          if (!seek and mod[:requires].empty?) or mod[:requires].include? seek
+            next if mods_seen.include? mod[:name]
+            # Find the needed files for this module's --ns args
+            files_seen_dup = files_seen.dup
+            mod[:args].each_slice(2) do |option, value|
+              if option == '--ns'
+                sources.files_for value, files_seen_dup, env
+              end
+            end
+            mod_files = files_seen_dup[files_seen.size..-1]
+            # Get the needed files for each of the modules requiring this mod
+            files_sets = walk_modules sources, mods, env, mod[:name], mods_seen, files_seen_dup
+            # Find the common files that will bubble up
+            common_files = []
+            child_files = files_sets.reduce([]){|memo, v|common_files |= memo&v; memo|v}
+            mod[:bubble] = common_files
+            # Clear bubbling files from children
+            mods.each do |child_mod|
+              if child_mod[:requires].include? mod[:name]
+                child_mod[:bubble] -= common_files
+              end
+            end
+            # Add to result array
+            files << (mod_files + child_files).uniq
+          end
+        end
+        files
+      end
+      
+
+      # @param [Array<String>] args
+      # @return [Array<Hash>] mods
+      def self.extract_modules(args)
+        found_starred = false
+        found_numeric = false
+        mod_args = []
+        mods = []
+        args_index = args.length
+        while args_index > 0
+          args_index = args_index - 2
+          option, value = args[args_index, 2]
+          if %w{--js --ns}.include? option
+            mod_args.unshift args.delete_at args_index + 1
+            mod_args.unshift args.delete_at args_index
+          elsif option == '--module'
+            if mod_args.empty?
+              raise "No --js or --ns files for --module #{value}" 
+            end
+            mod = value.split ':'
+            if mod[1] == '*'
+              found_starred = true
+            else
+              found_numeric = true
+            end
+            mods.unshift({
+              :name => mod[0],
+              :requires => (mod[2]||'').split(','),
+              :args => mod_args
+            })
+            mod_args = []
+            2.times {args.delete_at args_index}
+          end
+        end
+        unless mod_args.empty? or mods.empty?
+          raise 'Automatic --module must appear before first --js or --ns option.'
+        end
+        if found_starred and found_numeric
+          raise 'Static and automatic --module options can not be mixed.'
+        end
+        if mods.empty?
+          args.insert -1, *mod_args
+          nil
+        else
+          mods
+        end
       end
       
     end

data/lib/closure/goog.rb

@@ -72,13 +72,11 @@ class Closure
       pre_js_tempfile = nil
       begin
         Compiler::Util.expand_paths args, File.dirname(@render_stack.last)
-        orig_externs = Compiler::Util.arg_values args, '--externs'
-        Compiler::Util.namespace_augment args, @sources, @env
-        mods = Compiler::Util.module_augment args
+        mods = Compiler::Util.augment args, @sources, @env
         if Compiler::Util.arg_values(args, '--compilation_level').empty?
           # Raw mode
           comp = Compiler::Compilation.new @env
-          unless mods.empty?
+          if mods
             comp << Compiler::Util.module_info(mods)
             comp << Compiler::Util.module_uris_raw(mods, @sources)
           end
@@ -92,41 +90,19 @@ class Closure
               comp << "document.write(#{script_tag.dump});\n"
               js_counter += 1
               # For modules, just the files for the first module
-              break if !mods.empty? and js_counter >= mods[0][:files].length
+              break if mods and js_counter >= mods[0][:files].length
             end
             args_index = args_index + 2
           end
         else
           # Compiled mode
           module_output_path_prefix = Compiler::Util.arg_values(args, '--module_output_path_prefix').last
-          if !mods.empty? and !module_output_path_prefix
+          if mods and !module_output_path_prefix
             # raise this before compilation so we don't write to a weird place
             raise "--module_output_path_prefix is required when using --module"
           end
-          # If the externs were changed by namespace_augment then we need to include
-          # a temp file containing the goog.provide statements that satisfy compiler.jar.
-          if orig_externs != Compiler::Util.arg_values(args, '--externs')
-            pre_js_tempfile = Tempfile.new 'closure_pre_js'
-            # Insert before the first --js (in case of modules)
-            args_index = 0
-            while args_index < args.length
-              if args[args_index] == '--js'
-                args.insert args_index, '--js', pre_js_tempfile.path
-                break
-              end
-              args_index = args_index + 2
-            end
-            pre_js_tempfile.open
-            @sources.deps_response(File.dirname(base_js), @env).each do |s|
-              next unless s =~ /^goog\.provide/
-              pre_js_tempfile.write s
-            end
-            pre_js_tempfile.close
-            # File mtime is rolled back to not trigger compilation.
-            File.utime(Time.now, Time.at(0), pre_js_tempfile.path)
-          end
           comp = Compiler.compile args, @dependencies, @env
-          unless mods.empty?
+          if mods
             refresh # compilation may add new files, module_uris_compiled uses src_for
             prefix =  File.expand_path module_output_path_prefix, File.dirname(@render_stack.last)
             if comp.js_output_file

data/lib/closure/sources.rb

@@ -131,11 +131,7 @@ class Closure
           response = @deps[base] ||= Rack::Response.new
           response.write "// Dynamic Deps by Closure Script\n"
           @files.sort{|a,b|(a[1][:path]||'')<=>(b[1][:path]||'')}.each do |filename, dep|
-            if filename =~ /\.externs$/
-              dep[:provide].each do |dep_provide|
-                response.write "goog.provide(#{dep_provide.dump});\n"
-              end
-            elsif dep[:path]
+            if dep[:path]
               path = Pathname.new(dep[:path]).relative_path_from(base)
               path = "#{path}?#{dep[:mtime].to_i}"
               response.write "goog.addDependency(#{path.dump}, #{dep[:provide].inspect}, #{dep[:require].inspect});\n"
@@ -192,28 +188,45 @@ class Closure
       calcdeps(ns, namespace, filenames)
     end
     
+    
     # Calculate the file server path for a filename
     # @param (String) filename
     # @return (String)
     def src_for(filename, env={})
       @semaphore.synchronize do
         refresh(env)
-        f, dep = @files.find {|f, dep| f == filename}
-        unless dep and dep.has_key? :path
+        file = @files[filename]
+        unless file and file.has_key? :path
           raise "#{filename.dump} is not available from file server"
         end
-        "#{dep[:path]}?#{dep[:mtime].to_i}"
+        "#{file[:path]}?#{file[:mtime].to_i}"
       end
     end
    
+   
+    # Return all provided and required namespaces for a file.
+    # @param (String) filename
+    # @return (String)
+    def namespaces_for(filename, env={})
+      @semaphore.synchronize do
+        refresh(env)
+        file = @files[filename]
+        raise "#{filename.dump} not found" unless file
+        file[:provide] + file[:require]
+      end
+    end
+
+
     # Certain Script operations, such as building Templates, will need
     # to invalidate the cache.
     def invalidate(env)
       env.delete ENV_FLAG
       @last_been_run = Time.at 0
     end
+    
 
     protected
+
     
     # Namespace recursion with circular stop on the filename
     def calcdeps(ns, namespace, filenames, prev = nil)
@@ -248,7 +261,7 @@ class Closure
       # Scan filesystem for changes.
       @sources.each do |dir, path|
         dir_range = (dir.length..-1)
-        Dir.glob(File.join(dir,'**','*.{js,externs}')).each do |filename|
+        Dir.glob(File.join(dir,'**','*.js')).each do |filename|
           dep = (@files[filename] ||= {})
           dep.delete(:not_found)
           mtime = File.mtime(filename)

data/lib/closure/version.rb

@@ -14,5 +14,5 @@
 
 
 class Closure
-  VERSION = "1.3.1"
+  VERSION = "1.4.2"
 end

data/scripts/config.ru

@@ -10,7 +10,6 @@ Closure.add_source '.', '/'
 # Add some useful built-ins.
 Closure.add_source :soy, '/soy'
 Closure.add_source :docs, '/docs'
-Closure.add_source :externs
 
 # Feel free to use your own compilers.
 # Closure.config.compiler_jar = 'closure-compiler/compiler.jar'

data/scripts/hello/compiler_build.js

@@ -1,5 +1,5 @@
-var c=this;Math.floor(Math.random()*2147483648).toString(36);function d(a){if(!e.test(a))return a;a.indexOf("&")!=-1&&(a=a.replace(f,"&amp;"));a.indexOf("<")!=-1&&(a=a.replace(h,"&lt;"));a.indexOf(">")!=-1&&(a=a.replace(i,"&gt;"));a.indexOf('"')!=-1&&(a=a.replace(l,"&quot;"));return a}var f=/&/g,h=/</g,i=/>/g,l=/\"/g,e=/[&<>\"]/;function m(a,b){if(a<b)return-1;else if(a>b)return 1;return 0};var n,o,p,q;function t(){return c.navigator?c.navigator.userAgent:null}q=p=o=n=!1;var u;if(u=t()){var v=c.navigator;n=u.indexOf("Opera")==0;o=!n&&u.indexOf("MSIE")!=-1;p=!n&&u.indexOf("WebKit")!=-1;q=!n&&!p&&v.product=="Gecko"}var w=o,x=q,y=p,z;
-a:{var A="",B;if(n&&c.opera)var C=c.opera.version,A=typeof C=="function"?C():C;else if(x?B=/rv\:([^\);]+)(\)|;)/:w?B=/MSIE\s+([^\);]+)(\)|;)/:y&&(B=/WebKit\/(\S+)/),B)var D=B.exec(t()),A=D?D[1]:"";if(w){var E,F=c.document;E=F?F.documentMode:void 0;if(E>parseFloat(A)){z=String(E);break a}}z=A}var G={};
-function H(a){if(!G[a]){for(var b=0,r=String(z).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),g=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),Q=Math.max(r.length,g.length),s=0;b==0&&s<Q;s++){var R=r[s]||"",S=g[s]||"",T=RegExp("(\\d*)(\\D*)","g"),U=RegExp("(\\d*)(\\D*)","g");do{var j=T.exec(R)||["","",""],k=U.exec(S)||["","",""];if(j[0].length==0&&k[0].length==0)break;b=m(j[1].length==0?0:parseInt(j[1],10),k[1].length==0?0:parseInt(k[1],10))||m(j[2].length==0,k[2].length==0)||m(j[2],
-k[2])}while(b==0)}G[a]=b>=0}}var I={};function J(){return I[9]||(I[9]=w&&document.documentMode&&document.documentMode>=9)};!w||J();!x&&!w||w&&J()||x&&H("1.9.1");w&&H("9");w&&H(8);var K;(K="ScriptEngine"in c&&c.ScriptEngine()=="JScript")&&(c.ScriptEngineMajorVersion(),c.ScriptEngineMinorVersion(),c.ScriptEngineBuildVersion());function L(a,b){this.a=K?[]:"";a!=null&&this.append.apply(this,arguments)}K?(L.prototype.b=0,L.prototype.append=function(a,b,r){b==null?this.a[this.b++]=a:(this.a.push.apply(this.a,arguments),this.b=this.a.length);return this}):L.prototype.append=function(a,b,r){this.a+=a;if(b!=null)for(var g=1;g<arguments.length;g++)this.a+=arguments[g];return this};L.prototype.clear=function(){K?this.b=this.a.length=0:this.a=""};
-L.prototype.toString=function(){if(K){var a=this.a.join("");this.clear();a&&this.append(a);return a}else return this.a};function M(a){var b=new L;b.append("\tHello ",d(String(a.c)),"!");return b.toString()};function N(a){document.write(M({c:a}))}var O="hello".split("."),P=c;!(O[0]in P)&&P.execScript&&P.execScript("var "+O[0]);for(var V;O.length&&(V=O.shift());)!O.length&&N!==void 0?P[V]=N:P=P[V]?P[V]:P[V]={};
+var c=this;Math.floor(Math.random()*2147483648).toString(36);function d(a,b){if(a<b)return-1;else if(a>b)return 1;return 0};var e,f,h,i;function l(){return c.navigator?c.navigator.userAgent:null}i=h=f=e=false;var m;if(m=l()){var n=c.navigator;e=m.indexOf("Opera")==0;f=!e&&m.indexOf("MSIE")!=-1;h=!e&&m.indexOf("WebKit")!=-1;i=!e&&!h&&n.product=="Gecko"}var o=f,p=i,q=h,t;
+a:{var u="",v;if(e&&c.opera)var w=c.opera.version,u=typeof w=="function"?w():w;else if(p?v=/rv\:([^\);]+)(\)|;)/:o?v=/MSIE\s+([^\);]+)(\)|;)/:q&&(v=/WebKit\/(\S+)/),v)var x=v.exec(l()),u=x?x[1]:"";if(o){var y,z=c.document;y=z?z.documentMode:void 0;if(y>parseFloat(u)){t=String(y);break a}}t=u}var A={};
+function B(a){if(!A[a]){for(var b=0,r=String(t).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),g=String(a).replace(/^[\s\xa0]+|[\s\xa0]+$/g,"").split("."),K=Math.max(r.length,g.length),s=0;b==0&&s<K;s++){var L=r[s]||"",M=g[s]||"",N=RegExp("(\\d*)(\\D*)","g"),O=RegExp("(\\d*)(\\D*)","g");do{var j=N.exec(L)||["","",""],k=O.exec(M)||["","",""];if(j[0].length==0&&k[0].length==0)break;b=d(j[1].length==0?0:parseInt(j[1],10),k[1].length==0?0:parseInt(k[1],10))||d(j[2].length==0,k[2].length==0)||d(j[2],
+k[2])}while(b==0)}A[a]=b>=0}}var C={};function D(){return C[9]||(C[9]=o&&document.documentMode&&document.documentMode>=9)};!o||D();!p&&!o||o&&D()||p&&B("1.9.1");o&&B("9");o&&B(8);var E;(E="ScriptEngine"in c&&c.ScriptEngine()=="JScript")&&(c.ScriptEngineMajorVersion(),c.ScriptEngineMinorVersion(),c.ScriptEngineBuildVersion());function F(a,b){this.a=E?[]:"";a!=null&&this.append.apply(this,arguments)}E?(F.prototype.c=0,F.prototype.append=function(a,b,r){b==null?this.a[this.c++]=a:(this.a.push.apply(this.a,arguments),this.c=this.a.length);return this}):F.prototype.append=function(a,b,r){this.a+=a;if(b!=null)for(var g=1;g<arguments.length;g++)this.a+=arguments[g];return this};F.prototype.clear=function(){E?this.c=this.a.length=0:this.a=""};
+F.prototype.toString=function(){if(E){var a=this.a.join("");this.clear();a&&this.append(a);return a}else return this.a};var G={"\x00":"&#0;",'"':"&quot;","&":"&amp;","'":"&#39;","<":"&lt;",">":"&gt;","\t":"&#9;","\n":"&#10;","\u000b":"&#11;","\u000c":"&#12;","\r":"&#13;"," ":"&#32;","-":"&#45;","/":"&#47;","=":"&#61;","`":"&#96;","\u0085":"&#133;","\u00a0":"&#160;","\u2028":"&#8232;","\u2029":"&#8233;"};function H(a){return G[a]}var I=/[\x00\x22\x26\x27\x3c\x3e]/g;function J(a){var b=new F;b.append("\tHello ",typeof a.b==="object"&&a.b&&a.b.d===0?a.b.content:String(a.b).replace(I,H),"!");return b.toString()};function P(a){document.write(J({b:a}))}var Q="hello".split("."),R=c;!(Q[0]in R)&&R.execScript&&R.execScript("var "+Q[0]);for(var S;Q.length&&(S=Q.shift());)!Q.length&&P!==void 0?R[S]=P:R=R[S]?R[S]:R[S]={};