smart_asset 0.5.11 → 0.6.0

data/README.md

@@ -10,9 +10,9 @@ Features
 
 Similar to <code>AssetPackager</code>, but with the following changes:
 
-* Uses file size and super fast hashing ([Murmur3](https://github.com/PeterScott/murmur3)) to determine if a new compressed package should be created
-* [uglify-js](https://github.com/mishoo/UglifyJS) for javascript compression
-* [clean-css](https://github.com/GoalSmashers/clean-css) for css compression
+* Uses file size and hashing to determine if a new compressed package should be created
+* Closure Compiler for javascript compression
+* YUI Compressor for css compression
 * Framework agnostic (adapters provided for Rails 2, Rails 3, Sinatra, and Stasis)
 
 <a name="installation"></a>
@@ -26,12 +26,6 @@ Installation
 gem install smart_asset
 </pre>
 
-### Install npm packages
-
-<pre>
-npm install uglify-js clean-css -g
-</pre>
-
 ### Install 
 
 ### Rails 2
@@ -157,7 +151,7 @@ You may use environment variables with the <code>smart\_asset</code> command to
 
 <code>MODIFIED='12/1/2010 12:00'</code><br/>Use a default modified time other than Time.now for non-version controlled files
 
-<code>WARN=1</code><br/>Get compression warnings from UglifyJS
+<code>WARN=1</code><br/>Get compression warnings
 
 #### Example:
 

data/lib/smart_asset.rb

@@ -73,20 +73,25 @@ class SmartAsset
             tmp = "#{dest}/tmp.#{ext}"
             File.open(tmp, 'w') { |f| f.write(data) }
             puts "\nCreating #{package}..."
-            warning = ENV['WARN'] ? " -v" : nil
 
-            unless @bin
-              @bin = Dir.chdir(@root) { `npm bin`.strip }
-              @bin = File.directory?(@bin) ? "#{@bin}/" : nil
-            end
+            # Binary paths
+            bin      = File.expand_path(File.dirname(__FILE__) + '/../bin')
+            compiler = bin + '/compiler.jar'
+            yui      = bin + '/yui.jar'
             
             if ext == 'js'
-              cmd = "#{@bin}uglifyjs --output #{package}#{warning} -nc #{tmp}"
+              warning = ENV['WARN'] ? nil : " --warning_level QUIET"
+              cmd = "java -jar #{compiler} --js #{tmp} --js_output_file #{package}#{warning}"
             elsif ext == 'css'
-              cmd = "#{@bin}cleancss #{tmp} -o #{package}"
+              warning = ENV['WARN'] ? " -v" : nil
+              cmd = "java -jar #{yui} #{tmp} -o #{package}#{warning}"
             end
+
             puts cmd if ENV['DEBUG']
-            `#{cmd}`
+            cmd_output = `#{cmd}`
+
+            raise "Error running `#{cmd}`:\n#{cmd_output}"  unless $?.success?
+            
             FileUtils.rm(tmp) unless ENV['DEBUG']
             
             # Fix YUI compression issue
@@ -242,4 +247,4 @@ end
 
 require "smart_asset/adapters/rails#{Rails.version[0..0]}" if defined?(Rails)
 require "smart_asset/adapters/sinatra" if defined?(Sinatra)
-require "smart_asset/adapters/stasis" if defined?(Stasis)
+require "smart_asset/adapters/stasis" if defined?(Stasis)

data/smart_asset.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "smart_asset"
-  s.version     = '0.5.11'
+  s.version     = '0.6.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Winton Welsh"]
   s.email       = ["mail@wintoni.us"]

data/spec/fixtures/production_output.txt

@@ -1,2 +1,2 @@
-<script src="/packaged/541a83e3_package.js"></script>
-<link href="/packaged/63bae034_package.css" media="screen" rel="stylesheet" />
+<script src="/packaged/382823ce_package.js"></script>
+<link href="/packaged/fa00472f_package.css" media="screen" rel="stylesheet" />

data/spec/run

@@ -16,13 +16,13 @@
 # puts "\n"
 
 ENV['RAILS'] = '3'
-ENV['RAILS_ENV'] = 'development'
-system "spec -f n -c spec"
+# ENV['RAILS_ENV'] = 'development'
+# system "spec -f n -c spec"
 
-# puts "\n"
+puts "\n"
 
-# ENV['RAILS_ENV'] = 'production'
-# system "spec -f n -c spec"
+ENV['RAILS_ENV'] = 'production'
+system "spec -f n -c spec"
 
 # ENV.delete 'RAILS'
 # ENV.delete 'RAILS_ENV'

data/spec/smart_asset_spec.rb

@@ -4,7 +4,7 @@ unless FrameworkFixture.framework
   describe SmartAsset do
     
     include SmartAsset::Helper
-  
+
     before(:all) do
       @config = "spec/fixtures/assets.yml"
       @dest = "#{$root}/spec/fixtures/assets/compressed"
@@ -13,11 +13,11 @@ unless FrameworkFixture.framework
         package.js
       )
       @versions = %w(
-        63bae034
-        541a83e3
+        fa00472f
+        382823ce
       )
     end
-  
+
     describe :load_config do
     
       before(:all) do
@@ -79,7 +79,7 @@ unless FrameworkFixture.framework
         SmartAsset.sources.should == {"javascripts"=>"javascripts", "stylesheets"=>"stylesheets"}
       end
     end
-  
+
     describe :binary do
       describe 'no compressed assets' do
       
@@ -203,7 +203,7 @@ unless FrameworkFixture.framework
             end
         
             it "should rewrite javascript package with underscore code first" do
-              File.size(path = "#{@dest}/dbd79469_#{@files[1]}").should > 0
+              File.size(path = "#{@dest}/4922c055_#{@files[1]}").should > 0
               js = File.read(path)
               js.index('jQuery').should > js.index('VERSION')
               js.include?('jQuery').should == true
@@ -231,7 +231,7 @@ unless FrameworkFixture.framework
             end
         
             it "should rewrite javascript package with only jquery" do
-              File.size(path = "#{@dest}/18f448b8_#{@files[1]}").should > 0
+              File.size(path = "#{@dest}/5b838e70_#{@files[1]}").should > 0
               js = File.read(path)
               js.include?('jQuery').should == true
               js.include?('VERSION').should == false
@@ -267,7 +267,7 @@ unless FrameworkFixture.framework
             before(:all) do
               @modified = Time.parse('12-01-2010 08:00:00 UTC')
               ENV['MODIFIED'] = @modified.to_s
-              @package = "#{@dest}/c3939102_#{@files[1]}"
+              @package = "#{@dest}/73af2a89_#{@files[1]}"
               @untracked = "#{$root}/spec/fixtures/assets/javascripts/untracked.js"
               
               File.open(@untracked, 'w') { |f| f.write("var untracked = true;") }
@@ -299,7 +299,7 @@ unless FrameworkFixture.framework
         end
       end
     end
-  
+
     describe :path do
     
       describe "development" do

metadata

@@ -1,159 +1,161 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: smart_asset
-version: !ruby/object:Gem::Version
-  version: 0.5.11
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
-authors:
+authors: 
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-07-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: framework_fixture
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: stasis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.0.pre
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: stasis
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -354405171
+        segments: 
+        - 0
+        - 2
+        - 0
+        - pre
         version: 0.2.0.pre
-- !ruby/object:Gem::Dependency
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: change
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
 description: Smart asset packaging for Rails, Sinatra, and Stasis.
-email:
+email: 
 - mail@wintoni.us
-executables:
+executables: 
+- compiler.jar
 - smart_asset
+- yui.jar
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- bin/compiler.jar
 - bin/smart_asset
+- bin/yui.jar
 - lib/smart_asset.rb
 - lib/smart_asset/adapters/rails2.rb
 - lib/smart_asset/adapters/rails3.rb
@@ -161,7 +163,6 @@ files:
 - lib/smart_asset/adapters/stasis.rb
 - lib/smart_asset/helper.rb
 - lib/smart_asset/recipes.rb
-- package.json
 - recipes/smart_asset.rb
 - smart_asset.gemspec
 - spec/fixtures/all_frameworks/assets.yml
@@ -194,29 +195,38 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/winton/smart_asset
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Smart asset packaging for Rails, Sinatra, and Stasis
-test_files:
+test_files: 
 - spec/fixtures/all_frameworks/assets.yml
 - spec/fixtures/all_frameworks/test.html.erb
 - spec/fixtures/assets.yml

data/package.json

@@ -1,8 +0,0 @@
-{
-	"name": "smart_asset",
-	"version": "0.1.0",
-	"dependencies": {
-		"clean-css": "",
-		"uglify-js": ""
-	}
-}