crush 0.2.0 → 0.3.0

data/spec/crush/rainpress_spec.rb

@@ -1,20 +1,21 @@
 require "spec_helper"
-require "rainpress"
 
 describe Crush::Rainpress do
-  specify { Crush::Rainpress.engine_name.should == "rainpress" }
+  specify { Crush::Rainpress.default_mime_type.should == "text/css" }
   
-  it "is registered for '.js' files" do
-    Crush.mappings["css"].should include(Crush::Rainpress)
-  end
-  
-  it "minifies using Rainpress" do
+  it "compresses using Rainpress" do
     ::Rainpress.should_receive(:compress).with("hello", {}).and_return("world")
-    Crush::Rainpress.new.compress("hello").should == "world"
+    Crush::Rainpress.compress("hello").should == "world"
   end
   
   it "sends options to Rainpress" do
     ::Rainpress.should_receive(:compress).with("hello", :foo => "bar")
     Crush::Rainpress.new(:foo => "bar").compress("hello")
   end
+  
+  it "is registered with Tilt" do
+    ::Rainpress.should_receive(:compress).with("hello", {}).and_return("world")
+    Tilt.register Crush::Rainpress, "css"
+    Tilt.new("application.css").compress("hello").should == "world"
+  end
 end

data/spec/crush/uglifier_spec.rb

@@ -1,18 +1,13 @@
 require "spec_helper"
-require "uglifier"
 
 describe Crush::Uglifier do
-  specify { Crush::Uglifier.engine_name.should == "uglifier" }
+  specify { Crush::Uglifier.default_mime_type.should == "application/javascript" }
   
-  it "is registered for '.js' files" do
-    Crush.mappings["js"].should include(Crush::Uglifier)
-  end
-  
-  it "minifies using Uglifier" do
+  it "compresses using Uglifier" do
     compressor = mock(:compressor)
     ::Uglifier.should_receive(:new).with({}).and_return(compressor)
     compressor.should_receive(:compile).with("hello").and_return("world")
-    Crush::Uglifier.new.compress("hello").should == "world"
+    Crush::Uglifier.compress("hello").should == "world"
   end
   
   it "sends options to Uglifier" do
@@ -21,4 +16,12 @@ describe Crush::Uglifier do
     compressor.should_receive(:compile).with("hello").and_return("world")
     Crush::Uglifier.new(:foo => "bar").compress("hello")
   end
+  
+  it "is works with Tilt" do
+    compressor = mock(:compressor)
+    ::Uglifier.should_receive(:new).with({}).and_return(compressor)
+    compressor.should_receive(:compile).with("hello").and_return("world")
+    Tilt.register Crush::Uglifier, "js"
+    Tilt.new("application.js").compress("hello").should == "world"
+  end
 end

data/spec/crush/yui_spec.rb

@@ -1,18 +1,13 @@
 require "spec_helper"
-require "yui/compressor"
 
 describe Crush::YUI::JavaScriptCompressor do
-  specify { Crush::YUI::JavaScriptCompressor.engine_name.should == "yui_js" }
+  specify { Crush::YUI::JavaScriptCompressor.default_mime_type.should == "application/javascript" }
   
-  it "is registered for '.js' files" do
-    Crush.mappings["js"].should include(Crush::YUI::JavaScriptCompressor)
-  end
-  
-  it "minifies using YUI::JavaScriptCompressor" do
+  it "compresses using YUI::JavaScriptCompressor" do
     compressor = mock(:compressor)
     ::YUI::JavaScriptCompressor.should_receive(:new).with({}).and_return(compressor)
     compressor.should_receive(:compress).with("hello").and_return("world")
-    Crush::YUI::JavaScriptCompressor.new.compress("hello").should == "world"
+    Crush::YUI::JavaScriptCompressor.compress("hello").should == "world"
   end
   
   it "sends options to YUI::JavaScriptCompressor" do
@@ -21,20 +16,24 @@ describe Crush::YUI::JavaScriptCompressor do
     compressor.should_receive(:compress).with("hello").and_return("world")
     Crush::YUI::JavaScriptCompressor.new(:foo => "bar").compress("hello")
   end
+  
+  it "is registered with Tilt" do
+    compressor = mock(:compressor)
+    ::YUI::JavaScriptCompressor.should_receive(:new).with({}).and_return(compressor)
+    compressor.should_receive(:compress).with("hello").and_return("world")
+    Tilt.register Crush::YUI::JavaScriptCompressor, "js"
+    Tilt.new("application.js").compress("hello").should == "world"
+  end
 end
 
 describe Crush::YUI::CssCompressor do
-  specify { Crush::YUI::CssCompressor.engine_name.should == "yui_css" }
+  specify { Crush::YUI::CssCompressor.default_mime_type.should == "text/css" }
   
-  it "is registered for '.js' files" do
-    Crush.mappings["css"].should include(Crush::YUI::CssCompressor)
-  end
-  
-  it "minifies using YUI::CssCompressor" do
+  it "compresses using YUI::CssCompressor" do
     compressor = mock(:compressor)
     ::YUI::CssCompressor.should_receive(:new).with({}).and_return(compressor)
     compressor.should_receive(:compress).with("hello").and_return("world")
-    Crush::YUI::CssCompressor.new.compress("hello").should == "world"
+    Crush::YUI::CssCompressor.compress("hello").should == "world"
   end
   
   it "sends options to YUI::CssCompressor" do
@@ -43,4 +42,12 @@ describe Crush::YUI::CssCompressor do
     compressor.should_receive(:compress).with("hello").and_return("world")
     Crush::YUI::CssCompressor.new(:foo => "bar").compress("hello")
   end
+  
+  it "is registered with Tilt" do
+    compressor = mock(:compressor)
+    ::YUI::CssCompressor.should_receive(:new).with({}).and_return(compressor)
+    compressor.should_receive(:compress).with("hello").and_return("world")
+    Tilt.register Crush::YUI::CssCompressor, "css"
+    Tilt.new("application.css").compress("hello").should == "world"
+  end
 end

data/spec/crush_spec.rb

@@ -1,145 +1,49 @@
 require "spec_helper"
 
 describe Crush do
-  class MockCompressor
-    def self.engine_name
-      "mock"
+  describe ".register_js" do
+    it "registers all of the JavaScript engines with Tilt" do
+      Tilt.mappings.delete "js"
+      Crush.register_js
+      Tilt.mappings["js"].should == [
+        Crush::Uglifier,
+        Crush::Closure::Compiler,
+        Crush::YUI::JavaScriptCompressor,
+        Crush::Packr,
+        Crush::JSMin
+      ]
     end
-    
-    def self.engine_initialized?
-      true
-    end
-    
-    attr_reader :args, :block
-    def initialize(*args, &block)
-      @args = args
-      @block = block
-    end
-  end
-  
-  class MockCompressor2 < MockCompressor
-    def self.engine_name
-      "mock2"
-    end
-    
-    def self.engine_initialized?
-      false
-    end
-  end
-  
-  before(:all) do
-    Crush.register(MockCompressor,  "mock", ".mck", "file.txt")
-    Crush.register(MockCompressor,  "mult", "mlt")
-    Crush.register(MockCompressor2, "mult", "mlt")
   end
   
-  describe ".mappings" do
-    it "always returns an array" do
-      Crush.mappings["none"].should == []
+  describe ".register_css" do
+    it "registers all of the CSS engines with Tilt" do
+      Tilt.mappings.delete "css"
+      Crush.register_css
+      Tilt.mappings["css"].should == [
+        Crush::YUI::CssCompressor,
+        Crush::Rainpress,
+        Crush::CSSMin
+      ]
     end
   end
   
   describe ".register" do
-    it "stores engines" do
-      Crush.mappings["mock"].should include(MockCompressor)
-      Crush.mappings["mck"].should include(MockCompressor)
-      Crush.mappings["file.txt"].should include(MockCompressor)
-    end
-    
-    it "prefers the latest registered engines" do
-      Crush.mappings["mult"].first.should == MockCompressor2
-    end
-  end
-  
-  describe ".registered?" do
-    it "returns false if the extension is not registered" do
-      Crush.registered?("none").should be_false
-    end
-    
-    it "returns true if the given extension is registered" do
-      Crush.registered?("mock").should be_true
-      Crush.registered?(".mock").should be_true
-    end
-  end
-  
-  describe ".[]" do
-    it "returns engines found by path when given strings" do
-      Crush["mock"].should == MockCompressor
-      Crush["application.js.mock"].should == MockCompressor
-      Crush["some/path/file.txt"].should == MockCompressor
-    end
-    
-    it "returns engines found by name when given symbols" do
-      Crush[:mock].should == MockCompressor
-      Crush[:mock2].should == MockCompressor2
-    end
-  end
-  
-  describe ".prefer" do
-    it "reorders the engine engines so the given engine is returned" do
-      Crush.prefer(MockCompressor)
-      Crush["mult"].should == MockCompressor
-    end
-    
-    it "accepts symbol names of the various engines" do
-      Crush.prefer(:mock2)
-      Crush["mult"].should == MockCompressor2
-    end
-    
-    it "limits the preference to the given extensions" do
-      Crush.prefer(:mock, "mlt")
-      Crush["mult"].should == MockCompressor2
-      Crush["mlt"].should == MockCompressor
-    end
-  end
-  
-  describe ".new" do
-    it "creates a new engine if found" do
-      compressor = Crush.new("application.mock", :key => "value") { "Hello World" }
-      compressor.args.should =~ [ "application.mock", { :key => "value" } ]
-      compressor.block.call.should == "Hello World"
-    end
-    
-    it "raises an error if no engine is found" do
-      expect { Crush.new("file.php") }.to raise_error(Crush::EngineNotFound)
-    end
-  end
-  
-  describe ".find_by_name" do
-    it "returns nil if the engine could not be found" do
-      Crush.find_by_name("none").should be_nil
-    end
-    
-    it "returns the registered engine with the given name" do
-      Crush.find_by_name("mock").should == MockCompressor
-      Crush.find_by_name("mock2").should == MockCompressor2
-    end
-  end
-  
-  describe ".find_by_path" do
-    it "returns nil when no engines are found" do
-      Crush.find_by_path("none").should be_nil
-    end
-    
-    it "returns engines matching exact extension names" do
-      Crush.find_by_path("mock").should == MockCompressor
-    end
-    
-    it "returns engines matching exact file extensions" do
-      Crush.find_by_path(".MOCK").should == MockCompressor
-    end
-    
-    it "returns engines matching multiple file extensions" do
-      Crush.find_by_path("application.js.Mock").should == MockCompressor
-    end
-    
-    it "returns engines matching filenames" do
-      Crush.find_by_path("some/path/file.txt").should == MockCompressor
-    end
-    
-    it "returns engines that are already initialized" do
-      Crush.instance_variable_get("@preferred_engines").delete("mult")
-      Crush.find_by_path("mult").should == MockCompressor
+    it "registers all of the engines with Tilt" do
+      Tilt.mappings.delete "js"
+      Tilt.mappings.delete "css"
+      Crush.register
+      Tilt.mappings["js"].should == [
+        Crush::Uglifier,
+        Crush::Closure::Compiler,
+        Crush::YUI::JavaScriptCompressor,
+        Crush::Packr,
+        Crush::JSMin
+      ]
+      Tilt.mappings["css"].should == [
+        Crush::YUI::CssCompressor,
+        Crush::Rainpress,
+        Crush::CSSMin
+      ]
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,4 @@
 require "rubygems"
-require "bundler/setup"
-Bundler.require
-
-RSpec.configure do |config|
-  
-end
+require "bundler"
+Bundler.require :default, :development
+require "yui/compressor"

metadata

@@ -1,138 +1,128 @@
 --- !ruby/object:Gem::Specification 
 name: crush
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
-- Pete
-- Browne
+- Pete Browne
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 Z
+date: 2011-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: tilt
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
-  type: :development
+        version: "1.3"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jsmin
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: "2.6"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: packr
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: uglifier
+  name: jsmin
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: closure-compiler
+  name: packr
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: uglifier
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cssmin
+  name: closure-compiler
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rainpress
+  name: yui-compressor
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id008
-description: Crush is a generic interface, like Tilt, for the various compression engines in Ruby.
+- !ruby/object:Gem::Dependency 
+  name: cssmin
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rainpress
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
+description: Crush is a set of Tilt templates for the various JavaScript and CSS compression libraries in Ruby.
 email: me@petebrowne.com
 executables: []
 
@@ -142,15 +132,19 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - crush.gemspec
 - lib/crush.rb
+- lib/crush/all.rb
 - lib/crush/closure.rb
+- lib/crush/css.rb
 - lib/crush/cssmin.rb
 - lib/crush/engine.rb
+- lib/crush/js.rb
 - lib/crush/jsmin.rb
 - lib/crush/packr.rb
 - lib/crush/rainpress.rb
@@ -180,26 +174,20 @@ required_ruby_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 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: crush
-rubygems_version: 1.7.1
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
-summary: A generic interface to multiple Ruby compression engines.
+summary: Tilt templates for various JavaScript and CSS compression libraries.
 test_files: 
 - spec/crush/closure_spec.rb
 - spec/crush/cssmin_spec.rb