asset_bundler 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/asset_bundler.rb

@@ -2,7 +2,8 @@ require 'asset_timestamps_cache'
 require 'fileutils'
 
 module AssetBundler
-
+  class FileNotFound < StandardError; end
+  
   # Mix this in to view context for convenient access
   module ViewHelper
     def javascript_include_tag(*args)
@@ -53,16 +54,19 @@ module AssetBundler
     end
 
     def self.join_asset_file_contents(paths)
-      paths.collect { |path| File.read(asset_file_path(path)) }.join("\n\n")
+      paths.collect { |path| File.read(path) }.join("\n\n")
     end
 
     def self.write_asset_file_contents(joined_asset_path, asset_paths)
+      file_paths = asset_paths.map {|p| asset_file_path(p)}
+      file_paths.each {|p| raise(FileNotFound, "#{p.inspect} does not exist") unless File.exist?(p)}
+      
       FileUtils.mkdir_p(File.dirname(joined_asset_path))
-      File.open(joined_asset_path, "w+") { |cache| cache.write(join_asset_file_contents(asset_paths)) }
+      File.open(joined_asset_path, "w+") { |cache| cache.write(join_asset_file_contents(file_paths)) }
 
       # Set mtime to the latest of the combined files to allow for
       # consistent ETag without a shared filesystem.
-      mt = asset_paths.map { |p| File.mtime(asset_file_path(p)) }.max
+      mt = file_paths.map { |p| File.mtime(p) }.max
       File.utime(mt, mt, joined_asset_path)
     end
 

data/test/test_asset_bundler.rb

@@ -28,6 +28,7 @@ class TestAssetBundler < Test::Unit::TestCase
       %(<script type="text/javascript" src="/scripts/#{name}.js?#{mtime}"></script>)
     end.join("\n")
     assert_equal expected, html
+    assert !File.exist?("public/scripts/all.js")
   end
 
   def test_stylesheet_link_tag_html_output_without_cache
@@ -37,6 +38,7 @@ class TestAssetBundler < Test::Unit::TestCase
       %{<link rel="stylesheet" href="/styles/#{name}.css?#{mtime}" type="text/css">}
     end.join("\n")
     assert_equal expected, html
+    assert !File.exist?("public/styles/all.js")
   end
 
   def test_javascript_include_tag_html_output_with_cache
@@ -44,19 +46,37 @@ class TestAssetBundler < Test::Unit::TestCase
     mtime = File.mtime("public/scripts/all.js").to_i
     expected = %(<script type="text/javascript" src="/scripts/all.js?#{mtime}"></script>)
     assert_equal expected, html
+    assert File.exist?("public/scripts/all.js")
+    assert_equal joined_script_contents, File.read("public/scripts/all.js")
   ensure
     File.delete("public/scripts/all.js")
   end
+  
+  def test_javascript_include_tag_html_output_with_cache_when_nonexistent_file_is_specified
+    assert_raises AssetBundler::FileNotFound do
+      @scope.javascript_include_tag('/scripts/one.js', '/scripts/two.js', '/scripts/three.js', '/scripts/doesnotexist.js', :cache => '/scripts/all.js')
+    end
+    assert !File.exist?("public/scripts/all.js")
+  end
 
   def test_stylesheet_link_tag_html_output_with_cache
     html = @scope.stylesheet_link_tag('/styles/one.css', '/styles/two.css', '/styles/three.css', :cache => '/styles/all.css')
     mtime = File.mtime("public/styles/all.css").to_i
     expected = %{<link rel="stylesheet" href="/styles/all.css?#{mtime}" type="text/css">}
     assert_equal expected, html
+    assert File.exist?("public/styles/all.css")
+    assert_equal joined_style_contents, File.read("public/styles/all.css")
   ensure
     File.delete("public/styles/all.css")
   end
   
+  def test_stylesheet_link_tag_html_output_with_cache_when_nonexistent_file_is_specified
+    assert_raises AssetBundler::FileNotFound do
+      @scope.stylesheet_link_tag('/styles/one.css', '/styles/two.css', '/styles/three.css', '/styles/doesnotexist.css', :cache => '/styles/all.css')
+    end
+    assert !File.exist?("public/styles/all.css")
+  end
+  
   def test_javascript_include_tag_html_output_with_cache_does_not_bundle_in_development
     with_rack_env 'development' do
       html = @scope.javascript_include_tag('/scripts/one.js', '/scripts/two.js', '/scripts/three.js', :cache => '/scripts/all.js')
@@ -65,6 +85,7 @@ class TestAssetBundler < Test::Unit::TestCase
         %(<script type="text/javascript" src="/scripts/#{name}.js?#{mtime}"></script>)
       end.join("\n")
       assert_equal expected, html
+      assert !File.exist?("public/scripts/all.js")
     end
   end
   
@@ -76,6 +97,7 @@ class TestAssetBundler < Test::Unit::TestCase
         %{<link rel="stylesheet" href="/styles/#{name}.css?#{mtime}" type="text/css">}
       end.join("\n")
       assert_equal expected, html
+      assert !File.exist?("public/styles/all.css")
     end
   end
 
@@ -90,18 +112,19 @@ class TestAssetBundler < Test::Unit::TestCase
     File.delete("public/scripts/all.js")
   end
 
-  def test_cached_javascript
-    @scope.javascript_include_tag('/scripts/one.js', '/scripts/two.js', '/scripts/three.js', :cache => '/scripts/all.js')
-    actual = File.read("public/scripts/all.js")
-    expected = ['one', 'two', 'three'].map do |name|
-      "// script #{name}\nfunction #{name}() {};"
-    end.join("\n\n")
-    assert_equal expected, actual
-  ensure
-    File.delete("public/scripts/all.js")
-  end
-
   private
+    def joined_script_contents
+      ['one', 'two', 'three'].map do |name|
+        "// script #{name}\nfunction #{name}() {};"
+      end.join("\n\n")
+    end
+    
+    def joined_style_contents
+      ['one', 'two', 'three'].map do |name|
+        "/* style #{name} */\n##{name} {}"
+      end.join("\n\n")
+    end
+  
     def with_rack_env(val)
       old_env, ENV['RACK_ENV'] = ENV['RACK_ENV'], val
       yield

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: asset_bundler
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Geoff Buesing
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -06:00
+date: 2010-06-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: asset_timestamps_cache
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 1
@@ -63,23 +66,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple asset bundling solution.