stylo 0.8.0 → 0.8.5

data/TODO

@@ -1,3 +1,2 @@
 make configuration nicer and more flexible
-add minification for css
 set etags

data/features/fixtures/minified_child.css

@@ -0,0 +1 @@
+#child{background:#000000}

data/features/step_definitions/stylo_steps.rb

@@ -29,8 +29,8 @@ When /^the "([^\"]*)" header should be "([^\"]*)"$/ do |header_key, expected_val
 end
 
 Then /^the response should be from a call back into rack$/ do
-  last_response.status.should == 404
-  last_response.body.should include("Sinatra doesn't know this ditty.")
+  last_response.status.should == 200
+  last_response.body.should include("Hello World!")
 end
 
 When /^javascript combining is disabled$/ do
@@ -51,4 +51,12 @@ end
 
 Given /^javascript minifying is enabled$/ do
   Stylo::Config.options[:js_minifying_enabled] = true
-end
+end
+
+Given /^css minifying is enabled$/ do
+  Stylo::Config.options[:css_minifying_enabled] = true
+end
+
+Given /^css minifying is disabled$/ do
+  Stylo::Config.options[:css_minifying_enabled] = false
+end

data/features/stylesheets.feature

@@ -1,4 +1,6 @@
 Feature: Stylesheet serving
+  Background:
+    Given css minifying is disabled
 
   Scenario: Simple stylesheet serving
     Given "child.css" is located at "stylesheets" in the asset location
@@ -51,3 +53,9 @@ Feature: Stylesheet serving
     """
     Cannot find referenced asset 'child.css'.
     """
+
+  Scenario: Stylesheet minification
+    Given css minifying is enabled
+    And "child.css" is located at "stylesheets" in the asset location
+    When a request is made for "stylesheets/child.css"
+    Then the response body should look like "minified_child.css"

data/features/support/env.rb

@@ -1,12 +1,7 @@
 require 'rack/test'
-require 'sinatra'
 
 require File.join(File.dirname(__FILE__), '../../spec/spec_helper')
 
-class MyApp < Sinatra::Application
-
-end
-
 World do
   include Rack::Test::Methods
   include StyloSpecHelpers
@@ -15,7 +10,7 @@ World do
   def app
     @app ||= Rack::Builder.new do
       use Stylo::Rack
-      run MyApp
+      run Proc.new {|env| [200, {"Content-Type" => "text/html"}, "Hello World!"]}
     end
   end
 

data/lib/stylo/config.rb

@@ -7,17 +7,19 @@ module Stylo
 
       def defaults
         {
-            :css_combining_enabled => true,
-            :js_combining_enabled => true,
-            :js_minifying_enabled => true
+          :css_combining_enabled => true,
+          :js_combining_enabled => true,
+          :js_minifying_enabled => true,
+          :css_minifying_enabled => true
         }
       end
 
       def pipeline
         [Stylo::PipelineSteps::Stylesheet.new,
-         Stylo::PipelineSteps::Javascript.new,
-         Stylo::PipelineSteps::JavascriptMinifying.new,
-         Stylo::PipelineSteps::Caching.new]
+          Stylo::PipelineSteps::StylesheetMinifying.new,
+          Stylo::PipelineSteps::Javascript.new,
+          Stylo::PipelineSteps::JavascriptMinifying.new,
+          Stylo::PipelineSteps::Caching.new]
       end
 
       def reset_to_default

data/lib/stylo/css_minifier.rb

@@ -0,0 +1,16 @@
+module Stylo
+  class CssMinifier
+    def self.minify(original)
+      result = original.gsub /\s+/, ' '
+      result = result.gsub /\/\*.*?\*\//s, ''
+      result = result.gsub '; ', ';'
+      result = result.gsub ': ', ':'
+      result = result.gsub ' {', '{'
+      result = result.gsub '{ ', '{'
+      result = result.gsub ', ', ','
+      result = result.gsub '} ', '}'
+      result = result.gsub ';}', '}'
+      result.strip
+    end
+  end
+end

data/lib/stylo/pipeline_steps/stylesheet_minifying.rb

@@ -0,0 +1,12 @@
+module Stylo
+  module PipelineSteps
+    class StylesheetMinifying
+      def call(response)
+        if Config.options[:css_minifying_enabled] and response.extension == '.css' and response.has_content?
+          minified = CssMinifier.minify(response.body)
+          response.set_body minified, :css
+        end
+      end
+    end
+  end
+end

data/lib/stylo/version.rb

@@ -1,3 +1,3 @@
 module Stylo
-  VERSION = "0.8.0"
+  VERSION = "0.8.5"
 end

data/spec/pipeline_steps/stylesheet_spec.rb

@@ -1,104 +1,44 @@
 require 'spec_helper'
 
-describe Stylo::PipelineSteps::Stylesheet do
-  let(:step) { Stylo::PipelineSteps::Stylesheet.new }
-
-  describe "when the response has not already been set" do
-    describe "and the request is not for a stylesheet" do
-      it "should not set the response" do
-        response = Stylo::Response.new('javascripts/test.js')
-        Stylo::AssetLoader.stub(:load_content).with(response.path).and_return('some-content')
-
-        step.call(response)
-
-        response.has_content?.should be_false
-      end
-    end
-
-    describe "and the request is for a stylesheet" do
-      let(:response) { Stylo::Response.new('stylesheets/test.css') }
-      let(:base_path) { File.dirname(response.path)  }
-
-      before(:each) do
-
-      end
-
-      it "should ask the asset loader to load the stylesheet content" do
-        Stylo::AssetLoader.should_receive(:load_content).with(response.path).and_return(nil)
-
-        step.call(response)
-      end
-
-      describe "and the asset does not exist" do
-        it "should not set the response" do
-          Stylo::AssetLoader.stub(:load_content).and_return(nil)
-
-          step.call(response)
-
-          response.has_content?.should be_false
-        end
-      end
-
-      describe "and the asset exists" do
-        let(:stylesheet_content) { "html { color: $color; }" }
-        let(:combined_stylesheet_content) { "html { color: red; }" }
-        let(:combiner) { mock(:combiner) }
-
-        before(:each) do
-          Stylo::AssetLoader.stub(:load_content).and_return(stylesheet_content)
-          Stylo::Combiner.stub(:new).with(/@import "(.*)";/).and_return(combiner)
-          combiner.stub(:process).with(base_path, stylesheet_content).and_return(combined_stylesheet_content)
-        end
-
-        describe "and combining is enabled" do
-          before(:each) do
-            Stylo::Config.options[:css_combining_enabled] = true
-          end
-
-          it "should tell the combiner to process the stylesheet content" do
-            Stylo::Combiner.should_receive(:new).with(/@import "(.*)";/).and_return(combiner)
-            combiner.should_receive(:process).with(base_path, stylesheet_content).and_return(combined_stylesheet_content)
+describe Stylo::PipelineSteps::StylesheetMinifying do
+  before(:each) do
+    Stylo::Config.options[:css_minifying_enabled] = true
+  end
 
-            step.call(response)
-          end
+  let(:step) { Stylo::PipelineSteps::StylesheetMinifying.new }
 
-          it "should set the body of the response to the combined stylesheet content" do
-            step.call(response)
+  describe "when the response body is not a stylesheet" do
+    it "should not modify the response body" do
+      response = Stylo::Response.new('javascripts/test.js')
+      original_body = "alert('hello');"
+      response.set_body(original_body, :javascript)
 
-            response.body.should == combined_stylesheet_content
-          end
-        end
+      step.call(response)
 
-        describe "and combining is disabled" do
-          before(:each) do
-            Stylo::Config.options[:css_combining_enabled] = false
-          end
+      response.body.should == original_body
+    end
+  end
 
-          it "should set the body of the response to the stylesheet content" do
-            step.call(response)
+  describe "when the response body is a stylesheet" do
+    let(:response) { Stylo::Response.new('stylesheets/test.css') }
+    let(:minified_stylesheet) { 'I am minified!' }
 
-            response.body.should == stylesheet_content
-          end
+    before(:each) do
+      response.set_body('some stylesheet', :css)
 
-        end
+      Stylo::CssMinifier.stub(:minify).and_return(minified_stylesheet)
+    end
 
-        it "should set the content type to text/css" do
-          step.call(response)
+    it "should ask the css minifier to minify the stylesheet" do
+      Stylo::CssMinifier.should_receive(:minify).with(response.body)
 
-          response.headers['Content-Type'].should == 'text/css'
-        end
-      end
+      step.call(response)
     end
-  end
-
-  describe "when the response has already been set" do
-    it "should not alter the response" do
-      response = Stylo::Response.new('stylesheets/test.css')
-      response.set_body('some-content', :css)
 
+    it "should replace the response body with the minified text" do
       step.call(response)
 
-      response.body.should == 'some-content'
+      response.body.should == minified_stylesheet
     end
   end
 end

data/stylo.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '>= 2.1.0')
   s.add_development_dependency('bundler')
   s.add_development_dependency('rack-test')
-  s.add_development_dependency('sinatra')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylo
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Mike Wagg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +00:00
+date: 2010-12-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,20 +76,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  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
 description: |-
   A rack middleware which does css and javascript combining
                         and minification for sites hosted in readonly filesystem environments
@@ -118,6 +104,7 @@ files:
 - features/fixtures/grand_parent.js
 - features/fixtures/grand_parent_with_parent_with_child.css
 - features/fixtures/grand_parent_with_parent_with_child.js
+- features/fixtures/minified_child.css
 - features/fixtures/nested_folder_grand_parent.css
 - features/fixtures/nested_folder_grand_parent_with_parent_with_child.css
 - features/fixtures/parent.css
@@ -137,10 +124,12 @@ files:
 - lib/stylo/asset_loader.rb
 - lib/stylo/combiner.rb
 - lib/stylo/config.rb
+- lib/stylo/css_minifier.rb
 - lib/stylo/pipeline_steps/caching.rb
 - lib/stylo/pipeline_steps/javascript.rb
 - lib/stylo/pipeline_steps/javascript_minifying.rb
 - lib/stylo/pipeline_steps/stylesheet.rb
+- lib/stylo/pipeline_steps/stylesheet_minifying.rb
 - lib/stylo/processor.rb
 - lib/stylo/rack.rb
 - lib/stylo/railtie.rb
@@ -199,6 +188,7 @@ test_files:
 - features/fixtures/grand_parent.js
 - features/fixtures/grand_parent_with_parent_with_child.css
 - features/fixtures/grand_parent_with_parent_with_child.js
+- features/fixtures/minified_child.css
 - features/fixtures/nested_folder_grand_parent.css
 - features/fixtures/nested_folder_grand_parent_with_parent_with_child.css
 - features/fixtures/parent.css