rake-minify 0.2.1 → 0.3.0

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: .
+  specs:
+    rake-minify (0.2.1)
+      jsmin (~> 1.0.1)
+      rake-minify
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ZenTest (4.5.0)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    builder (3.0.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.0)
+    cucumber (0.10.2)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    execjs (0.3.3)
+      multi_json (~> 1.0)
+    gherkin (2.3.7)
+      json (>= 1.4.6)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    jsmin (1.0.1)
+    json (1.5.1)
+    multi_json (1.0.1)
+    notifier (0.1.3)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    term-ansicolor (1.0.5)
+    test_notifier (0.3.6)
+      notifier
+    therubyracer (0.8.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  autotest (~> 4.4)
+  coffee-script (>= 2.2.0)
+  cucumber
+  jeweler (~> 1.5.2)
+  rake-minify!
+  rcov
+  rspec (~> 2.5.0)
+  test_notifier (~> 0.3.6)
+  therubyracer

data/README.rdoc

@@ -76,6 +76,19 @@ Then open your Rakefile and add:
     end
   end
 
+=== Bare switch
+
+Since version 0.3.0 rake-minify support the configuration of the coffee script bare switch
+(see http://jashkenas.github.com/coffee-script/#installation for details).
+However in the 0.2.x series that flag defaulted to true, now it defaults to false.
+
+You can specify it:
+
+  Rake::Minify.new(:minify_single) do
+    # the coffee file is compiled and minified
+    # without the top-level function safety wrapper.
+    add("output.js", "source.coffee", :bare => true)
+  end
 
 == Contributing to rake-minify
  

data/Rakefile

@@ -23,6 +23,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency 'autotest', '~> 4.4'
   gem.add_development_dependency "rcov", ">= 0"
   gem.add_development_dependency "coffee-script", ">= 2.2.0"
+  gem.add_development_dependency "therubyracer"
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -43,7 +44,7 @@ end
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features)
 
-task :default => [:spec, :features]
+task :default => [:features, :spec]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/features/coffeescript.feature

@@ -3,13 +3,44 @@ Feature: Compile minify and bundle CoffeeScript files
   A ruby programmer
   Wants to minify its coffeescripts using rake
 
-  Scenario: Minify single javascript
-    Given we want to minify the js file "c-a.coffee" into "c-a.min.js"
+  Scenario: Minify single coffeescript 
+    Given we want to add the file "c-a.coffee" into "c-a-wrapped.min.js"
     When I run rake minify
-    Then "c-a.min.js" should be minified
+    Then "c-a-wrapped.min.js" should be minified
 
-  Scenario: Combine multiple javascripts into a single file
-    Given we want to combine the js file "c-a.coffee" into "app.js"
-    And we want to combine the js file "b.js" into "app.js"
+  Scenario: Combine multiple coffeescripts into a single file
+    Given we want to add the file "c-a.coffee" into "app.js" with options:
+      | minify | false |
+    And we want to add the file "b.js" into "app.js" with options:
+      | minify | false |
     When I run rake minify
     Then "app.js" should include "c-a.js" and "b.js"
+
+  Scenario: Minify single javascript in bare mode
+    Given we want to add the file "c-a.coffee" into "c-a-bare.min.js" with options:
+      | bare | true  |
+    When I run rake minify
+    Then "c-a-bare.min.js" should be minified
+
+  Scenario: Minify single javascript in wrapped mode
+    Given we want to add the file "c-a.coffee" into "c-a-wrapped.min.js" with options:
+      | bare | false |
+    When I run rake minify
+    Then "c-a-wrapped.min.js" should be minified
+
+  Scenario: Combine multiple coffeescripts into a single file in bare mode
+    Given we want to add the file "c-a.coffee" into "app.js" with options:
+      | bare | true  |
+    And we want to add the file "b.js" into "app.js" with options:
+      | minify | false |
+    When I run rake minify
+    Then "app.js" should include "c-a-bare.min.js" and "b.js"
+
+  Scenario: Combine multiple coffeescripts into a single file in wrapped mode
+    Given we want to add the file "c-a.coffee" into "app.js" with options:
+      | bare   | false |
+      | minify | false |
+    And we want to add the file "b.js" into "app.js" with options:
+      | minify | false |
+    When I run rake minify
+    Then "app.js" should include "c-a-wrapped.js" and "b.js"

data/features/js-expected/a.min.js

@@ -1 +1 @@
-alert("hello a");
+var a="hello a";

data/features/js-expected/b.min.js

@@ -1 +1 @@
-alert("hello b");
+var b="hello b";

data/features/js-expected/c-a-bare.min.js

@@ -0,0 +1 @@
+var a;a="hello a";

data/features/js-expected/c-a-wrapped.min.js

@@ -0,0 +1 @@
+(function(){var a;a="hello a";}).call(this);

data/features/js-expected/c-a.min.js

@@ -1 +1 @@
-alert("hello a");
+var a;a="hello a";

data/features/js-sources/a.js

@@ -1,5 +1,5 @@
 
-   alert( "hello a" );
+   var a =  "hello a" ;
 
 
 

data/features/js-sources/b.js

@@ -1,2 +1,2 @@
 
-   alert( "hello b" );
+   var b =    "hello b" ;

data/features/js-sources/c-a-bare.js

@@ -0,0 +1,2 @@
+var a;
+a = "hello a";

data/features/js-sources/c-a-wrapped.js

@@ -0,0 +1,5 @@
+(function() {
+  var a;
+  a = "hello a";
+}).call(this);
+

data/features/js-sources/c-a.coffee

@@ -1,2 +1,2 @@
 
-alert "hello a"
+a = "hello a"

data/features/js-sources/c-a.js

@@ -1 +1,4 @@
-alert("hello a");
+(function() {
+  var a;
+  a = "hello a";
+}).call(this);

data/features/minify.feature

@@ -4,61 +4,75 @@ Feature: Minify Javascripts
   Wants to minify its javascripts using rake
 
   Scenario: Minify single javascript
-    Given we want to minify the js file "a.js" into "a.min.js"
+    Given we want to add the file "a.js" into "a.min.js" with options:
+      | minify | true  |
     When I run rake minify
     Then "a.min.js" should be minified
 
   Scenario: Combine multiple javascripts into a single file
-    Given we want to combine the js file "a.js" into "app.js"
-    And we want to combine the js file "b.js" into "app.js"
+    Given we want to add the file "a.js" into "app.js" with options:
+      | minify | false |
+    And we want to add the file "b.js" into "app.js" with options:
+      | minify | false |
     When I run rake minify
     Then "app.js" should include "a.js" and "b.js"
 
   Scenario: Minify multiple javascripts into a single file
-    Given we want to minify the js file "a.js" into "app.min.js"
-    And we want to minify the js file "b.js" into "app.min.js"
+    Given we want to add the file "a.js" into "app.min.js" with options:
+      | minify | true |
+    And we want to add the file "b.js" into "app.min.js"
     When I run rake minify
     Then "app.min.js" should include "a.min.js" and "b.min.js"
 
   Scenario: Minify multiple javascripts into multiple files
-    Given we want to minify the js file "a.js" into "app.min.js"
-    And we want to minify the js file "b.js" into "app.min.js"
-    And we want to minify the js file "a.js" into "a.min.js"
+    Given we want to add the file "a.js" into "app.min.js"
+    And we want to add the file "b.js" into "app.min.js"
+    And we want to add the file "a.js" into "a.min.js"
     When I run rake minify
     Then "app.min.js" should include "a.min.js" and "b.min.js"
     And "a.min.js" should be minified
 
-  Scenario: Combine and minify only one js file
-    Given we want to combine the js file "a.js" into "app.js"
-    And we want to minify the js file "b.js" into "app.js"
+  Scenario: Combine and minify only one file
+    Given we want to add the file "a.js" into "app.js" with options:
+      | minify | false |
+    And we want to add the file "b.js" into "app.js"
     When I run rake minify
     Then "app.js" should include "a.js" and "b.min.js"
 
   Scenario: Minify single javascript with basedir
     Given the basedir "public"
-    And we want to minify the js file "a.js" into "a.min.js"
+    And we want to add the file "a.js" into "a.min.js"
     When I run rake minify
     Then "a.min.js" should be minified
 
   Scenario: Minify multiple javascripts with basedir
     Given the basedir "public"
-    And we want to minify the js file "a.js" into "app.min.js"
-    And we want to minify the js file "b.js" into "app.min.js"
+    And we want to add the file "a.js" into "app.min.js"
+    And we want to add the file "b.js" into "app.min.js"
     When I run rake minify
     Then "app.min.js" should include "a.min.js" and "b.min.js"
 
   Scenario: Minify multiple javascripts with an inner directory
     Given the inner directory "public"
-    And we want to minify the js file "a.js" into "app.min.js"
-    And we want to minify the js file "b.js" into "app.min.js"
+    And we want to add the file "a.js" into "app.min.js"
+    And we want to add the file "b.js" into "app.min.js"
     When I run rake minify
     Then "app.min.js" should include "a.min.js" and "b.min.js"
 
-  @wip
   Scenario: Minify multiple javascripts with a basedir and an inner directory
     Given the basedir "base"
     And the inner directory "in"
-    And we want to minify the js file "a.js" into "app.min.js"
-    And we want to minify the js file "b.js" into "app.min.js"
+    And we want to add the file "a.js" into "app.min.js"
+    And we want to add the file "b.js" into "app.min.js"
     When I run rake minify
     Then "app.min.js" should include "a.min.js" and "b.min.js"
+
+  Scenario: Minify single javascript with a destination directory
+    Given we want to add the file "a.js" into "build/a.min.js"
+    When I run rake minify
+    Then "build/a.min.js" should include "a.min.js"
+
+  Scenario: Minify single javascript with a deep destination directory
+    Given we want to add the file "a.js" into "a/dir/a.min.js"
+    When I run rake minify
+    Then "a/dir/a.min.js" should include "a.min.js"

data/features/rake-interface.feature

@@ -4,7 +4,7 @@ Feature: Rake Interface
   Wants to customize the minify task 
 
   Background:
-    Given we want to minify the js file "a.js" into "a.min.js"
+    Given we want to add the file "a.js" into "a.min.js"
 
   Scenario: Custom name for the task
     Given I have configured rake to minify at the ":my_minify" command

data/features/step_definitions/rake-minify_steps.rb

@@ -2,8 +2,12 @@ require 'fileutils'
 require 'tmpdir'
 require 'rake'
 
-Given /^we want to minify the js file "([^"]*)" into "([^"]*)"$/ do |file, output|
-  add_to_groups(output, true, file)
+Given /^we want to add the file "([^"]*)" into "([^"]*)"$/ do |file, output|
+  add_to_groups(output, file, nil)
+end
+
+Given /^we want to add the file "([^"]*)" into "([^"]*)" with options:$/ do |file, output, options|
+  add_to_groups(output, file, options.rows_hash)
 end
 
 When /^I run rake minify$/ do
@@ -18,12 +22,10 @@ Then /^"([^"]*)" should be minified$/ do |file|
   end
 end
 
-Given /^we want to combine the js file "([^"]*)" into "([^"]*)"$/ do |file, output|
-  add_to_groups(output, false, file)
-end
-
-Then /^"([^"]*)" should include "([^"]*)" and "([^"]*)"$/ do |result, source1, source2|
-  sources = [source1, source2].map do |s|
+Then /^"([^"]*)" should include "([^"]*)"(?: and "([^"]*)")?$/ do |result, source1, source2|
+  sources = [source1]
+  sources << source2 if source2
+  sources.map! do |s|
     file = File.join(File.dirname(__FILE__), "..", "js-expected", s)
     unless File.exists? file
       file = File.join(File.dirname(__FILE__), "..", "js-sources", s)

data/features/support/env.rb

@@ -1,4 +1,7 @@
 
+require 'bundler'
+Bundler.setup
+
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'rake-minify'
 

data/features/support/generate_rakefiles.rb

@@ -9,12 +9,12 @@ class Group
     @sources = []
   end
 
-  def add(source, minify)
-    @sources << GroupElement.new(source, minify)
+  def add(source, options)
+    @sources << GroupElement.new(source, options)
   end
 end
 
-GroupElement = Struct.new(:source, :minify)
+GroupElement = Struct.new(:source, :options)
 
 def groups
   @groups ||= Hash.new do |h, k|
@@ -22,8 +22,12 @@ def groups
   end
 end
 
-def add_to_groups(output, minify, file)
-  groups[output].add(file, minify)
+def add_to_groups(output, file, options=nil)
+  options = options.keys.reduce({}) do |hash, key|
+    hash[key.to_sym] = eval(options[key])
+    hash
+  end if options
+  groups[output].add(file, options)
 end
 
 def generate_rakefile
@@ -36,14 +40,14 @@ Rake::Minify.new(<%= @name_for_generation %>) do
   <% end %> 
     <% groups.values.each do |group| %>
       <% if group.sources.size == 1 %>
-        add(<%= group.output.inspect %>, <%= group.sources.first.source.inspect %>)
+        add(<%= group.output.inspect %>, <%= group.sources.first.source.inspect %>, <%= group.sources.first.options.inspect %>)
       <% else %>
         group(<%= group.output.inspect %>) do |group|
           <% if indir %>
             dir(<%= indir.inspect %>) do
           <% end %> 
           <% group.sources.each do |element| %>
-            add(<%= element.source.inspect %>, :minify => <%= element.minify %>)
+            add(<%= element.source.inspect %>, <%= element.options.inspect %>)
           <% end %>
           <% if indir %>
             end

data/lib/rake/minify.rb

@@ -20,7 +20,7 @@ class Rake::Minify < Rake::TaskLib
   end
 
   def add(output, source, opts = { :minify => true })
-    add_source(output, Source.new(build_path(source), opts[:minify]))
+    add_source(output, Source.new(build_path(source), opts))
   end
 
   def group(output, &block)
@@ -39,6 +39,8 @@ class Rake::Minify < Rake::TaskLib
     instance_eval &@config # to be configured like the pros
 
     @sources.each do |dest, source|
+      FileUtils.mkdir_p(File.dirname(dest))
+
       Kernel.open(dest, "w") do |output|
         output << source.build
       end

data/lib/rake/minify/group.rb

@@ -10,8 +10,9 @@ class Rake::Minify
       instance_eval &block if block
     end
 
-    def add(source, opts={:minify => true})
-      @sources << Source.new(parent.build_path(source), opts[:minify])
+    def add(source, opts=nil)
+      opts ||= { :minify => true }
+      @sources << Source.new(parent.build_path(source), opts)
     end
 
     def build

data/lib/rake/minify/source.rb

@@ -1,9 +1,11 @@
 class Rake::Minify::Source
   attr_reader :source, :minify
 
-  def initialize(source, minify)
+  def initialize(source, options=nil)
+    options ||= {}
     @source = source
-    @minify = minify
+    @minify = optional_boolean(options[:minify], true)
+    @coffee_bare = optional_boolean(options[:bare], false)
   end
 
   def build
@@ -11,7 +13,7 @@ class Rake::Minify::Source
 
     Kernel.open(source) do |input|
       output = input.read
-      output = CoffeeScript.compile(output, :bare => true) if coffee? #TODO make bare configurable
+      output = CoffeeScript.compile(output, :bare => @coffee_bare) if coffee?
       output = JSMin.minify(output).strip if minify 
       output
     end
@@ -27,7 +29,12 @@ class Rake::Minify::Source
       require 'coffee-script'
     rescue
       raise "Missing coffee-script gem"
-      exit 1
     end
   end
+
+  def optional_boolean(value, default)
+    return true if value
+    return default if value.nil?
+    value
+  end
 end