stylo 0.5 → 0.5.1

data/Rakefile

@@ -16,8 +16,9 @@ begin
     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.5"
+    gem.version = "0.5.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/features/javascripts.feature

@@ -5,6 +5,13 @@ Feature: Javascript serving
     When a request is made for "javascripts/child.js"
     Then the response body should look like "child.js"
 
+  Scenario: Simple javascript combining
+    Given "parent.js" is located at "javascripts" in the asset location
+    And "child.js" is located at "javascripts" in the asset location
+    And javascript combining is disabled
+    When a request is made for "javascripts/parent.js"
+    Then the response body should look like "parent.js"
+
   Scenario: Simple javascript combining
     Given "parent.js" is located at "javascripts" in the asset location
     And "child.js" is located at "javascripts" in the asset location

data/features/step_definitions/stylo_steps.rb

@@ -21,4 +21,12 @@ 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.")
+end
+
+When /^javascript combining is disabled$/ do
+  Stylo::Config.javascript_combining_enabled = false
+end
+
+When /^css combining is disabled$/ do
+  Stylo::Config.css_combining_enabled = false
 end

data/features/stylesheets.feature

@@ -5,6 +5,13 @@ Feature: Stylesheet serving
     When a request is made for "stylesheets/child.css"
     Then the response body should look like "child.css"
 
+  Scenario: Combining does not take place when it is disabled
+    Given "parent.css" is located at "stylesheets" in the asset location
+    And "child.css" is located at "stylesheets" in the asset location
+    And css combining is disabled
+    When a request is made for "stylesheets/parent.css"
+    Then the response body should look like "parent.css"
+
   Scenario: Simple stylesheet combining
     Given "parent.css" is located at "stylesheets" in the asset location
     And "child.css" is located at "stylesheets" in the asset location

data/features/support/env.rb

@@ -22,3 +22,7 @@ World do
   reset_paths
 end
 
+Before do
+  Stylo::Config.reset_to_default
+end
+

data/lib/stylo/config.rb

@@ -1,7 +1,7 @@
 module Stylo
   class Config
     class << self
-      attr_accessor :asset_location
+      attr_accessor :asset_location, :css_combining_enabled, :javascript_combining_enabled
 
       def pipeline
         [Stylo::PipelineSteps::Stylesheet.new,
@@ -9,6 +9,13 @@ module Stylo
          Stylo::PipelineSteps::Sass.new,
          Stylo::PipelineSteps::Caching.new]
       end
+
+      def reset_to_default
+        self.css_combining_enabled = true
+        self.javascript_combining_enabled = true
+      end
     end
+
+    reset_to_default
   end
 end

data/lib/stylo/pipeline_steps/javascript.rb

@@ -6,9 +6,12 @@ module Stylo
       def call(response)
         return if response.has_content? || response.extension != '.js'
         return unless content = AssetLoader.load_content(response.path)
-        combined_content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
 
-        response.set_body combined_content, :javascript
+        if Config.javascript_combining_enabled
+          content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
+        end
+
+        response.set_body content, :javascript
       end
     end
   end

data/lib/stylo/pipeline_steps/stylesheet.rb

@@ -6,9 +6,12 @@ module Stylo
       def call(response)
         return if response.has_content? || response.extension != '.css'
         return unless content = AssetLoader.load_content(response.path)
-        combined_content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
 
-        response.set_body combined_content, :css
+        if Config.css_combining_enabled
+          content = Combiner.new(File.dirname(response.path), REQUIRE_PATTERN).process(content)
+        end
+
+        response.set_body content, :css
       end
     end
   end

data/spec/pipeline_steps/javascript_spec.rb

@@ -49,17 +49,35 @@ describe Stylo::PipelineSteps::Javascript do
           combiner.stub(:process).with(javascript_content).and_return(combined_javascript_content)
         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)
+        describe "and combining is enabled" do
+          before(:each) do
+            Stylo::Config.javascript_combining_enabled = true
+          end
 
-          step.call(response)
+          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)
+
+            step.call(response)
+          end
+
+          it "should set the body of the response to the combined javascript content" do
+            step.call(response)
+
+            response.body.should == combined_javascript_content
+          end
         end
 
-        it "should set the body of the response to the combined javascript content" do
-          step.call(response)
+        describe "and combining is disabled" do
+          before(:each) do
+            Stylo::Config.javascript_combining_enabled = false
+          end
+
+          it "should set the body of the response to the javascript content" do
+            step.call(response)
 
-          response.body.should == combined_javascript_content
+            response.body.should == javascript_content
+          end
         end
 
         it "should set the content type to text/javascript" do

data/spec/pipeline_steps/stylesheet_spec.rb

@@ -49,17 +49,36 @@ describe Stylo::PipelineSteps::Stylesheet do
           combiner.stub(:process).with(stylesheet_content).and_return(combined_stylesheet_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)
+        describe "and combining is enabled" do
+          before(:each) do
+            Stylo::Config.css_combining_enabled = true
+          end
 
-          step.call(response)
+          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)
+
+            step.call(response)
+          end
+
+          it "should set the body of the response to the combined stylesheet content" do
+            step.call(response)
+
+            response.body.should == combined_stylesheet_content
+          end
         end
 
-        it "should set the body of the response to the combined stylesheet content" do
-          step.call(response)
+        describe "and combining is disabled" do
+          before(:each) do
+            Stylo::Config.css_combining_enabled = false
+          end
+
+          it "should set the body of the response to the stylesheet content" do
+            step.call(response)
+
+            response.body.should == stylesheet_content
+          end
 
-          response.body.should == combined_stylesheet_content
         end
 
         it "should set the content type to text/css" do

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ RSpec.configure do |config|
 
   config.before(:each) do
     reset_paths
+    Stylo::Config.reset_to_default
   end
 end
 

data/stylo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stylo}
-  s.version = "0.5"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mwagg"]
@@ -97,12 +97,14 @@ Gem::Specification.new do |s|
       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
@@ -110,6 +112,7 @@ Gem::Specification.new do |s|
     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
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylo
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  version: "0.5"
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - mwagg
@@ -74,9 +75,25 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,7 +105,7 @@ dependencies:
         - 21
         version: 3.0.21
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 description: Server side stylesheet combining for readonly hosting environments
 email: michael@guerillatactics.co.uk
 executables: []