smurf 1.0.4 → 1.0.5

data/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem "rails", "3.0.3"
+
+group :test do
+  gem "riot", "0.12.0"
+end
+

data/README.markdown

@@ -12,7 +12,7 @@ Some cool things about Smurf, which also allude to the reasons I wrote it:
 * Other than installing it, you don't need to do anything
 * It just gets out of your way
 
-Smurf will work with any version of Rails `2.x`; including Rails `2.3.4` and `2.1.2`.
+Smurf will work with most versions of Rails `2.3.x` and above; including Rails `3.0.0`.
 
 ### JSmin
 
@@ -29,30 +29,23 @@ The following are the rules I applied, gathered from various perusals around the
 5. Remove comments between `/* ... */` - this could be a problem (esp. for CSS hacks)
 6. Remove spaces around `;`, `:`, and `,` characters
 7. Ensure whitespace between closing brackets and periods
+8. Preserves [conditional comments](http://msdn.microsoft.com/en-us/library/121hztk3(VS.94).aspx) in IE (ex: /*@cc_on document.write("this will only write in IE") @*/)
 
 ## Installation
 
-I like gems. So, I suggest you install Smurf as gem. It's pretty simple, assuming you have added Gem Cutter to your list of gem sources. If you have not, do this:
+You install Smurf as a gem:
 
-    sudo gem sources -a http://gemcutter.org
+    sudo gem install smurf
 
-Then, install Smurf as a gem:
+Because this latest version is intended to work with Rails 3 and above, you'll need to update your Gemfile ad add:
 
-    sudo gem install smurf
+    gem 'smurf'
 
 Then, wherever you define `javascript_include_tag` or `stylesheet_link_tag`, make sure to add the standard `:cache => true` or `:cache => 'some_bundle'` options.
 
 Also make sure to at least have this setting in your production.rb:
 
-    config.action_controller.perform_caching = true
-
-#### As a plugin
-
-If you really feel like it, go ahead and install Smurf as a plugin. This should do it:
-
-    ./script/plugin install git://github.com/thumblemonks/smurf.git
-
-Then do the other stuff for setting up Smurf in your Rails environment.
+    config.perform_caching = true
 
 ### Small suggestion
 
@@ -64,18 +57,16 @@ Then do the other stuff for setting up Smurf in your Rails environment.
 
 ## Testing
 
-If you want to test Smurf and you don't want to test with the latest version of Rails, then do something like the following (using 2.3.4 as an example):
-
-    rake RAILS_GEM_VERSION=2.3.4
+Simple:
 
-This is the mechanism I used for testing that Smurf works for all versions:
+    rake
 
-    rake && rake RAILS_GEM_VERSION=2.2.2 && rake RAILS_GEM_VERSION=2.1.2
+If you want to play around with different versions, you'll need to update the Gemfile version of rails. While Smurf itself should work as is with Rails 3 and Rails 2.3.x, the test setup is different enough between 3 and 2.3.x that I can't make guarantees. If you need a previous version, look for the appropriate tag in the source code.
 
 ## Meta
 
 Author: Justin Knowlden <gus@thumblemonks.com>
 
-Contributions from: Lance Ivy, Scott White, Daniel Schierbeck
+Contributions from: Lance Ivy, Scott White, Daniel Schierbeck, Paul Hepworth
 
 See MIT-LICENSE for licensing information

data/Rakefile

@@ -29,4 +29,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+end

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/smurf.rb

@@ -1,16 +1,16 @@
 require 'smurf/javascript'
 require 'smurf/stylesheet'
+require 'smurf/noop'
 
 module ActionView::Helpers::AssetTagHelper
 private
-  def join_asset_file_contents_with_minification(files)
-    content = join_asset_file_contents_without_minification(files)
-    if !files.grep(/javascripts.+\.js/).empty?
-      content = Smurf::Javascript.new(content).minified
-    elsif !files.grep(/stylesheets.+\.css/).empty?
-      content = Smurf::Stylesheet.new(content).minified
-    end
-    content
+  def minifiers
+    @@minifiers ||= [Smurf::Javascript, Smurf::Stylesheet, Smurf::Noop]
+  end
+
+  def join_asset_file_contents_with_minification(paths)
+    content = join_asset_file_contents_without_minification(paths)
+    minifiers.detect { |minifier| minifier.minifies?(paths) }.new(content).minified
   end
   alias_method_chain :join_asset_file_contents, :minification
 end # ActionView::Helpers::AssetTagHelper

data/lib/smurf/javascript.rb

@@ -38,6 +38,8 @@ require 'stringio'
 
 module Smurf
   class Javascript
+    def self.minifies?(paths) !paths.grep(%r[\.js(\?\d+)?$]).empty?; end
+
     EOF = -1
 
     @theA = ""
@@ -75,13 +77,14 @@ module Smurf
     end
 
     # Get the next character without getting it.
-    def peek()
-      lookaheadChar = @input.getc
-      @input.ungetc(lookaheadChar)
-      return lookaheadChar.chr
+    def peek(aheadCount=1)
+      history = []
+      aheadCount.times { history << @input.getc }
+      history.reverse.each { |chr| @input.ungetc(chr) }
+      return history.last.chr
     end
 
-    # mynext -- get the next character, excluding comments.
+    # mynext -- get the next character, excluding legitimate comments.
     # peek() is used to see if a '/' is followed by a '/' or '*'.
     def mynext()
       c = get
@@ -94,7 +97,7 @@ module Smurf
             end
           end
         end
-        if(peek == "*")
+        if(peek == "*" && peek(2) != "@") # not conditional comments
           get
           while(true)
             case get
@@ -149,7 +152,8 @@ module Smurf
                              @theA == "&" || @theA == "|" || @theA == "?" ||
                              @theA == "{" || @theA == "}" || @theA == ";" ||
                              @theA == "\n"))
-          @output.write @theA
+
+          @output.write(@theA) unless peek(2) == '@'
           @output.write @theB
           while (true)
             @theA = get

data/lib/smurf/noop.rb

@@ -0,0 +1,8 @@
+module Smurf
+  # This is a no-op; essentially a NullObject pattern implementation. Saves from implementing logic elsewhere
+  class Noop
+    def self.minifies?(paths) true; end
+    def initialize(content) @content = content; end
+    def minified; @content; end
+  end # Noop
+end # Smurf

data/lib/smurf/stylesheet.rb

@@ -1,5 +1,7 @@
 module Smurf
   class Stylesheet
+    def self.minifies?(paths) !paths.grep(%r[\.css(\?\d+)?$]).empty?; end
+
     def initialize(content)
       @content = content.nil? ? nil : minify(content)
     end

data/smurf.gemspec

@@ -1,73 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{smurf}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-11-17}
   s.description = %q{Rails plugin to automatically minify JS and CSS when their bundles get cached. Send in those patches!}
   s.email = %q{gus@thumblemonks.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "install.rb",
-     "lib/smurf.rb",
-     "lib/smurf/javascript.rb",
-     "lib/smurf/stylesheet.rb",
-     "rails/init.rb",
-     "smurf.gemspec",
-     "test/rails/app/controllers/application.rb",
-     "test/rails/config/boot.rb",
-     "test/rails/config/environment.rb",
-     "test/rails/config/environments/test.rb",
-     "test/rails/config/routes.rb",
-     "test/rails/public/javascripts/cache/expected.js",
-     "test/rails/public/javascripts/projwcss/jscss.css",
-     "test/rails/public/javascripts/testing.js",
-     "test/rails/public/stylesheets/bar.css",
-     "test/rails/public/stylesheets/cache/expected.css",
-     "test/rails/public/stylesheets/foo.css",
-     "test/smurf_test.rb",
-     "test/test_helper.rb",
-     "uninstall.rb"
+    "Gemfile",
+    "MIT-LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "lib/smurf.rb",
+    "lib/smurf/javascript.rb",
+    "lib/smurf/noop.rb",
+    "lib/smurf/stylesheet.rb",
+    "smurf.gemspec",
+    "test/integration_test.rb",
+    "test/javascript_test.rb",
+    "test/rails/app/controllers/application.rb",
+    "test/rails/config/application.rb",
+    "test/rails/config/boot.rb",
+    "test/rails/config/environment.rb",
+    "test/rails/config/environments/test.rb",
+    "test/rails/config/routes.rb",
+    "test/rails/public/javascripts/cache/expected.js",
+    "test/rails/public/javascripts/projwcss/jscss.css",
+    "test/rails/public/javascripts/testing.js",
+    "test/rails/public/stylesheets/bar.css",
+    "test/rails/public/stylesheets/cache/expected-basic.css",
+    "test/rails/public/stylesheets/foo.css",
+    "test/stylesheet_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/thumblemonks/smurf}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails plugin to automatically minify JS and CSS when their bundles get cached}
   s.test_files = [
+    "test/integration_test.rb",
+    "test/javascript_test.rb",
     "test/rails/app/controllers/application.rb",
-     "test/rails/config/boot.rb",
-     "test/rails/config/environment.rb",
-     "test/rails/config/environments/test.rb",
-     "test/rails/config/routes.rb",
-     "test/smurf_test.rb",
-     "test/test_helper.rb"
+    "test/rails/config/application.rb",
+    "test/rails/config/boot.rb",
+    "test/rails/config/environment.rb",
+    "test/rails/config/environments/test.rb",
+    "test/rails/config/routes.rb",
+    "test/stylesheet_test.rb",
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
       s.add_development_dependency(%q<riot>, [">= 0"])
     else
+      s.add_dependency(%q<rails>, ["= 3.0.3"])
       s.add_dependency(%q<riot>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rails>, ["= 3.0.3"])
     s.add_dependency(%q<riot>, [">= 0"])
   end
 end

data/test/integration_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+context "link tags when caching on" do
+  setup do
+    javascript_include_tag('testing', :cache => 'cache/actual')
+    stylesheet_link_tag('foo', 'bar', :cache => 'cache/actual-basic')
+    stylesheet_link_tag('foo', 'bar', '/javascripts/projwcss/jscss', :cache => 'cache/actual-plus')
+  end
+
+  should_have_same_contents('/javascripts/cache/expected.js', '/javascripts/cache/actual.js')
+  should_have_same_contents('/stylesheets/cache/expected-basic.css', '/stylesheets/cache/actual-basic.css')
+  should_have_same_contents('/stylesheets/cache/expected-plus.css', '/stylesheets/cache/actual-plus.css')
+end # link tags when caching on

data/test/javascript_test.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+context "Javascript minifier" do
+
+  should "want to minify files in the javascripts directory" do
+    Smurf::Javascript.minifies?(["a/b/javascripts/bar.js", "c/d/javascripts/baz.js"])
+  end
+
+  should "want to minify files in the stylesheets directory" do
+    Smurf::Javascript.minifies?(["a/b/stylesheets/bar.js", "c/d/stylesheets/baz.js"])
+  end
+
+  should "want to minify nothing but stylesheets" do
+    Smurf::Javascript.minifies?(["a/b/javascripts/bar.css", "c/d/javascripts/baz.css"])
+  end.not!
+
+  context "working with multi-line strings" do
+    setup do
+      input = StringIO.new()
+      input.puts("var foo='bar \\")
+      input.puts("  bar \\")
+      input.puts("  baz';")
+      input.rewind
+      input.read
+    end
+
+    should "not affect the string" do
+      Smurf::Javascript.new(topic).minified
+    end.equals("\nvar foo='bar   bar   baz';")
+  end # working with multi-line strings
+
+  context "working with conditional compilation on IE" do
+    setup do
+      input = StringIO.new()
+      input.puts("/*@cc_on(function(){document.write('this will write out to IE browsers)});@*/")
+      input.rewind
+      input.read
+    end
+
+    should "not affect the string" do
+      Smurf::Javascript.new(topic).minified
+    end.equals("/*@cc_on(function(){document.write('this will write out to IE browsers)});@*/")
+  end # working with conditional compilation on IE
+
+end # Javascript minifier

data/test/rails/config/application.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../boot', __FILE__)
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require "action_controller/railtie"
+require "action_view/railtie"
+
+# Auto-require default libraries and those for the current Rails environment.
+Bundler.require :default, Rails.env
+
+module Smurf
+  class Application < Rails::Application
+    config.consider_all_requests_local = true
+    config.session_store :cookie_store, {:key => "_smurf_session"}
+    config.secret_token = "i own you." * 3
+    
+    config.root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+  end
+end

data/test/rails/config/boot.rb

@@ -1,109 +1,9 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue "0.0.0"
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-        min_version = '1.1.1'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
+begin
+  require File.expand_path("../../../../.bundle/environment", __FILE__)
+rescue LoadError
+  require 'rubygems'
+  require 'bundler/setup'
+  Bundler.setup :default
 end
 
-# All that for this:
-Rails.boot!
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/rails/config/environment.rb

@@ -1,18 +1,5 @@
-# Specifies gem version of Rails to use when vendor/rails is not present
-unless defined? RAILS_GEM_VERSION
-  RAILS_GEM_VERSION = (ENV['RAILS_GEM_VERSION'] || '2.3.5')
-  STDOUT.puts "TESTING with RAILS_GEM_VERSION = #{RAILS_GEM_VERSION}"
-end
+# Load the rails application
+require File.expand_path('../application', __FILE__)
 
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-  # Don't need 'em
-  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
-
-  config.action_controller.session = {
-    :session_key => '_smurf_session',
-    :secret      => '731d6426b731d6426b731d6426b731d6426b731d6426b731d6426b731d6426b'
-  }
-end
+# Initialize the rails application
+Smurf::Application.initialize!

data/test/rails/config/environments/test.rb

@@ -1,7 +1,7 @@
-config.cache_classes = true
-config.whiny_nils = true
+Smurf::Application.configure do
+  config.active_support.deprecation = :stderr
+  config.cache_classes = true
+  config.whiny_nils = true
 
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = true # THIS IS IMPORTANT FOR THE TESTS
-
-config.action_mailer.delivery_method = :test
+  config.action_controller.perform_caching             = true # THIS IS IMPORTANT FOR THE TESTS
+end

data/test/rails/config/routes.rb

@@ -1,5 +1,3 @@
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/service.wsdl', :action => 'wsdl'
-  map.connect ':controller/:action/:id.:format'
-  map.connect ':controller/:action/:id'
+Smurf::Application.routes.draw do
+  match '/:controller(/:action(/:id))'
 end

data/test/rails/public/javascripts/cache/expected.js

@@ -0,0 +1,2 @@
+
+function foo(){puts"Hello, world"}

data/test/rails/public/stylesheets/cache/expected-basic.css

@@ -0,0 +1 @@
+html{color:#000;background:#FFF}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}li{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:''}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}input,textarea,select{*font-size:100%}legend{color:#000}del,ins{text-decoration:none}smurf{content:"pa pa"}.smurf :link li{color:blue}smurf #smurf,:smurf .smurf{color:black}smurfdom{papa:smurf}

data/test/stylesheet_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+context "Stylesheet minifier" do
+  setup { Smurf::Stylesheet }
+  helper(:minify) { |content| topic.new(content).minified }
+
+  should "want to minify files in the stylesheets directory" do
+    topic.minifies?(["a/b/stylesheets/bar.css", "c/d/stylesheets/baz.css?12344"])
+  end
+
+  should "want to minify files in the javascripts directory" do
+    topic.minifies?(["a/b/javascripts/bar.css?12345", "c/d/javascripts/baz.css"])
+  end
+
+  should "want to minify nothing but javascripts" do
+    topic.minifies?(["a/b/stylesheet/foo.js", "c/d/javascripts/baz.js"])
+  end.not!
+
+  context "minifying a non-existent pattern in a stylesheet" do
+    should("succeed for removing comments") do
+      minify("hi {  mom:  super-awesome; } ")
+    end.equals("hi{mom:super-awesome}")
+
+    should("succeed when no spaces to compress") do
+      minify("hi{mom:super-awesome}")
+    end.equals("hi{mom:super-awesome}")
+
+    # nothing outside, means nothing inside. they are complementary
+    should "succeed when no outside or inside blocks" do
+      minify("how-did:  this-happen;  typo: maybe;}")
+    end.equals("how-did: this-happen; typo: maybe}")
+
+    asserts "when no last semi-colon in block" do
+      minify("hi {  mom:  super-awesome } ")
+    end.equals("hi{mom:super-awesome}")
+
+    asserts("empty string when no content provided") { minify("") }.equals("")
+
+    asserts("nil even if nil provided") { minify(nil) }.nil
+  end # minifying a non-existent pattern in a stylesheet
+end # Stylesheet minifier

data/test/test_helper.rb

@@ -1,17 +1,20 @@
 ENV["RAILS_ENV"] = "test"
-ENV["RAILS_ROOT"] = File.expand_path(File.join(File.dirname(__FILE__), 'rails'))
-require File.expand_path(File.join(ENV["RAILS_ROOT"], 'config', 'environment'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'init'))
+require ::File.expand_path('../rails/config/environment',  __FILE__)
 
+# Rails.public_path = Rails.root + "test" + "rails" + "public"
 require 'riot'
+require 'ostruct'
+
+# require 'smurf'
+require ::File.expand_path('../../lib/smurf',  __FILE__)
 
 class AssetFile
   def self.base_path
-    @path ||= File.join(File.join(ENV["RAILS_ROOT"], 'public'))
+    @path ||= Rails.public_path
   end
 
   def self.read(relative_path)
-    File.read(File.join(base_path, relative_path))
+    File.read(base_path + relative_path)
   end
 end
 
@@ -23,12 +26,23 @@ class Riot::Context
   end
 end
 
-Riot::Situation.instance_eval do
+class Riot::Situation
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::AssetTagHelper
+
+  def controller; nil; end
+
+  def config
+    OpenStruct.new({
+      :assets_dir => Rails.public_path,
+      :javascripts_dir => Rails.public_path + "/javascripts",
+      :stylesheets_dir => Rails.public_path + "/stylesheets",
+      :perform_caching => true
+    })
+  end
 end
 
 at_exit do
-  artifacts = Dir.glob(File.join(AssetFile.base_path, '**', 'cache', 'actual.*'))
+  artifacts = Dir.glob(File.join(AssetFile.base_path, '**', 'cache', 'actual*.*'))
   FileUtils.rm(artifacts)
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -14,13 +14,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -05:00
+date: 2010-11-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: riot
-  prerelease: false
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: riot
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -28,7 +43,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id002
 description: Rails plugin to automatically minify JS and CSS when their bundles get cached. Send in those patches!
 email: gus@thumblemonks.com
 executables: []
@@ -38,19 +54,20 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- .gitignore
+- Gemfile
 - MIT-LICENSE
 - README.markdown
 - Rakefile
 - VERSION
-- init.rb
-- install.rb
 - lib/smurf.rb
 - lib/smurf/javascript.rb
+- lib/smurf/noop.rb
 - lib/smurf/stylesheet.rb
-- rails/init.rb
 - smurf.gemspec
+- test/integration_test.rb
+- test/javascript_test.rb
 - test/rails/app/controllers/application.rb
+- test/rails/config/application.rb
 - test/rails/config/boot.rb
 - test/rails/config/environment.rb
 - test/rails/config/environments/test.rb
@@ -59,21 +76,21 @@ files:
 - test/rails/public/javascripts/projwcss/jscss.css
 - test/rails/public/javascripts/testing.js
 - test/rails/public/stylesheets/bar.css
-- test/rails/public/stylesheets/cache/expected.css
+- test/rails/public/stylesheets/cache/expected-basic.css
 - test/rails/public/stylesheets/foo.css
-- test/smurf_test.rb
+- test/stylesheet_test.rb
 - test/test_helper.rb
-- uninstall.rb
 has_rdoc: true
 homepage: http://github.com/thumblemonks/smurf
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -81,6 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -90,15 +108,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails plugin to automatically minify JS and CSS when their bundles get cached
 test_files: 
+- test/integration_test.rb
+- test/javascript_test.rb
 - test/rails/app/controllers/application.rb
+- test/rails/config/application.rb
 - test/rails/config/boot.rb
 - test/rails/config/environment.rb
 - test/rails/config/environments/test.rb
 - test/rails/config/routes.rb
-- test/smurf_test.rb
+- test/stylesheet_test.rb
 - test/test_helper.rb

data/.gitignore

@@ -1,6 +0,0 @@
-log/*
-*.gem
-test/rails/log/*
-test/rails/db/*
-test/rails/public/*/cache/*
-pkg/*

data/init.rb

@@ -1 +0,0 @@
-require 'smurf'

data/rails/init.rb

@@ -1 +0,0 @@
-require 'smurf'

data/test/smurf_test.rb

@@ -1,56 +0,0 @@
-require 'test_helper'
-
-# Javascript
-
-context "link tags when caching on" do
-  setup do
-    javascript_include_tag('testing', :cache => 'cache/actual')
-    stylesheet_link_tag('foo', 'bar', '/javascripts/projwcss/jscss', :cache => 'cache/actual')
-  end
-
-  should_have_same_contents('javascripts/cache/expected.js', 'javascripts/cache/actual.js')
-  should_have_same_contents('stylesheets/cache/expected.css', 'stylesheets/cache/actual.css')
-end # link tags when caching on
-
-context "minifying multi-line strings in javascript" do
-  setup do
-    input = StringIO.new()
-    input.puts("var foo='bar \\")
-    input.puts("  bar \\")
-    input.puts("  baz';")
-    input.rewind
-    input.read
-  end
-
-  should "not affect the string" do
-    Smurf::Javascript.new(topic).minified
-  end.equals("\nvar foo='bar   bar   baz';")
-end
-
-context "minifying a non-existent pattern in a stylesheet" do
-  # Thanks to someone named Niko for finding this
-  should "succeed for removing comments" do
-    Smurf::Stylesheet.new("hi {  mom:  super-awesome; } ").minified
-  end.equals("hi{mom:super-awesome}")
-
-  should "succeed when no spaces to compress" do
-    Smurf::Stylesheet.new("hi{mom:super-awesome}").minified
-  end.equals("hi{mom:super-awesome}")
-
-  # nothing outside, means nothing inside. they are complementary
-  should "succeed when no outside or inside blocks" do
-    Smurf::Stylesheet.new("how-did:  this-happen;  typo: maybe;}").minified
-  end.equals("how-did: this-happen; typo: maybe}")
-
-  asserts "when no last semi-colon in block" do
-    Smurf::Stylesheet.new("hi {  mom:  super-awesome } ").minified
-  end.equals("hi{mom:super-awesome}")
-
-  asserts "empty string when no content provided" do
-    Smurf::Stylesheet.new("").minified
-  end.equals("")
-
-  asserts "nil even if nil provided" do
-    Smurf::Stylesheet.new(nil).minified
-  end.nil
-end # minifying a non-existent pattern in a stylesheet