assette 0.0.8 → 0.0.9

data/Gemfile

@@ -15,4 +15,5 @@ gem "json", '>= 1.4'
 gem "sass", '>= 3.1'
 gem "mime-types", ">= 1.16", :require => 'mime/types'
 gem "git"
-gem "coffee-script", "~> 2"
+gem "coffee-script", "~> 2"
+gem "uglifier"

data/Gemfile.lock

@@ -31,6 +31,9 @@ GEM
     rspec-mocks (2.4.0)
     sass (3.1.2)
     thor (0.14.6)
+    uglifier (1.1.0)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     yard (0.6.8)
 
 PLATFORMS
@@ -49,4 +52,5 @@ DEPENDENCIES
   rspec (~> 2.4.0)
   sass (>= 3.1)
   thor (~> 0)
+  uglifier
   yard (~> 0.6.0)

data/Rakefile

@@ -28,6 +28,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency "json", '>= 1.4'
   gem.add_runtime_dependency "sass", '>= 3.1'
   gem.add_runtime_dependency "coffee-script", '~> 2'
+  gem.add_runtime_dependency "uglifier"
   gem.add_runtime_dependency "mime-types", ">= 1.16"
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/assette.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assette}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Tal Atlas}]
-  s.date = %q{2011-11-22}
+  s.date = %q{2011-12-09}
   s.description = %q{Renders all asset types (coffeescript/sass/scss) as equals}
   s.email = %q{me@tal.by}
   s.executables = [%q{assette}]
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "assette.gemspec",
     "bin/assette",
     "examples/.asset_key",
-    "examples/.assette_pid",
     "examples/config/assets.rb",
     "examples/myapp/templates/bar/index.html.mustache",
     "examples/myapp/templates/foo/_partial.html.mustache",
@@ -56,6 +55,7 @@ Gem::Specification.new do |s|
     "lib/assette/post_processor.rb",
     "lib/assette/post_processors.rb",
     "lib/assette/post_processors/cache_buster.rb",
+    "lib/assette/post_processors/js_min.rb",
     "lib/assette/reader.rb",
     "lib/assette/readers.rb",
     "lib/assette/readers/coffee.rb",
@@ -111,6 +111,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<git>, [">= 0"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2"])
+      s.add_runtime_dependency(%q<uglifier>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -122,6 +123,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.4"])
       s.add_runtime_dependency(%q<sass>, [">= 3.1"])
       s.add_runtime_dependency(%q<coffee-script>, ["~> 2"])
+      s.add_runtime_dependency(%q<uglifier>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
     else
       s.add_dependency(%q<rack>, ["~> 1"])
@@ -131,6 +133,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<coffee-script>, ["~> 2"])
+      s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -142,6 +145,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 1.4"])
       s.add_dependency(%q<sass>, [">= 3.1"])
       s.add_dependency(%q<coffee-script>, ["~> 2"])
+      s.add_dependency(%q<uglifier>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 1.16"])
     end
   else
@@ -152,6 +156,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<coffee-script>, ["~> 2"])
+    s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -163,6 +168,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 1.4"])
     s.add_dependency(%q<sass>, [">= 3.1"])
     s.add_dependency(%q<coffee-script>, ["~> 2"])
+    s.add_dependency(%q<uglifier>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 1.16"])
   end
 end

data/examples/config/assets.rb

@@ -15,7 +15,6 @@ template_format 'GC.foo.t[{*path*}] = Handlebars.compile({*template*});'
 
 cache_method 'path'
 
-after_compile do
-  a = 1
-  a + 2
-end
+after_compile do |sha|
+  
+end

data/examples/public/javascripts/foo.js

@@ -3,4 +3,10 @@
 // @require two.js
 // /ASSETTE CONFIG
 
-window.foo = 'foo' || "bar";
+window.foo = 'foo' || "bar";
+
+function Foo() {
+  var omgz = 'yo';
+
+  return omgz;
+}

data/lib/assette/cli.rb

@@ -155,6 +155,8 @@ module Assette
       version_file = Assette.config.asset_version_file
       File.delete(version_file) if File.exist?(version_file)
       create_file(version_file,sha)
+
+      Assette.config.after_compile.call(sha)
     end
     
     def initialize(*)

data/lib/assette/config.rb

@@ -38,7 +38,8 @@ module Assette
       :asset_hosts => [],
       :file_paths => %w{public},
       :templates_path => 'app/templates',
-      :template_format => 'AT.t[{*path*}] = {*template*};'
+      :template_format => 'AT.t[{*path*}] = {*template*};',
+      :after_compile => Proc.new {}
     }.freeze
     
     def initialize args = {}

data/lib/assette/post_processors/js_min.rb

@@ -0,0 +1,40 @@
+# Available options and their defaults are
+# 
+# {
+#   :mangle => true, # Mangle variables names
+#   :toplevel => false, # Mangle top-level variable names
+#   :except => [], # Variable names to be excluded from mangling
+#   :max_line_length => 32 * 1024, # Maximum line length
+#   :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
+#   :seqs => true, # Reduce consecutive statements in blocks into single statement
+#   :dead_code => true, # Remove dead code (e.g. after return)
+#   :lift_vars => false, # Lift all var declarations at the start of the scope
+#   :unsafe => false, # Optimizations known to be unsafe in some situations
+#   :copyright => true, # Show copyright message
+#   :ascii_only => false, # Encode non-ASCII characters as Unicode code points
+#   :inline_script => false, # Escape </script
+#   :quote_keys => false, # Quote keys in object literals
+#   :beautify => false, # Ouput indented code
+#   :beautify_options => {
+#     :indent_level => 4,
+#     :indent_start => 0,
+#     :space_colon => false
+#   }
+# }
+
+require 'uglifier'
+
+module Assette
+  class PostProcessor::JSMin < Assette::PostProcessor(:js)
+
+    def should_process?
+      Assette.config.compiling?
+    end
+
+    def processor
+      puts @str
+      Uglifier.compile(@str)
+    end
+
+  end
+end

data/spec/post_processor_spec.rb

@@ -10,6 +10,25 @@ describe Assette::PostProcessor do
   after(:all) do
     Dir.chdir(@dir_before)
   end
+
+  describe Assette::PostProcessor::JSMin do
+    before(:all) do
+      Assette.config.compiling = true
+      Assette.config.sha = "1234567"
+    end
+    
+    after(:all) do
+      Assette.config.compiling = nil
+    end
+
+    subject do
+      Assette::File.open('public/javascripts/foo.js')
+    end
+
+    it "should minify the js" do
+      subject.all_code.should == ''
+    end
+  end
   
   describe Assette::PostProcessor::CacheBuster do
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assette
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2011-12-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -120,6 +120,20 @@ dependencies:
   requirement: *id007
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: uglifier
+  prerelease: false
+  type: :runtime
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -133,9 +147,9 @@ dependencies:
   name: rspec
   prerelease: false
   type: :development
-  requirement: *id008
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -149,9 +163,9 @@ dependencies:
   name: yard
   prerelease: false
   type: :development
-  requirement: *id009
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -165,9 +179,9 @@ dependencies:
   name: bundler
   prerelease: false
   type: :development
-  requirement: *id010
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -181,9 +195,9 @@ dependencies:
   name: jeweler
   prerelease: false
   type: :development
-  requirement: *id011
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -195,9 +209,9 @@ dependencies:
   name: rcov
   prerelease: false
   type: :development
-  requirement: *id012
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -209,9 +223,9 @@ dependencies:
   name: rack-test
   prerelease: false
   type: :development
-  requirement: *id013
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -223,9 +237,9 @@ dependencies:
   name: rack
   prerelease: false
   type: :runtime
-  requirement: *id014
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -237,9 +251,9 @@ dependencies:
   name: thor
   prerelease: false
   type: :runtime
-  requirement: *id015
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -252,9 +266,9 @@ dependencies:
   name: json
   prerelease: false
   type: :runtime
-  requirement: *id016
+  requirement: *id017
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id017 !ruby/object:Gem::Requirement 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -267,9 +281,9 @@ dependencies:
   name: sass
   prerelease: false
   type: :runtime
-  requirement: *id017
+  requirement: *id018
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id018 !ruby/object:Gem::Requirement 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -281,9 +295,23 @@ dependencies:
   name: coffee-script
   prerelease: false
   type: :runtime
-  requirement: *id018
+  requirement: *id019
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: uglifier
+  prerelease: false
+  type: :runtime
+  requirement: *id020
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -296,7 +324,7 @@ dependencies:
   name: mime-types
   prerelease: false
   type: :runtime
-  requirement: *id019
+  requirement: *id021
 description: Renders all asset types (coffeescript/sass/scss) as equals
 email: me@tal.by
 executables: 
@@ -319,7 +347,6 @@ files:
 - assette.gemspec
 - bin/assette
 - examples/.asset_key
-- examples/.assette_pid
 - examples/config/assets.rb
 - examples/myapp/templates/bar/index.html.mustache
 - examples/myapp/templates/foo/_partial.html.mustache
@@ -345,6 +372,7 @@ files:
 - lib/assette/post_processor.rb
 - lib/assette/post_processors.rb
 - lib/assette/post_processors/cache_buster.rb
+- lib/assette/post_processors/js_min.rb
 - lib/assette/reader.rb
 - lib/assette/readers.rb
 - lib/assette/readers/coffee.rb

data/examples/.assette_pid

@@ -1 +0,0 @@
-9709