rake-minify 0.1.1 → 0.2.0

data/README.rdoc

@@ -23,19 +23,24 @@ Open your Rakefile and add:
     end
   end
 
+This task minify the file "path/to/your/dir/source.js" into the file "output.js".
+
 == Minify multiple JavaScript files
 
 Open your Rakefile and add:
 
   Rake::Minify.new(:minify_multiple) do
     dir("path/to/your/dir") do # we specify only the source directory
-      group("output-multi.js") do
-        add("first.js") # the output file name is full path
+      group("output-multi.js") do # the output file name is full path
+        add("first.js")
         add("second.js")
       end
     end
   end
 
+This task packs and minify the files "path/to/your/dir/first.js" and
+"path/to/your/dir/second.js" into the file "output-multi.js".
+
 == Combine only multiple JavaScript files
 
 Open your Rakefile and add:
@@ -49,6 +54,29 @@ Open your Rakefile and add:
     end
   end
 
+== CoffeeScript support
+
+The rake-minify gem now supports even CoffeeScript files to be compiled,
+minified and bundled, just include them like javascript files.
+
+CoffeeScript support requires the coffe-script gem, so install the gem:
+
+  gem install coffee-script
+
+Or if your are using Bundler:
+
+  echo "gem 'coffee-script'" >> Gemfile
+  bundle install
+
+Then open your Rakefile and add:
+
+  Rake::Minify.new(:minify_single) do
+    dir("path/to/your/dir") do # we specify only the source directory
+      add("output.js", "source.coffee") # the coffee file is compiled and minified
+    end
+  end
+
+
 == Contributing to rake-minify
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -22,6 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency 'test_notifier', '~> 0.3.6'
   gem.add_development_dependency 'autotest', '~> 4.4'
   gem.add_development_dependency "rcov", ">= 0"
+  gem.add_development_dependency "coffee-script", ">= 2.2.0"
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -34,6 +35,9 @@ end
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = ["--text-summary", "--exclude","lib\/rspec,bin\/rspec,lib\/rcov," + 
+             "spec,diff-lcs,lib\/cucumber,lib\/gherkin,cucumber,features,rake-0,coffee,json,execjs,jsmin"]
+
 end
 
 require 'cucumber/rake/task'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/features/coffeescript.feature

@@ -0,0 +1,15 @@
+Feature: Compile minify and bundle CoffeeScript files
+  In order to build awesome javascript applications
+  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"
+    When I run rake minify
+    Then "c-a.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"
+    When I run rake minify
+    Then "app.js" should include "c-a.js" and "b.js"

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

@@ -0,0 +1 @@
+alert("hello a");

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

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

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

@@ -0,0 +1 @@
+alert("hello a");

data/features/minify.feature

@@ -46,3 +46,19 @@ Feature: Minify Javascripts
     And we want to minify the js 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"
+    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"
+    When I run rake minify
+    Then "app.min.js" should include "a.min.js" and "b.min.js"

data/features/step_definitions/rake-minify_steps.rb

@@ -11,7 +11,7 @@ When /^I run rake minify$/ do
 end
 
 Then /^"([^"]*)" should be minified$/ do |file|
-  open(File.join(@dir, basedir, file)) do |result|
+  open(File.join(@dir, file)) do |result|
     open(File.join(File.dirname(__FILE__), "..", "js-expected", file)) do |expected|
       (result.read + "\n").should == expected.read
     end
@@ -34,7 +34,7 @@ Then /^"([^"]*)" should include "([^"]*)" and "([^"]*)"$/ do |result, source1, s
     end
   end
 
-  open(File.join(@dir, basedir, result)) do |result|
+  open(File.join(@dir, result)) do |result|
     content = result.read
     sources.each { |s| content.should include(s.gsub(/\n$/,'')) } # this is unfortunate :/
   end
@@ -56,3 +56,6 @@ Given /^I have a "([^"]*)" rake task$/ do |arg1|
   pre << "task #{arg1} "
 end
 
+Given /^the inner directory "([^"]*)"$/ do |dir|
+  indir(dir)
+end

data/features/support/generate_rakefiles.rb

@@ -31,21 +31,27 @@ def generate_rakefile
 <%= pre.join("\n") %>
 
 Rake::Minify.new(<%= @name_for_generation %>) do
-  <% if basedir.size > 0 %>
-  dir(File.join(File.dirname(__FILE__), <%= basedir.inspect %>)) do
+  <% if basedir %>
+  dir(<%= basedir.inspect %>) do
   <% end %> 
     <% groups.values.each do |group| %>
       <% if group.sources.size == 1 %>
         add(<%= group.output.inspect %>, <%= group.sources.first.source.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 %>)
           <% end %>
+          <% if indir %>
+            end
+          <% end %> 
         end
       <% end %>
     <% end %>
-  <% if basedir.size > 0 %>
+  <% if basedir %>
   end
   <% end %> 
 end
@@ -54,15 +60,20 @@ EOF
   erb.result(binding)
 end
 
-def basedir(dir="")
+def basedir(dir=nil)
   @basedir ||= dir
 end
 
+def indir(dir=nil)
+  @indir ||= dir
+end
+
 def run_task(task_name="minify")
   @dir = Dir.mktmpdir
-  FileUtils.mkdir File.join(@dir, basedir) if basedir.size > 0
+  dest_dir = File.join(*([basedir, indir, ""].select { |e| e }))
+  FileUtils.mkdir_p File.join(@dir, dest_dir) if dest_dir.size > 0
   Dir.glob(File.join(File.dirname(__FILE__), "..", "js-sources", "*")) do |file|
-    FileUtils.cp(file, File.join(@dir, basedir))
+    FileUtils.cp(file, File.join(@dir, dest_dir))
   end
   rakefile = File.join(@dir, "Rakefile")
   open(rakefile, "w") { |io| io << generate_rakefile }

data/lib/rake/minify.rb

@@ -11,6 +11,7 @@ class Rake::Minify < Rake::TaskLib
     @sources = {}
     @dir = nil
     @config = block
+    @dir_stack = []
 
     desc "Minifies the specified javascripts" unless Rake.application.last_comment
     task name do
@@ -19,17 +20,19 @@ class Rake::Minify < Rake::TaskLib
   end
 
   def add(output, source, opts = { :minify => true })
-    @sources[build_path(output)] = Source.new(build_path(source), opts[:minify])
+    add_source(output, Source.new(build_path(source), opts[:minify]))
   end
 
   def group(output, &block)
-    @sources[build_path(output)] = Group.new(self, &block)
+    add_source(output, Group.new(self, &block))
   end
 
   def dir(dir, &block)
-    @dir = dir
-    instance_eval &block # to be configured like the pros
-    @dir = nil
+    @dir_stack << dir
+    @dir = File.join(@dir_stack)
+    block.call #FIXME @dir should be a stack
+    @dir_stack.pop
+    @dir = File.join(@dir_stack)
   end
 
   def invoke
@@ -45,4 +48,9 @@ class Rake::Minify < Rake::TaskLib
   def build_path(file)
     @dir.nil? && file || File.join(@dir, file)
   end
+
+  private
+  def add_source(output, source)
+    @sources[output] = source
+  end
 end

data/lib/rake/minify/group.rb

@@ -17,5 +17,9 @@ class Rake::Minify
     def build
       @sources.map { |s| s.build }.join("\n")
     end
+
+    def dir(dir, &block)
+      parent.dir(dir, &block)
+    end
   end
 end

data/lib/rake/minify/source.rb

@@ -1,4 +1,3 @@
-
 class Rake::Minify::Source
   attr_reader :source, :minify
 
@@ -8,8 +7,27 @@ class Rake::Minify::Source
   end
 
   def build
+    coffee_script! if coffee?
+
     Kernel.open(source) do |input|
-      minify && JSMin.minify(input.read).strip || input.read
+      output = input.read
+      output = CoffeeScript.compile(output, :bare => true) if coffee? #TODO make bare configurable
+      output = JSMin.minify(output).strip if minify 
+      output
+    end
+  end
+
+  def coffee?
+    source =~ /\.coffee$/
+  end
+
+  private
+  def coffee_script!
+    begin
+      require 'coffee-script'
+    rescue
+      raise "Missing coffee-script gem"
+      exit 1
     end
   end
 end

data/rake-minify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rake-minify}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matteo Collina"]
-  s.date = %q{2011-04-06}
+  s.date = %q{2011-04-17}
   s.description = %q{A rake task to minify javascripts}
   s.email = %q{matteo.collina@gmail.com}
   s.extra_rdoc_files = [
@@ -25,10 +25,14 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "features/coffeescript.feature",
     "features/js-expected/a.min.js",
     "features/js-expected/b.min.js",
+    "features/js-expected/c-a.min.js",
     "features/js-sources/a.js",
     "features/js-sources/b.js",
+    "features/js-sources/c-a.coffee",
+    "features/js-sources/c-a.js",
     "features/minify.feature",
     "features/rake-interface.feature",
     "features/step_definitions/rake-minify_steps.rb",
@@ -67,6 +71,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<test_notifier>, ["~> 0.3.6"])
       s.add_development_dependency(%q<autotest>, ["~> 4.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<coffee-script>, [">= 2.2.0"])
     else
       s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
@@ -75,6 +80,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<test_notifier>, ["~> 0.3.6"])
       s.add_dependency(%q<autotest>, ["~> 4.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
     end
   else
     s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
@@ -84,6 +90,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<test_notifier>, ["~> 0.3.6"])
     s.add_dependency(%q<autotest>, ["~> 4.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<coffee-script>, [">= 2.2.0"])
   end
 end
 

data/spec/rake/minify/group_spec.rb

@@ -53,5 +53,10 @@ class Rake::Minify
       
       subject.build.should == "aaaa"
     end
+
+    it "should expose its parent dir method" do
+      parent.should_receive(:dir).with("a_dir").and_yield("hello world")
+      (subject.dir("a_dir") { |a| a }).should == "hello world" #weird method to test this
+    end
   end
 end

data/spec/rake/minify/source_spec.rb

@@ -22,5 +22,15 @@ class Rake::Minify
         subject.build.should == ' var a =     "b"   ;'
       end
     end
+
+    context "compile a coffeescript file" do
+      subject { Source.new("a_source.coffee", true) }
+
+      it "should open and minify the file" do
+        input = StringIO.new(' a =     "b"   ')
+        Kernel.stub!(:open).with("a_source.coffee").and_yield(input)
+        subject.build.should == "var a;a=\"b\";"
+      end
+    end
   end
 end

data/spec/rake/minify_spec.rb

@@ -84,7 +84,29 @@ describe Rake::Minify do
 
     before :each do
       stub_open("the_dir/source",' var a =     "b"   ;')
-      @output = stub_open("the_dir/output","", "w")
+      @output = stub_open("output","", "w")
+    end
+
+    it "should minify the input file when invoked" do
+      do_invoke
+      @output.string.should == "var a=\"b\";"
+    end
+  end
+
+  context "configured to minify a file in a deep directory" do
+    subject do 
+      Rake::Minify.new do
+        dir("the_dir") do
+          dir("another_dir") do
+            add("output", "source")
+          end
+        end
+      end
+    end
+
+    before :each do
+      stub_open("the_dir/another_dir/source",' var a =     "b"   ;')
+      @output = stub_open("output","", "w")
     end
 
     it "should minify the input file when invoked" do
@@ -93,6 +115,32 @@ describe Rake::Minify do
     end
   end
 
+  context "configured to minify multiple files in a deep directory" do
+    subject do 
+      Rake::Minify.new do
+        dir("the_dir") do
+          group("output") do
+            dir("another_dir") do
+              add("a")
+            end
+            add("b")
+          end
+        end
+      end
+    end
+
+    before :each do
+      stub_open("the_dir/another_dir/a",' var a =     "hello"   ;')
+      stub_open("the_dir/b",' var b =     "hello2"   ;')
+      @output = stub_open("output","", "w")
+    end
+
+    it "should minify the input file when invoked" do
+      do_invoke
+      @output.string.should == "var a=\"hello\";\nvar b=\"hello2\";"
+    end
+  end
+
   it "should accepts arguments" do
     Rake::Task.should_receive(:define_task).with(:a_task)
     Rake::Minify.new(:a_task) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rake-minify
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Matteo Collina
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,22 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: coffee-script
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        - 0
+        version: 2.2.0
+  type: :development
+  version_requirements: *id008
 description: A rake task to minify javascripts
 email: matteo.collina@gmail.com
 executables: []
@@ -143,10 +159,14 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- features/coffeescript.feature
 - features/js-expected/a.min.js
 - features/js-expected/b.min.js
+- features/js-expected/c-a.min.js
 - features/js-sources/a.js
 - features/js-sources/b.js
+- features/js-sources/c-a.coffee
+- features/js-sources/c-a.js
 - features/minify.feature
 - features/rake-interface.feature
 - features/step_definitions/rake-minify_steps.rb