smurf 1.0.0 → 1.0.1

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.2.2`.
+Smurf will work with any version of Rails `2.x`; including Rails `2.3.4` and `2.1.2`.
 
 ### JSmin
 
@@ -32,7 +32,13 @@ The following are the rules I applied, gathered from various perusals around the
 
 ## Installation
 
-    ./script/plugin install git://github.com/thumblemonks/smurf.git
+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:
+
+    sudo gem sources -a http://gemcutter.org
+
+Then, install Smurf as a gem:
+
+    sudo gem install 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.
 
@@ -40,6 +46,14 @@ 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.
+
 ### Small suggestion
 
 [bcarpenter](http://github.com/bcarpenter) reminded all of us that Rails will generate real files if you set `config.action_controller.perform_caching` to `true`. If you happen to do this while developing your fantastic Rails app you may also accidentally commit them to your development repository. This is not what you want as it can send you and your awesome developer friends down the wrong rabbit hole ... and then when you figure out the problem you may be understandably and misguidedly pissed at Smurf :)
@@ -50,13 +64,13 @@ Also make sure to at least have this setting in your production.rb:
 
 ## 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.2.2 as an example):
+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.2.2
+    rake RAILS_GEM_VERSION=2.3.4
 
 This is the mechanism I used for testing that Smurf works for all versions:
 
-    rake && rake RAILS_GEM_VERSION=2.2.2
+    rake && rake RAILS_GEM_VERSION=2.2.2 && rake RAILS_GEM_VERSION=2.1.2
 
 ## Meta
 

data/Rakefile

@@ -7,7 +7,7 @@ task :default => :test
 
 desc 'Test the load_model plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+  t.libs += ['lib', 'test']
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end

data/lib/smurf.rb

@@ -1,7 +1,7 @@
 require 'smurf/javascript'
 require 'smurf/stylesheet'
 
-if Rails.version =~ /^2\.2\./
+if Rails.respond_to?(:version) && Rails.version =~ /^2\.2\./
   # Support for Rails >= 2.2.x
   module Smurf
 
@@ -16,10 +16,8 @@ if Rails.version =~ /^2\.2\./
     end # StylesheetSources
 
   end # ActionView::Helpers::AssetTagHelper::AssetTag
-  ActionView::Helpers::AssetTagHelper::JavaScriptSources.send(
-    :include, Smurf::JavaScriptSources)
-  ActionView::Helpers::AssetTagHelper::StylesheetSources.send(
-    :include, Smurf::StylesheetSources)
+  ActionView::Helpers::AssetTagHelper::JavaScriptSources.send(:include, Smurf::JavaScriptSources)
+  ActionView::Helpers::AssetTagHelper::StylesheetSources.send(:include, Smurf::StylesheetSources)
 else
   # Support for Rails <= 2.1.x
   module ActionView::Helpers::AssetTagHelper

data/smurf.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name = "smurf"
   s.summary = "Rails plugin to automatically minify JS and CSS when their bundles get cached"
   s.description = "Rails plugin to automatically minify JS and CSS when their bundles get cached. Send in those patches!"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
   s.authors = ["Justin Knowlden"]
   s.email = %w[gus@thumblemonks.com]
   s.homepage = "http://github.com/thumblemonks/smurf"
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   s.test_files = %w[
     test/rails/app/controllers/application.rb
     test/rails/config/boot.rb
-    test/rails/config/database.yml
     test/rails/config/environment.rb
     test/rails/config/environments/test.rb
     test/rails/config/routes.rb

data/test/rails/config/environment.rb

@@ -1,21 +1,15 @@
-# Be sure to restart your server when you modify this file
-
-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
 # 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.2')
+  RAILS_GEM_VERSION = (ENV['RAILS_GEM_VERSION'] || '2.3.4')
+  STDOUT.puts "TESTING with RAILS_GEM_VERSION = #{RAILS_GEM_VERSION}"
 end
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
-  config.gem 'thoughtbot-shoulda', :lib => 'shoulda/rails',
-    :source => 'http://gems.github.com'
-  config.gem 'sqlite3-ruby', :lib => 'sqlite3'
+  # Don't need 'em
+  config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
   config.action_controller.session = {
     :session_key => '_smurf_session',

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

@@ -1,19 +1,7 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
 config.cache_classes = true
-
-# Log error messages when you accidentally call methods on nil.
 config.whiny_nils = true
 
-# Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+config.action_controller.perform_caching             = true # THIS IS IMPORTANT FOR THE TESTS
 
-# Tell ActionMailer not to deliver emails to the real world.
-# The :test delivery method accumulates sent emails in the
-# ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test

data/test/smurf_test.rb

@@ -1,82 +1,56 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require 'test_helper'
 
-class SmurfTest < Test::Unit::TestCase
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::AssetTagHelper
+# Javascript
 
-  # Javascript
-
-  context "when caching on for javascript" do
-    setup do
-      ActionController::Base.stubs(:perform_caching).returns(true)
-      javascript_include_tag('testing.js', :cache => 'cache/actual')
-    end
-
-    should_have_same_contents('javascripts/cache/expected.js',
-      'javascripts/cache/actual.js')
-  end # when caching on for javascript
-
-  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
-      @content = input.read
-    end
-
-    should "not affect the string" do
-      expected = "\n" + @content.gsub(/\\?\r?\n/, '')
-      assert_equal expected, Smurf::Javascript.new(@content).minified
-    end
+context "link tags when caching on" do
+  setup do
+    javascript_include_tag('testing', :cache => 'cache/actual')
+    stylesheet_link_tag('foo', 'bar', :cache => 'cache/actual')
   end
 
-  # Stylesheet
-
-  context "when caching on for stylesheets" do
-    setup do
-      ActionController::Base.stubs(:perform_caching).returns(true)
-      stylesheet_link_tag('foo', 'bar', :cache => 'cache/actual')
-    end
-
-    should_have_same_contents('stylesheets/cache/expected.css',
-      'stylesheets/cache/actual.css')
-  end # when caching on for stylesheets
-
-  context "minifying a non-existent pattern in a stylesheet" do
-    setup {@himom = "hi{mom:super-awesome}"}
-
-    # Thanks to someone named Niko for finding this
-    should "succeed for removing comments" do
-      actual = "hi {  mom:  super-awesome; } "
-      assert_equal @himom, Smurf::Stylesheet.new(actual).minified
-    end
-
-    should "succeed when no spaces to compress" do
-      actual = @himom
-      assert_equal @himom, Smurf::Stylesheet.new(actual).minified
-    end
-
-    should "succeed when no outside or inside blocks" do
-      # nothing outside, means nothing inside. they are complementary
-      actual = "how-did:  this-happen;  typo: maybe;}"
-      expected = "how-did: this-happen; typo: maybe}"
-      assert_equal expected, Smurf::Stylesheet.new(actual).minified
-    end
-
-    should "succeed when no last semi-colon in block" do
-      actual = "hi {  mom:  super-awesome } "
-      assert_equal @himom, Smurf::Stylesheet.new(actual).minified
-    end
-
-    should "succeed across all parsers when no content provided" do
-      actual = ""
-      assert_equal "", Smurf::Stylesheet.new(actual).minified
-    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 "succeed if nil provided" do
-      assert_nil Smurf::Stylesheet.new(nil).minified
-    end
-  end # minifying a non-existent pattern
+  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

data/test/test_helper.rb

@@ -3,30 +3,32 @@ 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 'test_help'
-require 'ruby-debug'
+require 'riot'
 
-class Test::Unit::TestCase
-
-  def teardown
-    artifacts = Dir.glob(File.join(asset_path, '**', 'cache', 'actual.*'))
-    FileUtils.rm(artifacts)
-  end
-  
-  def self.should_have_same_contents(expected_path, actual_path)
-    should "have the same file contents as #{expected_path}" do
-      expected = read_asset_file(expected_path)
-      actual = read_asset_file(actual_path)
-      assert_equal expected, actual
-    end
+class AssetFile
+  def self.base_path
+    @path ||= File.join(File.join(ENV["RAILS_ROOT"], 'public'))
   end
 
-private
-  def asset_path
-    File.join(File.join(ENV["RAILS_ROOT"], 'public'))
+  def self.read(relative_path)
+    File.read(File.join(base_path, relative_path))
   end
+end
 
-  def read_asset_file(relative_path)
-    File.read(File.join(asset_path, relative_path))
+class Riot::Context
+  def should_have_same_contents(expected_path, actual_path)
+    asserts "#{actual_path} has the same file contents as #{expected_path}" do
+      AssetFile.read(actual_path)
+    end.equals(AssetFile.read(expected_path))
   end
 end
+
+Riot::Situation.instance_eval do
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::AssetTagHelper
+end
+
+at_exit do
+  artifacts = Dir.glob(File.join(AssetFile.base_path, '**', 'cache', 'actual.*'))
+  FileUtils.rm(artifacts)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smurf
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -05:00
+date: 2009-10-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -66,7 +66,6 @@ summary: Rails plugin to automatically minify JS and CSS when their bundles get
 test_files: 
 - test/rails/app/controllers/application.rb
 - test/rails/config/boot.rb
-- test/rails/config/database.yml
 - test/rails/config/environment.rb
 - test/rails/config/environments/test.rb
 - test/rails/config/routes.rb

data/test/rails/config/database.yml

@@ -1,3 +0,0 @@
-test:
-  adapter: sqlite3
-  dbfile: ":memory:" # db/test.db