stylo 0.6.0 → 0.7.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.6.0"
+    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

data/features/fixtures/child-min.js

@@ -0,0 +1,2 @@
+
+function child(){alert('child');}

data/features/javascripts.feature

@@ -24,3 +24,10 @@ Feature: Javascript serving
     And "child.js" is located at "javascripts" in the asset location
     When a request is made for "javascripts/grand_parent.js"
     Then the response body should look like "grand_parent_with_parent_with_child.js"
+
+  Scenario: Minifying javascript
+    Given javascript compression 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/step_definitions/stylo_steps.rb

@@ -40,3 +40,7 @@ end
 When /^css combining is disabled$/ do
   Stylo::Config.css_combining_enabled = false
 end
+
+Given /^javascript compression is enabled$/ do
+  Stylo::Config.javascript_minifying_enabled = true
+end

data/lib/jsmin.rb

@@ -0,0 +1,209 @@
+# jsmin.rb
+# Author: Mike Wagg
+# This work is a reworking of the ruby port of jsmin produced by
+# Uladzislau Latynski which itself was a translation of the original
+# C version published by Douglas Crockford. Permission is hereby granted to use the Ruby
+# version under the same conditions as the jsmin.c on which it is
+# based.
+#
+# /* jsmin.c
+#    2003-04-21
+#
+# Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# The Software shall be used for Good, not Evil.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'stringio'
+
+class JSMin
+  EOF = -1
+
+  def initialize(original)
+    @original = original
+  end
+
+  def minify
+    @output = ''
+
+    @in = StringIO.new(@original)
+    @out = StringIO.new(@output)
+
+    @the_a = ""
+    @the_b = ""
+
+    jsmin
+
+    @output
+  end
+
+  private
+
+  def is_alpha_numeric(c)
+    return false if !c || c == EOF
+
+    ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
+            (c >= 'A' && c <= 'Z') || c == '_' || c == '$' ||
+            c == '\\' || (c[0].class == String ? c[0].ord : c[0]) > 126)
+  end
+
+  # get -- return the next character from stdin. Watch out for lookahead. If
+  # the character is a control character, translate it to a space or linefeed.
+  def get_next_character()
+    c = @in.getc
+    return EOF if (!c)
+    c = c.chr
+    return c if (c >= " " || c == "\n" || c.unpack("c") == EOF)
+    return "\n" if (c == "\r")
+
+    " "
+  end
+
+  def peek()
+    lookahead_char = @in.getc
+    @in.ungetc(lookahead_char)
+    lookahead_char.chr
+  end
+
+  def my_next()
+    c = get_next_character
+    if (c == "/")
+      if (peek == "/")
+        while (true)
+          c = get_next_character
+          if (c <= "\n")
+            return c
+          end
+        end
+      end
+      if (peek == "*")
+        get_next_character
+        while (true)
+          case get_next_character
+            when "*"
+              if (peek == "/")
+                get_next_character
+                return " "
+              end
+            when EOF
+              raise "Unterminated comment"
+          end
+        end
+      end
+    end
+
+    c
+  end
+
+  def action(a)
+    if (a==1)
+      @out.write @the_a
+    end
+    if (a==1 || a==2)
+      @the_a = @the_b
+      if (@the_a == "\'" || @the_a == "\"")
+        while (true)
+          @out.write @the_a
+          @the_a = get_next_character
+          break if (@the_a == @the_b)
+          raise "Unterminated string literal" if (@the_a <= "\n")
+          if (@the_a == "\\")
+            @out.write @the_a
+            @the_a = get_next_character
+          end
+        end
+      end
+    end
+    if (a==1 || a==2 || a==3)
+      @the_b = my_next
+      if (@the_b == "/" && (@the_a == "(" || @the_a == "," || @the_a == "=" ||
+          @the_a == ":" || @the_a == "[" || @the_a == "!" ||
+          @the_a == "&" || @the_a == "|" || @the_a == "?" ||
+          @the_a == "{" || @the_a == "}" || @the_a == ";" ||
+          @the_a == "\n"))
+        @out.write @the_a
+        @out.write @the_b
+        while (true)
+          @the_a = get_next_character
+          if (@the_a == "/")
+            break
+          elsif (@the_a == "\\")
+            @out.write @the_a
+            @the_a = get_next_character
+          elsif (@the_a <= "\n")
+            raise "Unterminated RegExp Literal"
+          end
+          @out.write @the_a
+        end
+        @the_b = my_next
+      end
+    end
+  end
+
+  def jsmin
+    @the_a = "\n"
+    action(3)
+    while (@the_a != EOF)
+      case @the_a
+        when " "
+          if (is_alpha_numeric(@the_b))
+            action(1)
+          else
+            action(2)
+          end
+        when "\n"
+          case (@the_b)
+            when "{", "[", "(", "+", "-"
+              action(1)
+            when " "
+              action(3)
+            else
+              if (is_alpha_numeric(@the_b))
+                action(1)
+              else
+                action(2)
+              end
+          end
+        else
+          case (@the_b)
+            when " "
+              if (is_alpha_numeric(@the_a))
+                action(1)
+              else
+                action(3)
+              end
+            when "\n"
+              case (@the_a)
+                when "}", "]", ")", "+", "-", "\"", "\\", "'", '"'
+                  action(1)
+                else
+                  if (is_alpha_numeric(@the_a))
+                    action(1)
+                  else
+                    action(3)
+                  end
+              end
+            else
+              action(1)
+          end
+      end
+    end
+  end
+end

data/lib/stylo/config.rb

@@ -1,18 +1,20 @@
 module Stylo
   class Config
     class << self
-      attr_accessor :asset_location, :css_combining_enabled, :javascript_combining_enabled
+      attr_accessor :asset_location, :css_combining_enabled, :javascript_combining_enabled, :javascript_minifying_enabled
 
       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
       end
     end
 

data/lib/stylo/pipeline_steps/javascript_minifying.rb

@@ -0,0 +1,11 @@
+module Stylo
+  module PipelineSteps
+    class JavascriptMinifying
+      def call(response)
+        if Config.javascript_minifying_enabled and response.extension == '.js' and response.has_content?
+          response.set_body(JSMin.new(response.body).minify, :javascript)
+        end
+      end
+    end
+  end
+end

data/spec/pipeline_steps/javascript_minifying_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Stylo::PipelineSteps::JavascriptMinifying do
+  before(:each) do
+    Stylo::Config.javascript_minifying_enabled = true
+  end
+
+  let(:step) { Stylo::PipelineSteps::JavascriptMinifying.new }
+  let(:jsmin) { mock(:jsmin) }
+
+  describe "when the response body is not javascript" do
+    it "should not modify the response body" do
+      response = Stylo::Response.new('stylesheets/test.css')
+      original_body = "html{ color:#000; }"
+      response.set_body(original_body, :css)
+
+      step.call(response)
+
+      response.body.should == original_body
+    end
+  end
+
+  describe "when the response body is javascript" do
+    let(:response) { Stylo::Response.new('javascrips/test.js') }
+    let(:minified_javascript) { 'I am minified!' }
+
+    before(:each) do
+      response.set_body('some javascript', :javascript)
+
+      JSMin.stub(:new).with(response.body).and_return(jsmin)
+      jsmin.stub(:minify).and_return(minified_javascript)
+    end
+
+    it "should ask jsmin to minify the javascript" do
+      JSMin.should_receive(:new).with(response.body).and_return(jsmin)
+      jsmin.should_receive(:minify)
+
+      step.call(response)
+    end
+
+    it "should replace the response body with the minified text" do
+      step.call(response)
+
+      response.body.should == minified_javascript
+    end
+  end
+end

data/stylo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stylo}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mwagg"]
-  s.date = %q{2010-11-03}
+  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 = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "TODO",
      "cucumber.yml",
      "features/fixtures.rb",
+     "features/fixtures/child-min.js",
      "features/fixtures/child.css",
      "features/fixtures/child.js",
      "features/fixtures/grand_parent.css",
@@ -50,12 +51,14 @@ Gem::Specification.new do |s|
      "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",
@@ -65,6 +68,7 @@ Gem::Specification.new do |s|
      "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",
@@ -82,6 +86,7 @@ Gem::Specification.new do |s|
     "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",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stylo
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - mwagg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +00:00
+date: 2010-11-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - TODO
 - cucumber.yml
 - features/fixtures.rb
+- features/fixtures/child-min.js
 - features/fixtures/child.css
 - features/fixtures/child.js
 - features/fixtures/grand_parent.css
@@ -149,12 +150,14 @@ files:
 - 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
@@ -164,6 +167,7 @@ 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
@@ -209,6 +213,7 @@ 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