massimo 0.9.0 → 0.10.0

data/spec/massimo/config_spec.rb

@@ -13,7 +13,7 @@ describe Massimo::Config do
   
   describe '#initialize' do
     context 'with an options hash' do
-      it 'should set the given attributes' do
+      it 'sets the given attributes' do
         config = Massimo::Config.new :source_path => 'source/path'
         config.source_path.should == File.expand_path('source/path')
       end
@@ -21,28 +21,28 @@ describe Massimo::Config do
   end
   
   describe '#path_for' do
-    it 'should read the configured option' do
+    it 'reads the configured option' do
       config = Massimo::Config.new :pages_path => 'pages/path'
       config.path_for(:pages).should == File.expand_path('pages/path')
     end
     
-    it 'should default to a path in the #source_path' do
+    it 'defaults to a path in the #source_path' do
       Massimo::Config.new.path_for(:pages).should == File.expand_path('pages')
     end
   end
   
   describe '#url_for' do
-    it 'should read the configured option' do
+    it 'reads the configured option' do
       config = Massimo::Config.new :pages_url => '/pages'
       config.url_for(:pages).should == '/pages'
     end
     
-    it "should default to '/'" do
+    it "defaults to '/'" do
       Massimo::Config.new.url_for(:users).should == '/'
     end
     
     context 'with a custom #base_url' do
-      it 'should prepend the #base_url' do
+      it 'prepends the #base_url' do
         config = Massimo::Config.new :base_url => '/blog'
         config.url_for(:stylesheets).should == '/blog/stylesheets'
       end
@@ -50,7 +50,7 @@ describe Massimo::Config do
   end
   
   describe '#files_in' do
-    it 'should find each file in the given resource dir' do
+    it 'finds each file in the given resource dir' do
       within_construct do |c|
         c.file 'lib/some_file.rb'
         c.file 'lib/another_file.txt'
@@ -59,7 +59,7 @@ describe Massimo::Config do
       end
     end
     
-    it 'should not find directories' do
+    it 'does not find directories' do
       within_construct do |c|
         c.directory 'pages/some_dir'
         files = Massimo::Config.new.files_in(:pages)
@@ -67,7 +67,7 @@ describe Massimo::Config do
       end
     end
     
-    it 'should find files with the given extension' do
+    it 'finds files with the given extension' do
       within_construct do |c|
         c.file 'lib/some_file.rb'
         c.file 'lib/another_file.txt'
@@ -78,20 +78,75 @@ describe Massimo::Config do
   end
   
   describe '#options_for' do
-    it 'should return the options set for the given name' do
+    it 'returns the options set for the given name' do
       config = Massimo::Config.new(:sass => { :style => :compressed })
       config.options_for(:sass).should == { :style => :compressed }
     end
     
-    it 'should return an empty hash if the options have not been set' do
+    it 'returns an empty hash if the options have not been set' do
       Massimo::Config.new.options_for(:sass).should == {}
     end
   end
   
   describe '#environment' do
-    it 'should be a StringInquirer' do
+    it 'is a StringInquirer' do
       config = Massimo::Config.new :environment => 'production'
       config.environment.should be_an_instance_of(ActiveSupport::StringInquirer)
     end
   end
+  
+  describe '#compress=' do
+    after do
+      Tilt.mappings.delete('css')
+      Tilt.mappings.delete('js')
+    end
+    
+    it 'registers all of the compressors' do
+      mock(Crush).register
+      config = Massimo::Config.new
+      config.compress = true
+    end
+  end
+  
+  describe '#compress_js=' do
+    after { Tilt.mappings.delete('js') }
+    
+    it 'registers all of the JavaScript compressors' do
+      mock(Crush).register_js
+      config = Massimo::Config.new
+      config.compress_js = true
+    end
+  end
+  
+  describe '#js_compressor=' do
+    after { Tilt.mappings.delete('js') }
+    
+    it 'registers and prefers the given compressor' do
+      config = Massimo::Config.new
+      config.js_compressor = :uglifier
+      Tilt.register Crush::Closure::Compiler, 'js'
+      Tilt['js'].should == Crush::Uglifier
+    end
+  end
+  
+  describe '#compress_css=' do
+    after { Tilt.mappings.delete('css') }
+    
+    it 'registers all of the CSS compressors' do
+      mock(Crush).register_css
+      config = Massimo::Config.new
+      config.compress_css = true
+    end
+  end
+  
+  describe '#css_compressor=' do
+    after { Tilt.mappings.delete('css') }
+    
+    it 'registers and prefers the given compressor' do
+      config = Massimo::Config.new
+      config.css_compressor = :cssmin
+      Tilt.register Crush::Rainpress, 'css'
+      Tilt['css'].should == Crush::CSSMin
+    end
+  end
 end

data/spec/massimo/javascript_spec.rb

@@ -32,7 +32,7 @@ describe Massimo::Javascript do
     
     it 'copies content' do
       with_file 'javascripts/main.js', 'var number = 42;' do
-        javascript.render.should == "var number = 42;"
+        javascript.render.should == "var number = 42;\n"
       end
     end
     
@@ -40,7 +40,7 @@ describe Massimo::Javascript do
       within_construct do |c|
         c.file 'javascripts/main.js', '//= require "_plugin.js"'
         c.file 'javascripts/_plugin.js', 'var number = 42;'
-        javascript.render.should == "var number = 42;"
+        javascript.render.should == "var number = 42;\n"
       end
     end
   end
@@ -50,7 +50,7 @@ describe Massimo::Javascript do
     
     it 'renders using CoffeeScript' do
       with_file 'javascripts/main.coffee', 'number: 42' do
-        mock(CoffeeScript).compile('number: 42', { :bare => false }) { '' }
+        mock_module("CoffeeScript").compile('number: 42', { :bare => false }) { '' }
         javascript.render
       end
     end
@@ -65,32 +65,33 @@ describe Massimo::Javascript do
   context 'with compression' do
     let(:javascript) { Massimo::Javascript.new 'javascripts/main.js' }
     let(:code)       { "function addTwo(number) { return number + 2; }\n" }
+    after            { Tilt.mappings.delete('js') }
     
-    context 'using :min' do
+    context 'using :jsmin' do
       it 'compresses using JSMin' do
-        Massimo.config.javascripts_compressor = :min
+        Massimo.config.js_compressor = :jsmin
         with_file 'javascripts/main.js', code do
-          mock(JSMin).minify(code) { '' }
+          mock_module('JSMin').minify(code) { '' }
           javascript.render
         end
       end
     end
     
-    context 'using :pack' do
+    context 'using :packr' do
       it 'compresses using Packr' do
-        Massimo.config.javascripts_compressor = :pack
+        Massimo.config.js_compressor = :packr
         with_file 'javascripts/main.js', code do
-          mock(Packr).pack(code, :shrink_vars => true) { '' }
+          mock_module('Packr').pack(code, {}) { '' }
           javascript.render
         end
       end
       
       context 'with configuration' do
         it 'passes configuration to Packr' do
-          Massimo.config.javascripts_compressor = :pack
-          Massimo.config.packr = { :shrink_vars => false }
+          Massimo.config.js_compressor = :packr
+          Massimo.config.js_compressor_options = { :shrink_vars => true }
           with_file 'javascripts/main.js', code do
-            mock(Packr).pack(code, :shrink_vars => false) { '' }
+            mock_module('Packr').pack(code, :shrink_vars => true) { '' }
             javascript.render
           end
         end
@@ -99,21 +100,21 @@ describe Massimo::Javascript do
     
     context 'using :yui' do
       it 'compresses using YUI::JavaScriptCompressor' do
-        Massimo.config.javascripts_compressor = :yui
+        Massimo.config.js_compressor = :yui
         with_file 'javascripts/main.js', code do
           compressor = mock!.compress(code) { '' }.subject
-          mock(YUI::JavaScriptCompressor).new(:munge => true) { compressor }
+          mock_module('YUI::JavaScriptCompressor').new({}) { compressor }
           javascript.render
         end
       end
       
       context 'with configuration' do
         it 'passes configuration to YUI::JavaScriptCompressor' do
-          Massimo.config.javascripts_compressor = :yui
-          Massimo.config.yui = { :munge => false }
+          Massimo.config.js_compressor = :yui
+          Massimo.config.js_compressor_options = { :munge => true }
           with_file 'javascripts/main.js', code do
             compressor = mock!.compress(code) { '' }.subject
-            mock(YUI::JavaScriptCompressor).new(:munge => false) { compressor }
+            mock_module('YUI::JavaScriptCompressor').new(:munge => true) { compressor }
             javascript.render
           end
         end
@@ -122,21 +123,44 @@ describe Massimo::Javascript do
     
     context 'using :closure' do
       it 'compresses using Closure::Compiler' do
-        Massimo.config.javascripts_compressor = :closure
+        Massimo.config.js_compressor = :closure
         with_file 'javascripts/main.js', code do
           compiler = mock!.compile(code) { '' }.subject
-          mock(Closure::Compiler).new({}) { compiler }
+          mock_module('Closure::Compiler').new({}) { compiler }
           javascript.render
         end
       end
       
       context 'with configuration' do
         it 'passes configuration to Closure::Compiler' do
-          Massimo.config.javascripts_compressor = :closure
-          Massimo.config.closure = { :compilation_level => 'ADVANCED_OPTIMIZATIONS' }
+          Massimo.config.js_compressor = :closure
+          Massimo.config.js_compressor_options = { :compilation_level => 'ADVANCED_OPTIMIZATIONS' }
           with_file 'javascripts/main.js', code do
             compiler = mock!.compile(code) { '' }.subject
-            mock(Closure::Compiler).new(:compilation_level => 'ADVANCED_OPTIMIZATIONS') { compiler }
+            mock_module('Closure::Compiler').new(:compilation_level => 'ADVANCED_OPTIMIZATIONS') { compiler }
+            javascript.render
+          end
+        end
+      end
+    end
+    
+    context 'using :uglifier' do
+      it 'compresses using Uglifier' do
+        Massimo.config.js_compressor = :uglifier
+        with_file 'javascripts/main.js', code do
+          compiler = mock!.compile(code) { '' }.subject
+          mock_module('Uglifier').new({}) { compiler }
+          javascript.render
+        end
+      end
+      
+      context 'with configuration' do
+        it 'passes configuration to Uglifier' do
+          Massimo.config.js_compressor = :uglifier
+          Massimo.config.js_compressor_options = { :mangle => true }
+          with_file 'javascripts/main.js', code do
+            compiler = mock!.compile(code) { '' }.subject
+            mock_module('Uglifier').new(:mangle => true) { compiler }
             javascript.render
           end
         end

data/spec/massimo/page_spec.rb

@@ -60,7 +60,8 @@ describe Massimo::Page do
     let(:page) { Massimo::Page.new 'without_meta_data.erb' }
     
     it 'should create the #title from the filename' do
-      with_file 'without_meta_data.erb' do
+      with_file 'without_meta_data.html.erb' do
+        page = Massimo::Page.new 'without_meta_data.html.erb'
         page.title.should == 'Without Meta Data'
       end
     end

data/spec/massimo/stylesheet_spec.rb

@@ -100,4 +100,64 @@ describe Massimo::Stylesheet do
       end
     end
   end
+  
+  context 'with compression' do
+    let(:stylesheet) { Massimo::Stylesheet.new 'stylesheets/main.css' }
+    let(:code)       { '#header { font-size: 36px }' }
+    after            { Tilt.mappings.delete('css') }
+    
+    context 'using :cssmin' do
+      it 'compresses using CSSMin' do
+        Massimo.config.css_compressor = :cssmin
+        with_file 'stylesheets/main.css', code do
+          mock_module('CSSMin').minify(code) { '' }
+          stylesheet.render
+        end
+      end
+    end
+    
+    context 'using :rainpress' do
+      it 'compresses using Rainpress' do
+        Massimo.config.css_compressor = :rainpress
+        with_file 'stylesheets/main.css', code do
+          mock_module('Rainpress').compress(code, {}) { '' }
+          stylesheet.render
+        end
+      end
+      
+      context 'with configuration' do
+        it 'passes configuration to Rainpress' do
+          Massimo.config.css_compressor = :rainpress
+          Massimo.config.css_compressor_options = { :comments => false }
+          with_file 'stylesheets/main.css', code do
+            mock_module('Rainpress').compress(code, :comments => false) { '' }
+            stylesheet.render
+          end
+        end
+      end
+    end
+    
+    context 'using :yui' do
+      it 'compresses using YUI::CssCompressor' do
+        Massimo.config.css_compressor = :yui
+        with_file 'stylesheets/main.css', code do
+          compressor = mock!.compress(code) { '' }
+          mock_module('YUI::CssCompressor').new({}) { compressor }
+          stylesheet.render
+        end
+      end
+      
+      context 'with configuration' do
+        it 'passes configuration to YUI::CssCompressor' do
+          Massimo.config.css_compressor = :yui
+          Massimo.config.css_compressor_options = { :linebreak => 0 }
+          with_file 'stylesheets/main.css', code do
+            compressor = mock!.compress(code) { '' }
+            mock_module('YUI::CssCompressor').new(:linebreak => 0) { compressor }
+            stylesheet.render
+          end
+        end
+      end
+    end
+  end
 end

data/spec/massimo/ui_spec.rb

@@ -8,7 +8,7 @@ describe Massimo::UI do
     end
     
     it 'does not send a Growl notification' do
-      dont_allow(Growl).notify
+      dont_allow(blank_module("Growl")).notify
       Massimo::UI.say 'message'
     end
     
@@ -21,13 +21,13 @@ describe Massimo::UI do
     
     context 'with :growl => true' do
       it 'sends a Growl Notification' do
-        mock(Growl).notify('message', anything)
+        mock_module("Growl").notify('message', anything)
         Massimo::UI.say 'message', :growl => true
       end
       
       context 'and a color' do
         it 'sends an uncolored Growl Notification' do
-          mock(Growl).notify('message', anything)
+          mock_module("Growl").notify('message', anything)
           Massimo::UI.say 'message', :red, :growl => true
         end
       end

data/spec/spec_helper.rb

@@ -1,22 +1,8 @@
-lib = File.expand_path('../../lib', __FILE__)
-$:.unshift(lib) unless $:.include?(lib)
-
-require 'rubygems'
-require 'rspec'
-require 'rr'
-require 'construct'
-require 'rack/test'
-require 'unindent'
-require 'sass'
-require 'less'
-require 'coffee-script'
-require 'sprockets'
-require 'jsmin'
-require 'packr'
-require 'yui/compressor'
-require 'closure-compiler'
-require 'growl'
-require 'massimo'
+require "rubygems"
+require "bundler/setup"
+Bundler.require(:default, :development)
+require "rack/test"
+require "construct"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
@@ -29,7 +15,7 @@ RSpec.configure do |config|
   
   config.before :each do
     stub($stdout).puts
-    stub(Growl).notify
+    stub_module("Growl").notify
   end
   
   config.after :each do
@@ -62,4 +48,25 @@ RSpec.configure do |config|
     result
   end
   alias :silence :capture
+  
+  # Creates a blank module with the given name (creating base modules if necessary)
+  def blank_module(name)
+    name.split("::").inject(Object) do |memo, const|
+      if memo.const_defined?(const)
+        memo.const_get(const)
+      else
+        memo.const_set(const, Module.new)
+      end
+    end
+  end
+  
+  # Creates a blank module wraps it as a mock object in rr
+  def mock_module(name)
+    mock(blank_module(name))
+  end
+  
+  # Creates a blank module wraps it as a stubbed object in rr
+  def stub_module(name)
+    stub(blank_module(name))
+  end
 end