rapper 0.3.0 → 0.4.0

data/Gemfile

@@ -7,5 +7,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rake", "~> 0.8.7"
-  gem "closure-compiler", "~> 1.0.0"
+  gem "yui-compressor", "~> 0.9.4"
 end

data/Gemfile.lock

@@ -1,16 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    POpen4 (0.1.4)
+      Platform (>= 0.4.0)
+      open4
+    Platform (0.4.0)
     bluecloth (2.0.10)
-    closure-compiler (1.0.0)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    open4 (1.0.1)
     rake (0.8.7)
     rspec (1.3.1)
     yard (0.6.4)
+    yui-compressor (0.9.6)
+      POpen4 (>= 0.1.4)
 
 PLATFORMS
   ruby
@@ -18,8 +24,8 @@ PLATFORMS
 DEPENDENCIES
   bluecloth (~> 2.0.10)
   bundler (~> 1.0.0)
-  closure-compiler (~> 1.0.0)
   jeweler (~> 1.5.2)
   rake (~> 0.8.7)
   rspec (~> 1.3.1)
   yard (~> 0.6.4)
+  yui-compressor (~> 0.9.4)

data/README.markdown

@@ -39,9 +39,11 @@ Rapper is configured using a YAML file that defines the settings to be used in v
       compress: true
       version: true
       # optional, passed to Google Closure Compiler
-      closure_compiler:
-        # default: SIMPLE_OPTIMIZATIONS
-        compilation_level: ADVANCED_OPTIMIZATIONS
+      yui_compressor:
+        line_break: 2000           # default: 2000
+        munge: false               # default: false
+        optimize: true             # default: true
+        preserve_semicolons: false # default: false
 
 The only required setting is `definition_root`. (Of course, you'll still need definition files to define the asset packages that you want build. More on that below.)
 
@@ -52,7 +54,8 @@ The `definition_root` setting in the rapper config is a path to a folder contain
     --- !omap
     - root: public/javascripts
     - destination_root: public/assets # optional, default: root + "/assets"
-    - tag_root: /javascripts
+    - component_tag_root: /javascripts
+    - asset_tag_root: /javascripts/assets
     - suffix: js
     - assets: !omap
         - base: !omap
@@ -126,6 +129,7 @@ Rapper's got a Gemfile. You know what to do.
 
 ## Version history
 
+* **0.4.0** - Switching to YUI Compressor for JavaScript compression due to its better handling of local variable compressing in scopes with eval() usage (I'm looking at you, ExtJS). Adding `component_tag_root` and `asset_tag_root` options to allow better control over URLs.
 * **0.3.0** - Remove hard Closure Compiler dependency (it will still need to be installed to compress JS), shorter view helper method names.
 * **0.2.4** - Add tag_paths() to get all file paths for a given asset.
 * **0.2.2** - Change tag_root behavior to not add `.../assets` path suffix when a `destination_root` is defined.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/rapper/compressors.rb

@@ -1,7 +1,7 @@
 require File.expand_path( File.dirname( __FILE__ ) + "/../yui/css_compressor.rb" )
 require 'fileutils'
 begin
-  require "closure-compiler"
+  require "yui/compressor"
 rescue LoadError; end
 
 module Rapper
@@ -15,7 +15,7 @@ module Rapper
     def compress( file )
       opts = {}
       # TODO: Someday this goes away.
-      opts = get_config( "closure_compiler" ) if file =~ /\.js/
+      opts = get_config( "yui_compressor" ) if file =~ /\.js/
       Rapper::Compressors::Compressor.compress( file, opts )
     end
     
@@ -99,26 +99,26 @@ module Rapper
       end
     end
     
-    # Uses Google's Closure Compiler (via DocumentCloud's closure-compiler gem)
-    # to compress JavaScrpt.
+    # Uses YUI Compressor (via Sam Stephenson's yui-compressor gem) to compress
+    # JavaScrpt.
     class JSCompressor < Compressor
       register ".js"
       
       def self.do_compress( file_path, opts={} )
-        return unless closure_available?
+        return unless compressor_available?
         
-        closure = Closure::Compiler.new( opts )
+        compressor = YUI::JavaScriptCompressor.new( opts )
         
         js = read_file( file_path )
         destination = writable_file( file_path )
         
-        destination.write( closure.compile( js ) )
+        destination.write( compressor.compress( js ) )
         destination.write "\n"
         destination.close
       end
       
-      def self.closure_available?
-        Closure::Compiler.is_a?( Class )
+      def self.compressor_available?
+        YUI::JavaScriptCompressor.is_a?( Class )
       rescue NameError
         false
       end

data/lib/rapper/config.rb

@@ -73,8 +73,8 @@ module Rapper
         "compress" => true,
         "tag_style" => "html5",
         "version" => true,
-        "closure_compiler" => {
-          "compilation_level" => "SIMPLE_OPTIMIZATIONS"
+        "yui_compressor" => {
+          "line_break" => 2000
         }
       }
     end

data/lib/rapper/definition.rb

@@ -20,6 +20,8 @@ module Rapper
       @definition["root"]
     end
     
+    # @return [String] The root for packaged asset files. Defaults to root +
+    #   "/assets".
     def destination_root
       @default_destination_root ||= @definition["root"].gsub( /\/$/, '' ) + "/assets"
       @definition["destination_root"] || @default_destination_root
@@ -28,13 +30,12 @@ module Rapper
     # @return [String] The public url root for the asset component files (used
     # when bundling is off).
     def component_tag_root
-      @definition["tag_root"]
+      @definition["component_tag_root"]
     end
     
     # @return [String] The public url root for packaged asset files.
     def asset_tag_root
-      @default_asset_tag_root ||= @definition["tag_root"].gsub( /\/$/, '' )
-      @definition["destination_root"] ? @default_asset_tag_root : @default_asset_tag_root + "/assets"
+      @definition["asset_tag_root"]
     end
     
     # @return [String] The suffix of files used in this definition.

data/rapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rapper}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyson Tate"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-04-08}
   s.description = %q{Static asset packager and compressor with versioning and built-in view helpers. Compresses files only when they need compressing.}
   s.email = %q{tyson@tysontate.com}
   s.extra_rdoc_files = [
@@ -140,7 +140,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<closure-compiler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<yui-compressor>, ["~> 0.9.4"])
     else
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
       s.add_dependency(%q<yard>, ["~> 0.6.4"])
@@ -148,7 +148,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<closure-compiler>, ["~> 1.0.0"])
+      s.add_dependency(%q<yui-compressor>, ["~> 0.9.4"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])
@@ -157,7 +157,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<closure-compiler>, ["~> 1.0.0"])
+    s.add_dependency(%q<yui-compressor>, ["~> 0.9.4"])
   end
 end
 

data/spec/fixtures/config/asset_definitions/base/javascripts.yml

@@ -1,6 +1,7 @@
 --- !omap 
 - root: spec/fixtures/javascripts
-- tag_root: /javascripts
+- asset_tag_root: /javascripts/assets
+- component_tag_root: /javascripts
 - suffix: js
 - assets: !omap 
     - single_file: !omap 

data/spec/fixtures/config/asset_definitions/base/stylesheets.yml

@@ -1,6 +1,7 @@
 --- !omap 
 - root: spec/fixtures/stylesheets
-- tag_root: /stylesheets
+- asset_tag_root: /stylesheets/assets
+- component_tag_root: /stylesheets
 - suffix: css
 - assets: !omap 
     - single_file: !omap 

data/spec/fixtures/config/asset_definitions/custom_destination/javascripts.yml

@@ -1,7 +1,8 @@
 --- !omap 
 - root: spec/fixtures/javascripts
 - destination_root: tmp/custom_destination
-- tag_root: /javascripts
+- component_tag_root: /javascripts/components
+- asset_tag_root: /javascripts/compiled
 - suffix: js
 - assets: !omap 
     - multiple_files: !omap 

data/spec/fixtures/config/asset_definitions/missing_file/stylesheets.yml

@@ -1,6 +1,7 @@
 --- !omap 
 - root: spec/fixtures/stylesheets
-- tag_root: /stylesheets
+- asset_tag_root: /stylesheets/assets
+- component_tag_root: /stylesheets
 - suffix: css
 - assets: !omap 
     - multiple_files: !omap 

data/spec/fixtures/config/assets.yml

@@ -6,9 +6,8 @@ test:
   compress: true
   tag_style: html
   version: false
-  closure_compiler:
-    compilation_level: ADVANCED_OPTIMIZATIONS
-    formatting: pretty_print
+  yui_compressor:
+    line_break: 0
 test_empty:
   <<: *base
 test_no_definition_root:
@@ -32,6 +31,11 @@ test_custom_destination:
   definition_root: spec/fixtures/config/asset_definitions/custom_destination
   bundle: true
   compress: false
+test_custom_destination_no_bundle:
+  <<: *base
+  definition_root: spec/fixtures/config/asset_definitions/custom_destination
+  bundle: false
+  compress: false
 test_missing_file:
   <<: *base
   definition_root: spec/fixtures/config/asset_definitions/missing_file

data/spec/fixtures/test_cases/compression/definitions/css.yml

@@ -1,6 +1,7 @@
 --- !omap
 - root: spec/fixtures/stylesheets
-- tag_root: /stylesheets
+- asset_tag_root: /stylesheets/assets
+- component_tag_root: /stylesheets
 - suffix: css
 - assets: !omap
     - base: !omap

data/spec/fixtures/test_cases/compression/definitions/js.yml

@@ -1,6 +1,7 @@
 --- !omap
 - root: spec/fixtures/javascripts
-- tag_root: /javascripts
+- asset_tag_root: /javascripts/assets
+- component_tag_root: /javascripts
 - suffix: js
 - assets: !omap
     - base: !omap

data/spec/fixtures/test_cases/compression/expected/javascripts/base.js

@@ -1,2 +1 @@
-var x=1,y=2;function a(){return true}a=1;b=2;function b(){return false};
-
+var x=1;var y=2;function a(){return true}a=1;b=2;function b(){return false};

data/spec/fixtures/test_cases/compression/expected/javascripts/base_reversed.js

@@ -1,2 +1 @@
-a=1;b=2;function b(){return false}var x=1,y=2;function a(){return true};
-
+a=1;b=2;function b(){return false}var x=1;var y=2;function a(){return true};

data/spec/fixtures/test_cases/concatenation/definitions/css.yml

@@ -1,6 +1,7 @@
 --- !omap 
 - root: spec/fixtures/stylesheets
-- tag_root: /stylesheets
+- asset_tag_root: /stylesheets/assets
+- component_tag_root: /stylesheets
 - suffix: css
 - assets: !omap 
     - base: !omap 

data/spec/fixtures/test_cases/concatenation/definitions/js.yml

@@ -1,6 +1,7 @@
 --- !omap 
 - root: spec/fixtures/javascripts
-- tag_root: /javascripts
+- asset_tag_root: /javascripts/assets
+- component_tag_root: /javascripts
 - suffix: js
 - assets: !omap 
     - base: !omap 

data/spec/rapper_spec.rb

@@ -41,8 +41,8 @@ describe Rapper do
       rapper.send( :get_config, "bundle" ).should be_true
       rapper.send( :get_config, "compress" ).should be_true
       rapper.send( :get_config, "version" ).should be_true
-      rapper.send( :get_config, "closure_compiler" ).should == {
-        "compilation_level" => "SIMPLE_OPTIMIZATIONS"
+      rapper.send( :get_config, "yui_compressor" ).should == {
+        "line_break" => 2000
       }
     end
     
@@ -137,9 +137,25 @@ describe Rapper do
       Dir[ "tmp/custom_destination/*" ].should == ["tmp/custom_destination/multiple_files.js"]
     end
     
+    it "uses the asset tag root" do
+      @rapper.js_tag( "javascripts", "multiple_files" ).should ==
+        "<script src=\"/javascripts/compiled/multiple_files.js?v=f3d9\"></script>"
+    end
+  end
+  
+  describe "custom definition destination, without bundling" do
+    before :each do
+      @rapper = Rapper::Engine.new( "spec/fixtures/config/assets.yml", "test_custom_destination_no_bundle" )
+      @rapper.package
+    end
+    
+    it "works" do
+      Dir[ "tmp/custom_destination/*" ].should == ["tmp/custom_destination/multiple_files.js"]
+    end
+    
     it "doesn't use the defaut '/assets' tag root" do
       @rapper.js_tag( "javascripts", "multiple_files" ).should ==
-        "<script src=\"/javascripts/multiple_files.js?v=f3d9\"></script>"
+        "<script src=\"/javascripts/components/simple_1.js?v=f3d9\"></script>\n<script src=\"/javascripts/components/simple_2.js?v=f3d9\"></script>"
     end
   end
   

data/spec/vendor_spec.rb

@@ -1,23 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Closure::Compiler do
+describe YUI::JavaScriptCompressor do
   it "shoud be available" do
-    closure = Closure::Compiler.new
-    closure.compile( "var x = 1; var y = 2;" ).should == "var x=1,y=2;\n"
+    closure = YUI::JavaScriptCompressor.new
+    closure.compress( "var x = 1; var y = 2;" ).should == "var x=1;var y=2;"
   end
-    
-    it "provides whitespace-only, simple, and advanced compression" do
-      # https://github.com/documentcloud/closure-compiler/blob/master/test/unit/test_closure_compiler.rb
-      
-      original = "window.hello = function(name) { return console.log('hello ' + name ); }; hello.squared = function(num) { return num * num; }; hello('world');"
-      compiled_whitespace = "window.hello=function(name){return console.log(\"hello \"+name)};hello.squared=function(num){return num*num};hello(\"world\");\n"
-      compiled_simple = "window.hello=function(a){return console.log(\"hello \"+a)};hello.squared=function(a){return a*a};hello(\"world\");\n"
-      compiled_advanced = "window.a=function(b){return console.log(\"hello \"+b)};hello.b=function(b){return b*b};hello(\"world\");\n"
-      
-      Closure::Compiler.new( :compilation_level => "WHITESPACE_ONLY" ).compile(original).should == compiled_whitespace
-      Closure::Compiler.new.compile(original).should == compiled_simple
-      Closure::Compiler.new( :compilation_level => "ADVANCED_OPTIMIZATIONS" ).compile(original).should == compiled_advanced
-    end
 end
 
 describe YUI::CSS do
@@ -33,4 +20,4 @@ describe YUI::CSS do
       YUI::CSS.compress( test_css ).should == expected_css
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapper
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -07:00
+date: 2011-04-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,15 +121,15 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 51
         segments: 
-        - 1
-        - 0
         - 0
-        version: 1.0.0
+        - 9
+        - 4
+        version: 0.9.4
   type: :development
   requirement: *id007
-  name: closure-compiler
+  name: yui-compressor
 description: Static asset packager and compressor with versioning and built-in view helpers. Compresses files only when they need compressing.
 email: tyson@tysontate.com
 executables: []