closure 1.5.0 → 1.5.1

data/lib/closure/script.rb

@@ -15,7 +15,7 @@
 require 'pathname'
 
 class Closure
-  
+
   # A Closure::Script instance is the context in which scripts are rendered.
   # It inherits everything from Rack::Request and supplies a Response instance
   # you can use for redirects, cookies, and other controller actions.
@@ -26,9 +26,9 @@ class Closure
 
     class RenderStackOverflow < StandardError
     end
-    
+
     ENV_ERROR_CONTENT_TYPE = 'closure.error.content_type'
-    
+
     def initialize(env, sources, filename)
       super(env)
       @render_stack = []
@@ -43,7 +43,7 @@ class Closure
         # Make errors appear from the render instead of the engine.call
         e.set_backtrace e.backtrace[1..-1]
         env[ENV_ERROR_CONTENT_TYPE] = @response.finish[1]["Content-Type"] rescue nil
-        raise e 
+        raise e
       end
       @response.status = 404
       @response.write "404 Not Found\n"
@@ -53,9 +53,9 @@ class Closure
       env[ENV_ERROR_CONTENT_TYPE] = @response.finish[1]["Content-Type"] rescue nil
       raise e
     end
-    
+
     # After rendering, #finish will be sent to the client.
-    # If you replace the response or add to the response#body, 
+    # If you replace the response or add to the response#body,
     # the script engine rendering will not be added.
     # @return [Rack::Response]
     attr_accessor :response
@@ -67,10 +67,10 @@ class Closure
     # An array of filenames representing the current render stack.
     # @example
     #  <%= if render_stack.size == 1
-    #        render 'html_version' 
+    #        render 'html_version'
     #      else
     #        render 'included_version'
-    #      end 
+    #      end
     #  %>
     # @return [<Array>]
     attr_reader :render_stack
@@ -84,7 +84,7 @@ class Closure
       if render_stack.size > 100
         # Since nobody sane should recurse through here, this mainly
         # finds a render self that you might get after a copy and paste
-        raise RenderStackOverflow 
+        raise RenderStackOverflow
       elsif render_stack.size > 0
         # Hooray for relative paths and easily movable files
         filename = File.expand_path(filename, File.dirname(render_stack.last))
@@ -93,16 +93,16 @@ class Closure
         filename = File.expand_path(filename)
         raise NotFound if File.basename(filename) =~ /^_/
       end
-      ext = File.extname(filename)
+      fext = File.extname(filename)
       files1 = [filename]
-      files1 << filename + '.html' if ext == ''
-      files1 << filename.sub(/.html$/,'') if ext == '.html'
+      files1 << filename + '.html' if fext == ''
+      files1 << filename.sub(/.html$/,'') if fext == '.html'
       files1.each do |filename1|
         Closure.config.engines.each do |ext, engine|
           files2 = [filename1+ext]
           files2 << filename1.gsub(/.html$/, ext) if File.extname(filename1) == '.html'
           unless filename1 =~ /^_/ or render_stack.empty?
-            files2 = files2 + files2.collect {|f| "#{File.dirname(f)}/_#{File.basename(f)}"} 
+            files2 = files2 + files2.collect {|f| "#{File.dirname(f)}/_#{File.basename(f)}"}
           end
           files2.each do |filename2|
             if File.file?(filename2) and File.readable?(filename2)
@@ -120,7 +120,7 @@ class Closure
       end
       raise NotFound
     end
-    
+
     # Helper for finding files relative to Scripts.
     # @param [String] filename
     # @return [String] absolute filesystem path
@@ -133,12 +133,11 @@ class Closure
     # @param [String] filename
     # @return [String] absolute http path
     def expand_src(filename, dir=nil)
-      found = false
       filename = expand_path filename, dir
       src = nil
-      @goog.each do |dir, path|
-        dir_range = (dir.length..-1)
-        if filename.index(dir) == 0
+      @goog.each do |directory, path|
+        dir_range = (directory.length..-1)
+        if filename.index(directory) == 0
           src = "#{path}#{filename.slice(dir_range)}"
           break
         end
@@ -146,7 +145,7 @@ class Closure
       raise Errno::ENOENT unless src
       src
     end
-    
+
     # Helper to locate a file as a file server path.
     # @param [String] filename
     # @return [String] relative http path
@@ -155,7 +154,7 @@ class Closure
       base = Pathname.new File.dirname path_info
       Pathname.new(file).relative_path_from(base).to_s
     end
-    
+
   end
-  
+
 end

data/lib/closure/show_exceptions.rb

@@ -39,7 +39,6 @@ class Closure
         body += '"Closure Compiler: %s\n", '
         body += "#{e.message.rstrip.dump}"
         body += ')}catch(err){}'
-        body
         [200,
          {"Content-Type" => "application/javascript",
           "Content-Length" => body.size.to_s},
@@ -50,7 +49,6 @@ class Closure
         body += '"Closure Templates: 1 error(s)\n$s", '
         body += "#{e.message.rstrip.dump}"
         body += ')}catch(err){}'
-        body
         [200,
          {"Content-Type" => "application/javascript",
           "Content-Length" => body.size.to_s},
@@ -67,7 +65,6 @@ class Closure
         body += "#{e.message.rstrip.dump}, "
         body += "#{e.backtrace.join("\n").dump}"
         body += ')}catch(err){}'
-        body
         [200,
          {"Content-Type" => "application/javascript",
           "Content-Length" => body.size.to_s},

data/lib/closure/templates.rb

@@ -15,12 +15,12 @@
 require 'thread'
 
 class Closure
-  
+
   class Templates
-    
+
     class Error < StandardError
     end
-    
+
     # Compiles soy to javascript with SoyToJsSrcCompiler.jar.
     # Supports globbing on source filename arguments.
     # @example
@@ -49,7 +49,7 @@ class Closure
             args_index += 1
           end
           args_index += 1
-        else 
+        else
           arg = args[args_index]
           arg = File.expand_path(arg, base) if base
           if arg =~ /\*/
@@ -62,9 +62,9 @@ class Closure
       end
       # extract filenames
       mode = :start
-      args.each do |arg|
-        mode = :out and next if arg == '--outputPathFormat'
-        files << arg if mode == :collect
+      args.each do |argument|
+        mode = :out and next if argument == '--outputPathFormat'
+        files << argument if mode == :collect
         mode = :collect if mode == :out
       end
       # detect source changes
@@ -81,15 +81,15 @@ class Closure
       mtimes.clear
       # compile as needed
       if !compiled
-        out, err = Closure.run_java Closure.config.soy_js_jar, 'com.google.template.soy.SoyToJsSrcCompiler', args
+        _, err = Closure.run_java Closure.config.soy_js_jar, 'com.google.template.soy.SoyToJsSrcCompiler', args
         unless err.empty?
-          raise Error, err 
+          raise Error, err
         end
       end
       # success, keep the mtimes for next time
       mtimes.merge! new_mtimes
     end
-    
+
     private
 
     # We are unable to determine an output file to compare mtimes against.
@@ -104,8 +104,8 @@ class Closure
       end
       mtimes[:mtimes]
     end
-    
-    
+
+
   end
-  
+
 end

data/lib/closure/version.rb

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

data/lib/closure.rb

@@ -28,7 +28,7 @@ require 'tempfile'
 #   run Rack::File.new './public'
 
 class Closure
-  
+
   # 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.
@@ -36,15 +36,15 @@ class Closure
   def self.base_path
     @@base_path ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
   end
-  
+
 
   # Scripts that are distributed with the gem.  These will help get you started quickly.
   BUILT_INS = {
     :soy => File.join(base_path, 'closure-templates'),
     :docs => File.join(base_path, 'docs')
   }
-  
-  
+
+
   # Easy config. This adds to the global instance of sources and
   # supports using the {BUILT_INS}.
   # @example
@@ -57,7 +57,7 @@ class Closure
   # @param (Symbol) built_in
   def self.add_source(directory, path=nil)
     if directory.kind_of? Symbol
-      dir = BUILT_INS[directory] 
+      dir = BUILT_INS[directory]
       raise "Unknown built-in: #{directory}" unless dir
       directory = dir
     end
@@ -73,8 +73,8 @@ class Closure
   def self.sources
     @@sources ||= Sources.new
   end
-  
-  
+
+
   # Execute jar in a REPL or with JRuby
   # @private - internal use only
   # @param (String) jar Path to .jar file
@@ -102,8 +102,8 @@ class Closure
     end
     [out, err]
   end
-  
-  
+
+
   # Set these before the rack server is called for the first time.
   # === Attributes:
   # - (String) *java* -- default: "java" -- Your Java executable. Not used under JRuby.
@@ -123,7 +123,7 @@ class Closure
     end
     @@config
   end
-  
+
   # Run the welcome server.  Handy for gem users.
   # @example
   #  ruby -e "require 'rubygems'; gem 'closure'; require 'closure'; Closure.welcome"
@@ -139,7 +139,7 @@ class Closure
     print "Closure Script Welcome Server: http://localhost:#{port}/\n"
     server.start
   end
-  
+
 end
 
-Dir.glob(File.expand_path('**/*.rb', File.dirname(__FILE__))).each {|f| require f}
+Dir.glob(File.expand_path('**/*.rb', File.dirname(__FILE__))).each {|f| require f unless f == __FILE__}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closure
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - David Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -105,11 +105,6 @@ files:
 - scripts/modules/app.js
 - scripts/modules/app_init.js
 - scripts/modules/compiler.js.erb
-- scripts/modules/compiler_build.js
-- scripts/modules/compiler_build.map
-- scripts/modules/compiler_build_api.js
-- scripts/modules/compiler_build_app.js
-- scripts/modules/compiler_build_settings.js
 - scripts/modules/index.erb
 - scripts/modules/settings.js
 - scripts/modules/settings_init.js
@@ -117,7 +112,7 @@ files:
 - scripts/welcome.erb
 homepage: https://github.com/AE9RB/closure-script
 licenses:
-- https://opensource.org/licenses/Apache-2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/scripts/modules/compiler_build.js

@@ -1,6 +0,0 @@
-var MODULE_INFO = {"app": [], "api": ["app"], "settings": ["app"]};
-var MODULE_URIS = {
-"app": ["/modules/compiler_build_app.js?1458503735"],
-"api": ["/modules/compiler_build_api.js?1458503735"],
-"settings": ["/modules/compiler_build_settings.js?1458503735"]
-};