stylo 0.5.1 → 0.6.0

data/Rakefile

@@ -18,7 +18,7 @@ begin
     gem.add_development_dependency "sinatra", ">= 0"
     gem.add_development_dependency "rails", ">= 3.0.0"
     gem.add_runtime_dependency "haml", ">= 3.0.21"
-    gem.version = "0.5.1"
+    gem.version = "0.6.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/TODO

@@ -1,4 +1,4 @@
-support switching off combining (for development)
+make configuration nicer and more flexible
 add minification for javascript
 add minification for css
-make it so sass is only used if the sass gem is not available (without making the pipeline configuration messy)
+make it so sass is not used if the sass gem is not available (without making the pipeline configuration messy)

data/features/fixtures/nested_folder_grand_parent.css

@@ -0,0 +1,5 @@
+@import "a_folder/parent.css";
+
+#grand-parent {
+  color: red;
+}

data/features/fixtures/nested_folder_grand_parent_with_parent_with_child.css

@@ -0,0 +1,11 @@
+#child {
+    background: #000000;
+}
+
+#parent {
+    background: #FFFFFF;
+}
+
+#grand-parent {
+  color: red;
+}

data/features/step_definitions/stylo_steps.rb

@@ -2,10 +2,20 @@ Given /^"([^"]*)" is located at "([^"]*)" in the asset location$/ do |filename,
   cp fixture_path(filename), temp_path(folder)
 end
 
+Given /^a folder "([^"]*)" exists at "([^"]*)" in the asset location$/ do |folder_name, folder|
+  mkdir temp_path("#{folder}/#{folder_name}")
+end
+
+
 When /^a request is made for "([^"]*)"$/ do |path|
   get path
 end
 
+When /^a request is made for "([^"]*)" the following error should be raised$/ do |path, expected_error|
+  proc { get path }.should raise_error(expected_error)
+end
+
+
 Then /^the response body should look like "([^"]*)"$/ do |filename|
   last_response.body.should == load_fixture(filename)
 end
@@ -29,4 +39,4 @@ end
 
 When /^css combining is disabled$/ do
   Stylo::Config.css_combining_enabled = false
-end
+end

data/features/stylesheets.feature

@@ -25,6 +25,14 @@ Feature: Stylesheet serving
     When a request is made for "stylesheets/grand_parent.css"
     Then the response body should look like "grand_parent_with_parent_with_child.css"
 
+  Scenario: Stylesheet combining in nested folders
+    Given "nested_folder_grand_parent.css" is located at "stylesheets" in the asset location
+    And a folder "a_folder" exists at "stylesheets" in the asset location
+    And "parent.css" is located at "stylesheets/a_folder" in the asset location
+    And "child.css" is located at "stylesheets/a_folder" in the asset location
+    When a request is made for "stylesheets/nested_folder_grand_parent.css"
+    Then the response body should look like "nested_folder_grand_parent_with_parent_with_child.css"
+
   Scenario: Stylesheet responses should have the correct headers
     Given "child.css" is located at "stylesheets" in the asset location
     When a request is made for "stylesheets/child.css"
@@ -35,4 +43,11 @@ Feature: Stylesheet serving
   Scenario: Stylesheets should be cached
     Given "child.css" is located at "stylesheets" in the asset location
     When a request is made for "stylesheets/child.css"
-    Then the "Cache-Control" header should be "public, max-age=86400"
+    Then the "Cache-Control" header should be "public, max-age=86400"
+
+  Scenario: When a referenced stylesheet does not exist
+    Given "parent.css" is located at "stylesheets" in the asset location
+    When a request is made for "stylesheets/parent.css" the following error should be raised
+    """
+    Cannot find referenced asset 'child.css'.
+    """

data/lib/stylo/combiner.rb

@@ -1,14 +1,17 @@
 module Stylo
   class Combiner
-    def initialize(asset_directory, require_pattern)
+    def initialize(require_pattern)
       @require_pattern = require_pattern
-      @asset_directory = asset_directory
     end
 
-    def process(content)
+    def process(base_directory, content)
       content.gsub @require_pattern do |match|
-        process(AssetLoader.load_content(File.join(@asset_directory, $1)))
+        required_dir = File.dirname($1)
+	required_dir = required_dir == '.' ? base_directory : File.join(base_directory, required_dir)
+
+	raise "Cannot find referenced asset '#{$1}'." if !(content = AssetLoader.load_content(File.join(base_directory, $1)))
+        process(required_dir, content)
       end
     end
   end
-end
+end

data/lib/stylo/pipeline_steps/javascript.rb

@@ -8,7 +8,7 @@ module Stylo
         return unless content = AssetLoader.load_content(response.path)
 
         if Config.javascript_combining_enabled
-          content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
+          content = Combiner.new(REQUIRE_PATTERN).process(File.dirname(response.path), content)
         end
 
         response.set_body content, :javascript

data/lib/stylo/pipeline_steps/sass.rb

@@ -8,11 +8,11 @@ module Stylo
         content = AssetLoader.load_content(response.path.gsub('.css', '.scss'))
         return if content.nil?
 
-        combined_content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
+        combined_content = Combiner.new(REQUIRE_PATTERN).process(File.dirname(response.path), content)
         processed_content = ::Sass::Engine.new(combined_content, {:syntax => :scss}).render
 
         response.set_body(processed_content, :css)
       end
     end
   end
-end
+end

data/lib/stylo/pipeline_steps/stylesheet.rb

@@ -8,11 +8,11 @@ module Stylo
         return unless content = AssetLoader.load_content(response.path)
 
         if Config.css_combining_enabled
-          content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
+          content = Combiner.new(REQUIRE_PATTERN).process(File.dirname(response.path), content)
         end
 
         response.set_body content, :css
       end
     end
   end
-end
+end

data/spec/combiner_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe Stylo::Combiner do
   let(:request_path_directory) { 'assets' }
-  let(:combiner) { Stylo::Combiner.new(request_path_directory, /require "(.*)";/) }
+  let(:combiner) { Stylo::Combiner.new(/require "(.*)";/) }
 
   describe "when the content does not contain the require pattern" do
     let(:content) { "This is some text." }
 
     it "should return the content" do
-      combiner.process(content).should == content
+      combiner.process(request_path_directory, content).should == content
     end
   end
 
@@ -22,20 +22,36 @@ describe Stylo::Combiner do
     it "should load required content from the asset loader" do
       Stylo::AssetLoader.should_receive(:load_content).with('assets/some_other_file').and_return('the required content.')
 
-      combiner.process(content)
+      combiner.process(request_path_directory, content)
     end
 
-    it "should return the combined content" do
-      combiner.process(content).should == 'the required content. and then some other content'
+    describe "when the required content exists" do
+      before(:each) do
+	Stylo::AssetLoader.stub(:load_content).with('assets/some_other_file').and_return('the required content.')
+      end
+
+      it "should return the required content" do
+	combiner.process(request_path_directory, content).should == 'the required content. and then some other content'
+      end
+
+      describe "and the required content has the require pattern" do
+        it "should combine the content recursively" do
+          Stylo::AssetLoader.stub(:load_content).with('assets/some_other_file').and_return('require "yet_another_file"; the required content.')
+          Stylo::AssetLoader.stub(:load_content).with('assets/yet_another_file').and_return('the other required content.')
+
+          combiner.process(request_path_directory, content).should == "the other required content. the required content. and then some other content"
+        end
+      end
     end
 
-    describe "and the required content has the require pattern" do
-      it "should combine the content recursively" do
-        Stylo::AssetLoader.stub(:load_content).with('assets/some_other_file').and_return('require "yet_another_file"; the required content.')
-        Stylo::AssetLoader.stub(:load_content).with('assets/yet_another_file').and_return('the other required content.')
+    describe "when the required content does not exist" do
+      before(:each) do
+	Stylo::AssetLoader.stub(:load_content).with('assets/some_other_file').and_return(nil)
+      end
 
-        combiner.process(content).should == "the other required content. the required content. and then some other content"
+      it "should raise an error" do
+        proc { combiner.process(request_path_directory, content) }.should raise_error("Cannot find referenced asset 'some_other_file'.")
       end
     end
   end
-end
+end

data/spec/pipeline_steps/javascript_spec.rb

@@ -17,6 +17,7 @@ describe Stylo::PipelineSteps::Javascript do
 
     describe "and the request is for a javascript asset" do
       let(:response) { Stylo::Response.new('javascripts/test.js') }
+      let(:base_path) { File.dirname(response.path)  }
 
       before(:each) do
 
@@ -45,8 +46,8 @@ describe Stylo::PipelineSteps::Javascript do
 
         before(:each) do
           Stylo::AssetLoader.stub(:load_content).and_return(javascript_content)
-          Stylo::Combiner.stub(:new).with('javascripts', /\/\/\/require "(.*)";/).and_return(combiner)
-          combiner.stub(:process).with(javascript_content).and_return(combined_javascript_content)
+          Stylo::Combiner.stub(:new).with(/\/\/\/require "(.*)";/).and_return(combiner)
+          combiner.stub(:process).with(base_path, javascript_content).and_return(combined_javascript_content)
         end
 
         describe "and combining is enabled" do
@@ -55,8 +56,8 @@ describe Stylo::PipelineSteps::Javascript do
           end
 
           it "should tell the combiner to process the javascript content" do
-            Stylo::Combiner.should_receive(:new).with('javascripts', /\/\/\/require "(.*)";/).and_return(combiner)
-            combiner.should_receive(:process).with(javascript_content).and_return(combined_javascript_content)
+            Stylo::Combiner.should_receive(:new).with(/\/\/\/require "(.*)";/).and_return(combiner)
+            combiner.should_receive(:process).with(base_path, javascript_content).and_return(combined_javascript_content)
 
             step.call(response)
           end
@@ -99,4 +100,4 @@ describe Stylo::PipelineSteps::Javascript do
       response.body.should == 'some-content'
     end
   end
-end
+end

data/spec/pipeline_steps/sass_spec.rb

@@ -19,6 +19,7 @@ describe Stylo::PipelineSteps::Sass do
       let(:requested_path) { 'stylesheets/test.css' }
       let(:sass_path) { 'stylesheets/test.scss' }
       let(:response) { Stylo::Response.new(requested_path) }
+      let(:base_path) { File.dirname(response.path)  }
 
       it "should ask the asset loader to load the sass stylesheet content" do
         Stylo::AssetLoader.should_receive(:load_content).with(sass_path).and_return(nil)
@@ -45,15 +46,15 @@ describe Stylo::PipelineSteps::Sass do
 
         before(:each) do
           Stylo::AssetLoader.stub(:load_content).and_return(stylesheet_content)
-          Stylo::Combiner.stub(:new).with('stylesheets', /@import "(.*)";/).and_return(combiner)
-          combiner.stub(:process).with(stylesheet_content).and_return(combined_stylesheet_content)
+          Stylo::Combiner.stub(:new).with(/@import "(.*)";/).and_return(combiner)
+          combiner.stub(:process).with(base_path, stylesheet_content).and_return(combined_stylesheet_content)
           ::Sass::Engine.stub(:new).with(combined_stylesheet_content, {:syntax => :scss}).and_return(sass_engine)
           sass_engine.stub(:render).and_return(processed_content)
         end
 
         it "should tell the combiner to process the stylesheet content" do
-          Stylo::Combiner.should_receive(:new).with('stylesheets', /@import "(.*)";/).and_return(combiner)
-          combiner.should_receive(:process).with(stylesheet_content).and_return(combined_stylesheet_content)
+          Stylo::Combiner.should_receive(:new).with(/@import "(.*)";/).and_return(combiner)
+          combiner.should_receive(:process).with(base_path, stylesheet_content).and_return(combined_stylesheet_content)
 
           step.call(response)
         end
@@ -91,4 +92,4 @@ describe Stylo::PipelineSteps::Sass do
     end
   end
 
-end
+end

data/spec/pipeline_steps/stylesheet_spec.rb

@@ -17,6 +17,7 @@ describe Stylo::PipelineSteps::Stylesheet do
 
     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
 
@@ -45,8 +46,8 @@ describe Stylo::PipelineSteps::Stylesheet do
 
         before(:each) do
           Stylo::AssetLoader.stub(:load_content).and_return(stylesheet_content)
-          Stylo::Combiner.stub(:new).with('stylesheets', /@import "(.*)";/).and_return(combiner)
-          combiner.stub(:process).with(stylesheet_content).and_return(combined_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
@@ -55,8 +56,8 @@ describe Stylo::PipelineSteps::Stylesheet do
           end
 
           it "should tell the combiner to process the stylesheet content" do
-            Stylo::Combiner.should_receive(:new).with('stylesheets', /@import "(.*)";/).and_return(combiner)
-            combiner.should_receive(:process).with(stylesheet_content).and_return(combined_stylesheet_content)
+            Stylo::Combiner.should_receive(:new).with(/@import "(.*)";/).and_return(combiner)
+            combiner.should_receive(:process).with(base_path, stylesheet_content).and_return(combined_stylesheet_content)
 
             step.call(response)
           end
@@ -100,4 +101,4 @@ describe Stylo::PipelineSteps::Stylesheet do
       response.body.should == 'some-content'
     end
   end
-end
+end

data/stylo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stylo}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mwagg"]
-  s.date = %q{2010-10-18}
+  s.date = %q{2010-11-03}
   s.description = %q{Server side stylesheet combining for readonly hosting environments}
   s.email = %q{michael@guerillatactics.co.uk}
   s.extra_rdoc_files = [
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
      "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/nested_folder_grand_parent.css",
+     "features/fixtures/nested_folder_grand_parent_with_parent_with_child.css",
      "features/fixtures/parent.css",
      "features/fixtures/parent.js",
      "features/fixtures/parent_with_child.css",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylo
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - mwagg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +01:00
+date: 2010-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,8 @@ 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/nested_folder_grand_parent.css
+- features/fixtures/nested_folder_grand_parent_with_parent_with_child.css
 - features/fixtures/parent.css
 - features/fixtures/parent.js
 - features/fixtures/parent_with_child.css