rails_asset_packager 0.1.1 → 0.1.2

data/TODO

@@ -0,0 +1,11 @@
+TODO
+====
+* FEATURE: Add means to track which files that have been uploaded to S3 have been
+  modified to prevent uploading all assets every time you call 
+  'rake asset:cache:production.'
+* BUG: Make it so that the asset:cache rake tasks execute properly when called
+  from other rake tasks outside rails_asset_packager rake file.
+* FEATURE: Add capability to ignore assets already included in packaged assets
+  when uploading to S3.
+* BUG: Fix inability to use the two helpers, stylesheet_link_merged and
+  javascript_include_merged. Start by fixing test suite.

data/lib/rails_asset_packager/version.rb

@@ -1,3 +1,3 @@
 module RailsAssetPackager
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/asset_package_helper_development_test.rb

@@ -1,21 +1,9 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
 ENV['RAILS_ENV'] = "development"
-require File.dirname(__FILE__) + '/../../../../config/environment'
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
-
-require 'action_controller/test_process'
 
-ActionController::Base.logger = nil
-ActionController::Routing::Routes.reload rescue nil
+$:.unshift(File.dirname(__FILE__))
+require 'test_helper'
 
-class AssetPackageHelperDevelopmentTest < Test::Unit::TestCase
-  include ActionController::Assertions::DomAssertions
-  include ActionController::TestCase::Assertions
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::AssetTagHelper
+class AssetPackageHelperDevelopmentTest < ActionView::TestCase
   include RailsAssetPackager::AssetPackageHelper
 
   def setup
@@ -23,49 +11,43 @@ class AssetPackageHelperDevelopmentTest < Test::Unit::TestCase
     RailsAssetPackager::AssetPackage.asset_packages_yml = YAML.load_file("#{Rails.root}/vendor/plugins/asset_packager/test/asset_packages.yml")
 
     RailsAssetPackager::AssetPackage.any_instance.stubs(:log)
-
-    @controller = Class.new do
-      def request
-        @request ||= ActionController::TestRequest.new
-      end
-    end.new
   end
-  
+
   def build_js_expected_string(*sources)
     sources.map {|s| javascript_include_tag(s) }.join("\n")
   end
-    
+
   def build_css_expected_string(*sources)
     sources.map {|s| stylesheet_link_tag(s) }.join("\n")
   end
-    
+
   def test_js_basic
     assert_dom_equal build_js_expected_string("prototype"),
       javascript_include_merged("prototype")
   end
 
   def test_js_multiple_packages
-    assert_dom_equal build_js_expected_string("prototype", "foo"), 
+    assert_dom_equal build_js_expected_string("prototype", "foo"),
       javascript_include_merged("prototype", "foo")
   end
-  
+
   def test_js_unpackaged_file
-    assert_dom_equal build_js_expected_string("prototype", "foo", "not_part_of_a_package"), 
+    assert_dom_equal build_js_expected_string("prototype", "foo", "not_part_of_a_package"),
       javascript_include_merged("prototype", "foo", "not_part_of_a_package")
   end
-  
+
   def test_js_multiple_from_same_package
-    assert_dom_equal build_js_expected_string("prototype", "effects", "controls", "not_part_of_a_package", "foo"), 
+    assert_dom_equal build_js_expected_string("prototype", "effects", "controls", "not_part_of_a_package", "foo"),
       javascript_include_merged("prototype", "effects", "controls", "not_part_of_a_package", "foo")
   end
 
   def test_js_by_package_name
-    assert_dom_equal build_js_expected_string("prototype", "effects", "controls", "dragdrop"), 
+    assert_dom_equal build_js_expected_string("prototype", "effects", "controls", "dragdrop"),
       javascript_include_merged(:base)
   end
-  
+
   def test_js_multiple_package_names
-    assert_dom_equal build_js_expected_string("prototype", "effects", "controls", "dragdrop", "foo", "bar", "application"), 
+    assert_dom_equal build_js_expected_string("prototype", "effects", "controls", "dragdrop", "foo", "bar", "application"),
       javascript_include_merged(:base, :secondary)
   end
 
@@ -75,28 +57,28 @@ class AssetPackageHelperDevelopmentTest < Test::Unit::TestCase
   end
 
   def test_css_multiple_packages
-    assert_dom_equal build_css_expected_string("screen", "foo", "subdir/bar"), 
+    assert_dom_equal build_css_expected_string("screen", "foo", "subdir/bar"),
       stylesheet_link_merged("screen", "foo", "subdir/bar")
   end
-  
+
   def test_css_unpackaged_file
-    assert_dom_equal build_css_expected_string("screen", "foo", "not_part_of_a_package", "subdir/bar"), 
+    assert_dom_equal build_css_expected_string("screen", "foo", "not_part_of_a_package", "subdir/bar"),
       stylesheet_link_merged("screen", "foo", "not_part_of_a_package", "subdir/bar")
   end
-  
+
   def test_css_multiple_from_same_package
-    assert_dom_equal build_css_expected_string("screen", "header", "not_part_of_a_package", "foo", "bar", "subdir/foo", "subdir/bar"), 
+    assert_dom_equal build_css_expected_string("screen", "header", "not_part_of_a_package", "foo", "bar", "subdir/foo", "subdir/bar"),
       stylesheet_link_merged("screen", "header", "not_part_of_a_package", "foo", "bar", "subdir/foo", "subdir/bar")
   end
 
   def test_css_by_package_name
-    assert_dom_equal build_css_expected_string("screen", "header"), 
+    assert_dom_equal build_css_expected_string("screen", "header"),
       stylesheet_link_merged(:base)
   end
-  
+
   def test_css_multiple_package_names
-    assert_dom_equal build_css_expected_string("screen", "header", "foo", "bar", "subdir/foo", "subdir/bar"), 
+    assert_dom_equal build_css_expected_string("screen", "header", "foo", "bar", "subdir/foo", "subdir/bar"),
       stylesheet_link_merged(:base, :secondary, "subdir/styles")
   end
-  
+
 end

data/test/asset_package_helper_production_test.rb

@@ -1,20 +1,9 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+ENV['RAILS_ENV'] = "production"
 
-require File.dirname(__FILE__) + '/../../../../config/environment'
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
+$:.unshift(File.dirname(__FILE__))
+require 'test_helper'
 
-require 'action_controller/test_process'
-
-ActionController::Base.logger = nil
-ActionController::Routing::Routes.reload rescue nil
-
-class AssetPackageHelperProductionTest < Test::Unit::TestCase
-  include ActionController::Assertions::DomAssertions
-  include ActionController::TestCase::Assertions
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::AssetTagHelper
+class AssetPackageHelperProductionTest < ActionView::TestCase
   include RailsAssetPackager::AssetPackageHelper
 
   cattr_accessor :packages_built
@@ -26,12 +15,6 @@ class AssetPackageHelperProductionTest < Test::Unit::TestCase
     RailsAssetPackager::AssetPackage.any_instance.stubs(:log)
     self.stubs(:should_merge?).returns(true)
 
-    @controller = Class.new do
-      def request
-        @request ||= ActionController::TestRequest.new
-      end
-    end.new
-
     build_packages_once
   end
 
@@ -41,11 +24,11 @@ class AssetPackageHelperProductionTest < Test::Unit::TestCase
       @@packages_built = true
     end
   end
-  
+
   def build_js_expected_string(*sources)
     sources.map {|s| javascript_include_tag(s) }.join("\n")
   end
-    
+
   def build_css_expected_string(*sources)
     sources.map {|s| stylesheet_link_tag(s) }.join("\n")
   end
@@ -60,39 +43,39 @@ class AssetPackageHelperProductionTest < Test::Unit::TestCase
     current_file1 = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "prototype").current_file
     current_file2 = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "foo").current_file
 
-    assert_dom_equal build_js_expected_string(current_file1, current_file2), 
+    assert_dom_equal build_js_expected_string(current_file1, current_file2),
       javascript_include_merged("prototype", "foo")
   end
-  
+
   def test_js_unpackaged_file
     current_file1 = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "prototype").current_file
     current_file2 = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "foo").current_file
-    
-    assert_dom_equal build_js_expected_string(current_file1, current_file2, "not_part_of_a_package"), 
+
+    assert_dom_equal build_js_expected_string(current_file1, current_file2, "not_part_of_a_package"),
       javascript_include_merged("prototype", "foo", "not_part_of_a_package")
   end
-  
+
   def test_js_multiple_from_same_package
     current_file1 = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "prototype").current_file
     current_file2 = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "foo").current_file
 
-    assert_dom_equal build_js_expected_string(current_file1, "not_part_of_a_package", current_file2), 
+    assert_dom_equal build_js_expected_string(current_file1, "not_part_of_a_package", current_file2),
       javascript_include_merged("prototype", "effects", "controls", "not_part_of_a_package", "foo")
   end
-  
+
   def test_js_by_package_name
     package_name = RailsAssetPackager::AssetPackage.find_by_target("javascripts", "base").current_file
-    assert_dom_equal build_js_expected_string(package_name), 
+    assert_dom_equal build_js_expected_string(package_name),
       javascript_include_merged(:base)
   end
-  
+
   def test_js_multiple_package_names
     package_name1 = RailsAssetPackager::AssetPackage.find_by_target("javascripts", "base").current_file
     package_name2 = RailsAssetPackager::AssetPackage.find_by_target("javascripts", "secondary").current_file
-    assert_dom_equal build_js_expected_string(package_name1, package_name2), 
+    assert_dom_equal build_js_expected_string(package_name1, package_name2),
       javascript_include_merged(:base, :secondary)
   end
-  
+
   def test_css_basic
     current_file = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "screen").current_file
     assert_dom_equal build_css_expected_string(current_file),
@@ -104,39 +87,39 @@ class AssetPackageHelperProductionTest < Test::Unit::TestCase
     current_file2 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "foo").current_file
     current_file3 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "subdir/bar").current_file
 
-    assert_dom_equal build_css_expected_string(current_file1, current_file2, current_file3), 
+    assert_dom_equal build_css_expected_string(current_file1, current_file2, current_file3),
       stylesheet_link_merged("screen", "foo", "subdir/bar")
   end
-  
+
   def test_css_unpackaged_file
     current_file1 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "screen").current_file
     current_file2 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "foo").current_file
-    
-    assert_dom_equal build_css_expected_string(current_file1, current_file2, "not_part_of_a_package"), 
+
+    assert_dom_equal build_css_expected_string(current_file1, current_file2, "not_part_of_a_package"),
       stylesheet_link_merged("screen", "foo", "not_part_of_a_package")
   end
-  
+
   def test_css_multiple_from_same_package
     current_file1 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "screen").current_file
     current_file2 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "foo").current_file
     current_file3 = RailsAssetPackager::AssetPackage.find_by_source("stylesheets", "subdir/bar").current_file
 
-    assert_dom_equal build_css_expected_string(current_file1, "not_part_of_a_package", current_file2, current_file3), 
+    assert_dom_equal build_css_expected_string(current_file1, "not_part_of_a_package", current_file2, current_file3),
       stylesheet_link_merged("screen", "header", "not_part_of_a_package", "foo", "bar", "subdir/foo", "subdir/bar")
   end
-  
+
   def test_css_by_package_name
     package_name = RailsAssetPackager::AssetPackage.find_by_target("stylesheets", "base").current_file
-    assert_dom_equal build_css_expected_string(package_name), 
+    assert_dom_equal build_css_expected_string(package_name),
       stylesheet_link_merged(:base)
   end
-  
+
   def test_css_multiple_package_names
     package_name1 = RailsAssetPackager::AssetPackage.find_by_target("stylesheets", "base").current_file
     package_name2 = RailsAssetPackager::AssetPackage.find_by_target("stylesheets", "secondary").current_file
     package_name3 = RailsAssetPackager::AssetPackage.find_by_target("stylesheets", "subdir/styles").current_file
-    assert_dom_equal build_css_expected_string(package_name1, package_name2, package_name3), 
+    assert_dom_equal build_css_expected_string(package_name1, package_name2, package_name3),
       stylesheet_link_merged(:base, :secondary, "subdir/styles")
   end
-  
+
 end

data/test/asset_packager_test.rb

@@ -1,10 +1,9 @@
-require File.dirname(__FILE__) + '/../../../../config/environment'
-require 'test/unit'
-require 'mocha'
+$:.unshift(File.dirname(__FILE__))
+require 'test_helper'
 
 class AssetPackagerTest < Test::Unit::TestCase
   include RailsAssetPackager
-  
+
   def setup
     RailsAssetPackager::AssetPackage.asset_base_path    = "#{Rails.root}/vendor/plugins/asset_packager/test/assets"
     RailsAssetPackager::AssetPackage.asset_packages_yml = YAML.load_file("#{Rails.root}/vendor/plugins/asset_packager/test/asset_packages.yml")
@@ -12,36 +11,36 @@ class AssetPackagerTest < Test::Unit::TestCase
     RailsAssetPackager::AssetPackage.any_instance.stubs(:log)
     RailsAssetPackager::AssetPackage.build_all
   end
-  
+
   def teardown
     RailsAssetPackager::AssetPackage.delete_all
   end
-  
+
   def test_find_by_type
     js_asset_packages = RailsAssetPackager::AssetPackage.find_by_type("javascripts")
     assert_equal 2, js_asset_packages.length
     assert_equal "base", js_asset_packages[0].target
     assert_equal ["prototype", "effects", "controls", "dragdrop"], js_asset_packages[0].sources
   end
-  
+
   def test_find_by_target
     package = RailsAssetPackager::AssetPackage.find_by_target("javascripts", "base")
     assert_equal "base", package.target
     assert_equal ["prototype", "effects", "controls", "dragdrop"], package.sources
   end
-  
+
   def test_find_by_source
     package = RailsAssetPackager::AssetPackage.find_by_source("javascripts", "controls")
     assert_equal "base", package.target
     assert_equal ["prototype", "effects", "controls", "dragdrop"], package.sources
   end
-  
+
   def test_delete_and_build
     RailsAssetPackager::AssetPackage.delete_all
     js_package_names = Dir.new("#{RailsAssetPackager::AssetPackage.asset_base_path}/javascripts").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.js/) }
     css_package_names = Dir.new("#{RailsAssetPackager::AssetPackage.asset_base_path}/stylesheets").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.css/) }
     css_subdir_package_names = Dir.new("#{RailsAssetPackager::AssetPackage.asset_base_path}/stylesheets/subdir").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.css/) }
-    
+
     assert_equal 0, js_package_names.length
     assert_equal 0, css_package_names.length
     assert_equal 0, css_subdir_package_names.length
@@ -50,7 +49,7 @@ class AssetPackagerTest < Test::Unit::TestCase
     js_package_names = Dir.new("#{RailsAssetPackager::AssetPackage.asset_base_path}/javascripts").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.js/) }.sort
     css_package_names = Dir.new("#{RailsAssetPackager::AssetPackage.asset_base_path}/stylesheets").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.css/) }.sort
     css_subdir_package_names = Dir.new("#{RailsAssetPackager::AssetPackage.asset_base_path}/stylesheets/subdir").entries.delete_if { |x| ! (x =~ /\A\w+_packaged.css/) }.sort
-    
+
     assert_equal 2, js_package_names.length
     assert_equal 2, css_package_names.length
     assert_equal 1, css_subdir_package_names.length
@@ -60,7 +59,7 @@ class AssetPackagerTest < Test::Unit::TestCase
     assert css_package_names[1].match(/\Asecondary_packaged.css\z/)
     assert css_subdir_package_names[0].match(/\Astyles_packaged.css\z/)
   end
-  
+
   def test_js_names_from_sources
     package_names = RailsAssetPackager::AssetPackage.targets_from_sources("javascripts", ["prototype", "effects", "noexist1", "controls", "foo", "noexist2"])
     assert_equal 4, package_names.length
@@ -69,7 +68,7 @@ class AssetPackagerTest < Test::Unit::TestCase
     assert package_names[2].match(/\Asecondary_packaged\z/)
     assert_equal package_names[3], "noexist2"
   end
-  
+
   def test_css_names_from_sources
     package_names = RailsAssetPackager::AssetPackage.targets_from_sources("stylesheets", ["header", "screen", "noexist1", "foo", "noexist2"])
     assert_equal 4, package_names.length
@@ -78,7 +77,7 @@ class AssetPackagerTest < Test::Unit::TestCase
     assert package_names[2].match(/\Asecondary_packaged\z/)
     assert_equal package_names[3], "noexist2"
   end
-  
+
   def test_should_return_merge_environments_when_set
     RailsAssetPackager::AssetPackage.merge_environments = ["staging", "production"]
     assert_equal ["staging", "production"], RailsAssetPackager::AssetPackage.merge_environments
@@ -87,5 +86,5 @@ class AssetPackagerTest < Test::Unit::TestCase
   def test_should_only_return_production_merge_environment_when_not_set
     assert_equal ["production"], RailsAssetPackager::AssetPackage.merge_environments
   end
-  
+
 end

data/test/test_helper.rb

@@ -0,0 +1,8 @@
+$:.unshift(File.expand_path('../lib', __FILE__))
+require File.dirname(__FILE__) + '/../../../../config/environment'
+
+require 'rails/test_help'
+require 'mocha'
+
+ActionController::Base.logger = nil
+ActionController::Routing::Routes.reload rescue nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_asset_packager
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Scott Becker
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -06:00
+date: 2011-01-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - Gemfile.lock
 - README
 - Rakefile
+- TODO
 - lib/jsmin.rb
 - lib/rails_asset_packager.rb
 - lib/rails_asset_packager/asset_package.rb
@@ -108,6 +109,7 @@ files:
 - test/assets/stylesheets/screen.css
 - test/assets/stylesheets/subdir/bar.css
 - test/assets/stylesheets/subdir/foo.css
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/rails_asset_packager
 licenses: []
@@ -160,3 +162,4 @@ test_files:
 - test/assets/stylesheets/screen.css
 - test/assets/stylesheets/subdir/bar.css
 - test/assets/stylesheets/subdir/foo.css
+- test/test_helper.rb