@@ -20,6 +20,3 @@ Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('README') rdoc.rdoc_files.include('lib/**/*.rb') end - -task :console do -end Rakefile @@ -1,36 +1,16 @@ require 'smurf/javascript' require 'smurf/stylesheet' -if Rails.respond_to?(:version) && Rails.version == "2.2.1" - # Support for Rails == 2.2.1 - module Smurf - - module JavaScriptSources - private - def joined_contents; Smurf::Javascript.new(super).minified; end - end # JavaScriptSources - - module StylesheetSources - private - def joined_contents; Smurf::Stylesheet.new(super).minified; end - end # StylesheetSources - - end # ActionView::Helpers::AssetTagHelper::AssetTag - ActionView::Helpers::AssetTagHelper::JavaScriptSources.send(:include, Smurf::JavaScriptSources) - ActionView::Helpers::AssetTagHelper::StylesheetSources.send(:include, Smurf::StylesheetSources) -else - # Support for everything else - module ActionView::Helpers::AssetTagHelper - private - def join_asset_file_contents_with_minification(files) - content = join_asset_file_contents_without_minification(files) - if !files.grep(%r[/javascripts]).empty? - content = Smurf::Javascript.new(content).minified - elsif !files.grep(%r[/stylesheets]).empty? - content = Smurf::Stylesheet.new(content).minified - end - content +module ActionView::Helpers::AssetTagHelper +private + def join_asset_file_contents_with_minification(files) + content = join_asset_file_contents_without_minification(files) + if !files.grep(%r[/javascripts]).empty? + content = Smurf::Javascript.new(content).minified + elsif !files.grep(%r[/stylesheets]).empty? + content = Smurf::Stylesheet.new(content).minified end - alias_method_chain :join_asset_file_contents, :minification - end # ActionView::Helpers::AssetTagHelper -# end + content + end + alias_method_chain :join_asset_file_contents, :minification +end # ActionView::Helpers::AssetTagHelper lib/smurf.rb @@ -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.2" + s.version = "1.0.3" s.authors = ["Justin Knowlden"] s.email = %w[gus@thumblemonks.com] s.homepage = "http://github.com/thumblemonks/smurf" smurf.gemspec ae7145e3f4728ddf675d79ec970806d24c7448a9 Justin Knowlden gus@gusg.us http://github.com/thumblemonks/smurf/commit/e08ca0f52a8adb9e557a023111a028775ee16740 e08ca0f52a8adb9e557a023111a028775ee16740 2009-10-12T22:23:42-07:00 2009-10-12T22:22:59-07:00 Bumped to 1.0.3 * No longer supporting rails 2.2.1 in the master branch 03fb05ff906bf6626dd9e9e4fbaa0e32eb7ebfb2 Justin Knowlden gus@gusg.us