stylo 0.7.0 → 0.8.0

data/Rakefile

@@ -2,29 +2,32 @@ require 'rubygems'
 require 'rake'
 require 'cucumber'
 require 'cucumber/rake/task'
+require 'bundler'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "stylo"
-    gem.summary = %Q{Server side stylesheet combining for readonly hosting environments}
-    gem.description = %Q{Server side stylesheet combining for readonly hosting environments}
-    gem.email = "michael@guerillatactics.co.uk"
-    gem.homepage = "http://github.com/mwagg/stylo"
-    gem.authors = ["mwagg"]
-    gem.add_development_dependency "rspec", ">= 0"
-    gem.add_development_dependency "cucumber", ">= 0"
-    gem.add_development_dependency "rack-test", ">= 0"
-    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.7.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+Bundler::GemHelper.install_tasks
+
+#begin
+#  require 'jeweler'
+#  Jeweler::Tasks.new do |gem|
+#    gem.name = "stylo"
+#    gem.summary = %Q{Server side stylesheet combining for readonly hosting environments}
+#    gem.description = %Q{Server side stylesheet combining for readonly hosting environments}
+#    gem.email = "michael@guerillatactics.co.uk"
+#    gem.homepage = "http://github.com/mwagg/stylo"
+#    gem.authors = ["mwagg"]
+#    gem.add_development_dependency "rspec", ">= 0"
+#    gem.add_development_dependency "cucumber", ">= 0"
+#    gem.add_development_dependency "rack-test", ">= 0"
+#    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.7.0"
+#    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+#  end
+#  Jeweler::GemcutterTasks.new
+#rescue LoadError
+#  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+#end
 
 require 'rspec/core/rake_task'
 desc "Run all examples"

data/TODO

@@ -1,4 +1,3 @@
 make configuration nicer and more flexible
-add minification for javascript
 add minification for css
-make it so sass is not used if the sass gem is not available (without making the pipeline configuration messy)
+set etags

data/features/javascripts.feature

@@ -1,4 +1,6 @@
 Feature: Javascript serving
+  Background:
+    Given javascript minifying is disabled
 
   Scenario: Simple javascript serving
     Given "child.js" is located at "javascripts" in the asset location
@@ -26,7 +28,7 @@ Feature: Javascript serving
     Then the response body should look like "grand_parent_with_parent_with_child.js"
 
   Scenario: Minifying javascript
-    Given javascript compression is enabled
+    Given javascript minifying is enabled
     And "child.js" is located at "javascripts" in the asset location
     When a request is made for "javascripts/child.js"
     Then the response body should look like "child-min.js"

data/features/response_headers.feature

@@ -4,10 +4,10 @@ Feature: Response headers
     Given "child.js" is located at "javascripts" in the asset location
     When a request is made for "javascripts/child.js"
     Then the response code should be "200"
-    And the "Content-Length" header should be "40"
+    And the "Content-Length" header should be "34"
     And the "Content-Type" header should be "text/javascript"
 
   Scenario: Content should be cached
     Given "child.js" is located at "javascripts" in the asset location
     When a request is made for "javascripts/child.js"
-    Then the "Cache-Control" header should be "public, max-age=86400"
+    Then the "Cache-Control" header should be "public, max-age=86400"

data/features/step_definitions/stylo_steps.rb

@@ -34,13 +34,21 @@ Then /^the response should be from a call back into rack$/ do
 end
 
 When /^javascript combining is disabled$/ do
-  Stylo::Config.javascript_combining_enabled = false
+  Stylo::Config.options[:js_combining_enabled] = false
 end
 
 When /^css combining is disabled$/ do
-  Stylo::Config.css_combining_enabled = false
+  Stylo::Config.options[:css_combining_enabled] = false
 end
 
-Given /^javascript compression is enabled$/ do
-  Stylo::Config.javascript_minifying_enabled = true
+#Given /^javascript compression is enabled$/ do
+#  Stylo::Config.options[:javascript_minifying_enabled] = true
+#end
+
+Given /^javascript minifying is disabled$/ do
+  Stylo::Config.options[:js_minifying_enabled] = false
+end
+
+Given /^javascript minifying is enabled$/ do
+  Stylo::Config.options[:js_minifying_enabled] = true
 end

data/features/support/env.rb

@@ -19,10 +19,11 @@ World do
     end
   end
 
-  reset_paths
+  true
 end
 
 Before do
   Stylo::Config.reset_to_default
+  reset_paths
 end
 

data/lib/stylo/asset_loader.rb

@@ -1,9 +1,9 @@
 module Stylo
   class AssetLoader
     def self.load_content(path)
-      path = File.join(Stylo::Config.asset_location, path)
+      path = File.join(Stylo::Config.options[:asset_location], path)
 
       File.read(path) if File.exist?(path)
     end
   end
-end
+end

data/lib/stylo/config.rb

@@ -1,23 +1,30 @@
 module Stylo
   class Config
     class << self
-      attr_accessor :asset_location, :css_combining_enabled, :javascript_combining_enabled, :javascript_minifying_enabled
+      def options
+        @options ||= defaults.clone
+      end
+
+      def defaults
+        {
+            :css_combining_enabled => true,
+            :js_combining_enabled => true,
+            :js_minifying_enabled => true
+        }
+      end
 
       def pipeline
         [Stylo::PipelineSteps::Stylesheet.new,
          Stylo::PipelineSteps::Javascript.new,
-         Stylo::PipelineSteps::Sass.new,
          Stylo::PipelineSteps::JavascriptMinifying.new,
          Stylo::PipelineSteps::Caching.new]
       end
 
       def reset_to_default
-        self.css_combining_enabled = true
-        self.javascript_combining_enabled = true
-        self.javascript_minifying_enabled = false
+        @options = defaults.clone
       end
     end
 
     reset_to_default
   end
-end
+end

data/lib/stylo/pipeline_steps/javascript.rb

@@ -4,10 +4,12 @@ module Stylo
       REQUIRE_PATTERN = /\/\/\/require "(.*)";/
 
       def call(response)
+        raise 'You must set the asset location (Stylo::Config.options[:asset_location]) before stylo can be used.' if !Config.options[:asset_location]
+
         return if response.has_content? || response.extension != '.js'
         return unless content = AssetLoader.load_content(response.path)
 
-        if Config.javascript_combining_enabled
+        if Config.options[:js_combining_enabled]
           content = Combiner.new(REQUIRE_PATTERN).process(File.dirname(response.path), content)
         end
 

data/lib/stylo/pipeline_steps/javascript_minifying.rb

@@ -2,10 +2,10 @@ module Stylo
   module PipelineSteps
     class JavascriptMinifying
       def call(response)
-        if Config.javascript_minifying_enabled and response.extension == '.js' and response.has_content?
+        if Config.options[:js_minifying_enabled] and response.extension == '.js' and response.has_content?
           response.set_body(JSMin.new(response.body).minify, :javascript)
         end
       end
     end
   end
-end
+end

data/lib/stylo/pipeline_steps/stylesheet.rb

@@ -4,10 +4,12 @@ module Stylo
 
     class Stylesheet
       def call(response)
+        raise 'You must set the asset location (Stylo::Config.options[:asset_location]) before stylo can be used.' if !Config.options[:asset_location]
+
         return if response.has_content? || response.extension != '.css'
         return unless content = AssetLoader.load_content(response.path)
 
-        if Config.css_combining_enabled
+        if Config.options[:css_combining_enabled]
           content = Combiner.new(REQUIRE_PATTERN).process(File.dirname(response.path), content)
         end
 

data/lib/stylo/railtie.rb

@@ -4,7 +4,7 @@ begin
   module Stylo
     class Railtie < Rails::Railtie
       initializer "stylo.initialize" do |app|
-        Stylo::Config.asset_location ||= File.join(app.root, 'public')
+        Stylo::Config.options[:asset_location] ||= File.join(app.root, 'public')
         app.middleware.insert_before ActionDispatch::Static, Stylo::Rack
       end
     end

data/lib/stylo/version.rb

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

data/lib/stylo.rb

@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-Dir.glob(File.join(File.dirname(__FILE__), '**/*.rb')).each { |f| require f }
+Dir.glob(File.join(File.dirname(__FILE__), '**/*.rb')).reject do |filename|
+  filename =~ /version.rb$/
+end.each { |f| require f }
 
 

data/spec/asset_loader_spec.rb

@@ -13,4 +13,4 @@ describe Stylo::AssetLoader do
       Stylo::AssetLoader.load_content('javascripts/i_exist.js').should == content
     end
   end
-end
+end

data/spec/pipeline_steps/javascript_minifying_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Stylo::PipelineSteps::JavascriptMinifying do
   before(:each) do
-    Stylo::Config.javascript_minifying_enabled = true
+    Stylo::Config.options[:javascript_minifying_enabled] = true
   end
 
   let(:step) { Stylo::PipelineSteps::JavascriptMinifying.new }
@@ -44,4 +44,4 @@ describe Stylo::PipelineSteps::JavascriptMinifying do
       response.body.should == minified_javascript
     end
   end
-end
+end

data/spec/pipeline_steps/javascript_spec.rb

@@ -52,7 +52,7 @@ describe Stylo::PipelineSteps::Javascript do
 
         describe "and combining is enabled" do
           before(:each) do
-            Stylo::Config.javascript_combining_enabled = true
+            Stylo::Config.options[:javascript_combining_enabled] = true
           end
 
           it "should tell the combiner to process the javascript content" do
@@ -71,7 +71,7 @@ describe Stylo::PipelineSteps::Javascript do
 
         describe "and combining is disabled" do
           before(:each) do
-            Stylo::Config.javascript_combining_enabled = false
+            Stylo::Config.options[:js_combining_enabled] = false
           end
 
           it "should set the body of the response to the javascript content" do

data/spec/pipeline_steps/stylesheet_spec.rb

@@ -52,7 +52,7 @@ describe Stylo::PipelineSteps::Stylesheet do
 
         describe "and combining is enabled" do
           before(:each) do
-            Stylo::Config.css_combining_enabled = true
+            Stylo::Config.options[:css_combining_enabled] = true
           end
 
           it "should tell the combiner to process the stylesheet content" do
@@ -71,7 +71,7 @@ describe Stylo::PipelineSteps::Stylesheet do
 
         describe "and combining is disabled" do
           before(:each) do
-            Stylo::Config.css_combining_enabled = false
+            Stylo::Config.options[:css_combining_enabled] = false
           end
 
           it "should set the body of the response to the stylesheet content" do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rspec'
+require 'fileutils'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -11,8 +12,8 @@ RSpec.configure do |config|
   config.include FileUtils
 
   config.before(:each) do
-    reset_paths
     Stylo::Config.reset_to_default
+    reset_paths
   end
 end
 

data/spec/stylo_spec_helpers.rb

@@ -25,6 +25,6 @@ module StyloSpecHelpers
       mkdir_p path
     end
 
-    Stylo::Config.asset_location = temp_path()
+    Stylo::Config.options[:asset_location] = temp_path()
   end
 end

data/stylo.gemspec

@@ -1,126 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "stylo/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{stylo}
-  s.version = "0.7.0"
+  s.name        = "stylo"
+  s.version     = Stylo::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Mike Wagg"]
+  s.email       = ["michael@guerillatactics.co.uk"]
+  s.homepage    = "http://rubygems.org/gems/stylo" # CHECK THIS
+  s.summary     = %q{A javascript and css combining/minifying rack middleware}
+  s.description = %q{A rack middleware which does css and javascript combining
+                      and minification for sites hosted in readonly filesystem environments
+                      such as heroku.com}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["mwagg"]
-  s.date = %q{2010-11-11}
-  s.description = %q{Server side stylesheet combining for readonly hosting environments}
-  s.email = %q{michael@guerillatactics.co.uk}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc",
-     "TODO"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "cucumber.yml",
-     "features/fixtures.rb",
-     "features/fixtures/child-min.js",
-     "features/fixtures/child.css",
-     "features/fixtures/child.js",
-     "features/fixtures/grand_parent.css",
-     "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",
-     "features/fixtures/parent_with_child.js",
-     "features/fixtures/processed_sass_child.css",
-     "features/fixtures/processed_sass_which_uses_mixin.css",
-     "features/fixtures/sass_child.scss",
-     "features/fixtures/sass_mixins.scss",
-     "features/fixtures/sass_which_uses_mixin.scss",
-     "features/javascripts.feature",
-     "features/response_headers.feature",
-     "features/sass_integration.feature",
-     "features/step_definitions/stylo_steps.rb",
-     "features/stylesheets.feature",
-     "features/stylo_cannot_serve_asset.feature",
-     "features/support/env.rb",
-     "lib/jsmin.rb",
-     "lib/stylo.rb",
-     "lib/stylo/asset_loader.rb",
-     "lib/stylo/combiner.rb",
-     "lib/stylo/config.rb",
-     "lib/stylo/pipeline_steps/caching.rb",
-     "lib/stylo/pipeline_steps/javascript.rb",
-     "lib/stylo/pipeline_steps/javascript_minifying.rb",
-     "lib/stylo/pipeline_steps/sass.rb",
-     "lib/stylo/pipeline_steps/stylesheet.rb",
-     "lib/stylo/processor.rb",
-     "lib/stylo/rack.rb",
-     "lib/stylo/railtie.rb",
-     "lib/stylo/response.rb",
-     "spec/asset_loader_spec.rb",
-     "spec/combiner_spec.rb",
-     "spec/pipeline_steps/caching_spec.rb",
-     "spec/pipeline_steps/javascript_minifying_spec.rb",
-     "spec/pipeline_steps/javascript_spec.rb",
-     "spec/pipeline_steps/sass_spec.rb",
-     "spec/pipeline_steps/stylesheet_spec.rb",
-     "spec/rack_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/stylo_spec_helpers.rb",
-     "stylo.gemspec"
-  ]
-  s.homepage = %q{http://github.com/mwagg/stylo}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Server side stylesheet combining for readonly hosting environments}
-  s.test_files = [
-    "spec/asset_loader_spec.rb",
-     "spec/combiner_spec.rb",
-     "spec/pipeline_steps/caching_spec.rb",
-     "spec/pipeline_steps/javascript_minifying_spec.rb",
-     "spec/pipeline_steps/javascript_spec.rb",
-     "spec/pipeline_steps/sass_spec.rb",
-     "spec/pipeline_steps/stylesheet_spec.rb",
-     "spec/rack_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/stylo_spec_helpers.rb"
-  ]
+  s.rubyforge_project = "stylo"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-      s.add_development_dependency(%q<sinatra>, [">= 0"])
-      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.21"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<haml>, [">= 3.0.21"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<haml>, [">= 3.0.21"])
-  end
+  s.add_development_dependency('cucumber')
+  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,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: stylo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: false
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
-- mwagg
+- Mike Wagg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +00:00
+date: 2010-11-19 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: cucumber
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,21 +33,23 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
+        - 2
+        - 1
         - 0
-        version: "0"
+        version: 2.1.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +63,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rack-test
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,47 +77,31 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: sinatra
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
-        - 0
         - 0
-        version: 3.0.0
+        version: "0"
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: haml
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 3
-        - 0
-        - 21
-        version: 3.0.21
-  type: :runtime
-  version_requirements: *id006
-description: Server side stylesheet combining for readonly hosting environments
-email: michael@guerillatactics.co.uk
+description: |-
+  A rack middleware which does css and javascript combining
+                        and minification for sites hosted in readonly filesystem environments
+                        such as heroku.com
+email: 
+- michael@guerillatactics.co.uk
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-- TODO
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
@@ -140,12 +126,8 @@ files:
 - features/fixtures/parent_with_child.js
 - features/fixtures/processed_sass_child.css
 - features/fixtures/processed_sass_which_uses_mixin.css
-- features/fixtures/sass_child.scss
-- features/fixtures/sass_mixins.scss
-- features/fixtures/sass_which_uses_mixin.scss
 - features/javascripts.feature
 - features/response_headers.feature
-- features/sass_integration.feature
 - features/step_definitions/stylo_steps.rb
 - features/stylesheets.feature
 - features/stylo_cannot_serve_asset.feature
@@ -158,30 +140,29 @@ files:
 - lib/stylo/pipeline_steps/caching.rb
 - lib/stylo/pipeline_steps/javascript.rb
 - lib/stylo/pipeline_steps/javascript_minifying.rb
-- lib/stylo/pipeline_steps/sass.rb
 - lib/stylo/pipeline_steps/stylesheet.rb
 - lib/stylo/processor.rb
 - lib/stylo/rack.rb
 - lib/stylo/railtie.rb
 - lib/stylo/response.rb
+- lib/stylo/version.rb
 - spec/asset_loader_spec.rb
 - spec/combiner_spec.rb
 - spec/pipeline_steps/caching_spec.rb
 - spec/pipeline_steps/javascript_minifying_spec.rb
 - spec/pipeline_steps/javascript_spec.rb
-- spec/pipeline_steps/sass_spec.rb
 - spec/pipeline_steps/stylesheet_spec.rb
 - spec/rack_spec.rb
 - spec/spec_helper.rb
 - spec/stylo_spec_helpers.rb
 - stylo.gemspec
 has_rdoc: true
-homepage: http://github.com/mwagg/stylo
+homepage: http://rubygems.org/gems/stylo
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -204,18 +185,39 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: stylo
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Server side stylesheet combining for readonly hosting environments
+summary: A javascript and css combining/minifying rack middleware
 test_files: 
+- features/fixtures.rb
+- features/fixtures/child-min.js
+- features/fixtures/child.css
+- features/fixtures/child.js
+- features/fixtures/grand_parent.css
+- 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
+- features/fixtures/parent_with_child.js
+- features/fixtures/processed_sass_child.css
+- features/fixtures/processed_sass_which_uses_mixin.css
+- features/javascripts.feature
+- features/response_headers.feature
+- features/step_definitions/stylo_steps.rb
+- features/stylesheets.feature
+- features/stylo_cannot_serve_asset.feature
+- features/support/env.rb
 - spec/asset_loader_spec.rb
 - spec/combiner_spec.rb
 - spec/pipeline_steps/caching_spec.rb
 - spec/pipeline_steps/javascript_minifying_spec.rb
 - spec/pipeline_steps/javascript_spec.rb
-- spec/pipeline_steps/sass_spec.rb
 - spec/pipeline_steps/stylesheet_spec.rb
 - spec/rack_spec.rb
 - spec/spec_helper.rb

data/features/fixtures/sass_child.scss

@@ -1,4 +0,0 @@
-$black: #000000;
-#child {
-    background: $black;
-}

data/features/fixtures/sass_mixins.scss

@@ -1,3 +0,0 @@
-@mixin black-border {
-    border: solid 1px #000000;
-}

data/features/fixtures/sass_which_uses_mixin.scss

@@ -1,6 +0,0 @@
-@import "sass_mixins.scss";
-
-#element {
-    @include black-border;
-    background: #FFFFFF;
-}

data/features/sass_integration.feature

@@ -1,13 +0,0 @@
-Feature: Sass integration
-
-  Scenario: Simple sass stylesheet serving
-    Given "sass_child.scss" is located at "stylesheets" in the asset location
-    When a request is made for "stylesheets/sass_child.css"
-    Then the response body should look like "processed_sass_child.css"
-
-  Scenario: Combined sass stylesheet serving
-    Given "sass_mixins.scss" is located at "stylesheets" in the asset location
-    And "sass_which_uses_mixin.scss" is located at "stylesheets" in the asset location
-    When a request is made for "stylesheets/sass_which_uses_mixin.css"
-    Then the response body should look like "processed_sass_which_uses_mixin.css"
-

data/lib/stylo/pipeline_steps/sass.rb

@@ -1,18 +0,0 @@
-require 'sass'
-
-module Stylo
-  module PipelineSteps
-    class Sass
-      def call(response)
-        return if response.has_content? || response.extension != '.css'
-        content = AssetLoader.load_content(response.path.gsub('.css', '.scss'))
-        return if content.nil?
-
-        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

data/spec/pipeline_steps/sass_spec.rb

@@ -1,95 +0,0 @@
-require 'spec_helper'
-
-describe Stylo::PipelineSteps::Sass do
-  let(:step) { Stylo::PipelineSteps::Sass.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(: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)
-
-        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(:processed_content) { "html { color: red; }" }
-        let(:sass_engine) { mock(:sass_engine) }
-        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)
-          ::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(/@import "(.*)";/).and_return(combiner)
-          combiner.should_receive(:process).with(base_path, stylesheet_content).and_return(combined_stylesheet_content)
-
-          step.call(response)
-        end
-
-        it "should run the combined content through sass" do
-          ::Sass::Engine.should_receive(:new).with(combined_stylesheet_content, {:syntax => :scss}).and_return(sass_engine)
-          sass_engine.should_receive(:render).and_return(processed_content)
-
-          step.call(response)
-        end
-
-        it "should set the body of the response to the combined stylesheet content" do
-          step.call(response)
-
-          response.body.should == processed_content
-        end
-
-        it "should set the content type to text/css" do
-          step.call(response)
-
-          response.headers['Content-Type'].should == 'text/css'
-        end
-      end
-    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)
-
-      step.call(response)
-
-      response.body.should == 'some-content'
-    end
-  end
-
-end