dynamic_assets 0.3.1 → 0.4.0

data/app/helpers/dynamic_assets_helpers.rb

@@ -29,11 +29,13 @@ module DynamicAssetsHelpers
   protected
 
     def asset_path(asset_ref)
-      name = asset_ref.name
+      path_args = []
+      path_args << asset_ref.name
+      path_args << { :timestamp => asset_ref.mtime.to_i.to_s } if asset_ref.mtime.present?
 
       case asset_ref
-      when DynamicAssets::StylesheetReference then stylesheet_asset_path name
-      when DynamicAssets::JavascriptReference then javascript_asset_path name
+      when DynamicAssets::StylesheetReference then stylesheet_asset_path *path_args
+      when DynamicAssets::JavascriptReference then javascript_asset_path *path_args
       else raise "Unknown asset type: #{asset_ref}"
       end
     end
@@ -41,10 +43,8 @@ module DynamicAssetsHelpers
     def asset_url(asset_ref)
       path = asset_path asset_ref
       path = "/" + path unless path[0,1] == "/"
-      path << "?#{asset_ref.mtime.to_i.to_s}" if asset_ref.mtime.present?
 
       host = compute_asset_host path
-
       host ? "#{host}#{path}" : path
     end
 

data/config/routes.rb

@@ -1,12 +1,20 @@
 
 Rails.application.routes.draw do
 
-  match '/assets/javascripts/:name.js' => 'assets#show_javascript', :as => :javascript_asset,
-    :format => "js",                        # Important for action-caching non-HTML resources
-    :constraints => { :name => /[^ ]+/ }    # By default, segments can't have dots. We allow all but space.
+  match '/assets/javascripts(/:timestamp)/:name.:format' => 'assets#show_javascript',
+    :as => :javascript_asset,
+    :format => "js",              # Important for action-caching non-HTML resources
+    :constraints => {
+      :name => /[^ ]+/,           # By default, route segments can't have dots. We allow all but space.
+      :timestamp => /\d+/
+    }
 
-  match '/assets/stylesheets/:name.css' => 'assets#show_stylesheet', :as => :stylesheet_asset,
-    :format => "css",                       # Important for action-caching non-HTML resources
-    :constraints => { :name => /[^ ]+/ }    # By default, segments can't have dots. We allow all but space.
+  match '/assets/stylesheets(/:timestamp)/:name.:format' => 'assets#show_stylesheet',
+    :as => :stylesheet_asset,
+    :format => "css",             # Important for action-caching non-HTML resources
+    :constraints => {             # By default, segments can't have dots. We allow all but space.
+      :name => /[^ ]+/,
+      :timestamp => /\d+/
+    }
 
 end

data/spec/helpers/dynamic_assets_helpers_spec.rb

@@ -57,9 +57,9 @@ describe DynamicAssetsHelpers do
           before { helper.config.asset_host.should be_nil }
 
           it "is three tags with hrefs derived from the asset name and mtime" do
-            should contain_string 'href="/assets/stylesheets/a.css?123"'
-            should contain_string 'href="/assets/stylesheets/b.css?456"'
-            should contain_string 'href="/assets/stylesheets/c.css?789"'
+            should contain_string 'href="/assets/stylesheets/123/a.css"'
+            should contain_string 'href="/assets/stylesheets/456/b.css"'
+            should contain_string 'href="/assets/stylesheets/789/c.css"'
           end
         end
 
@@ -67,9 +67,9 @@ describe DynamicAssetsHelpers do
           before { helper.config.stub(:asset_host).and_return "http://a.example.com" }
 
           it "is three tags with hrefs whose host is a.example.com" do
-            should contain_string 'href="http://a.example.com/assets/stylesheets/a.css?123"'
-            should contain_string 'href="http://a.example.com/assets/stylesheets/b.css?456"'
-            should contain_string 'href="http://a.example.com/assets/stylesheets/c.css?789"'
+            should contain_string 'href="http://a.example.com/assets/stylesheets/123/a.css"'
+            should contain_string 'href="http://a.example.com/assets/stylesheets/456/b.css"'
+            should contain_string 'href="http://a.example.com/assets/stylesheets/789/c.css"'
           end
         end
 
@@ -77,9 +77,9 @@ describe DynamicAssetsHelpers do
           before { helper.config.stub(:asset_host).and_return "http://a%d.example.com" }
 
           it "is three tags with hrefs whose host is a[0-3].example.com" do
-            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/a.css\?123"/
-            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/b.css\?456"/
-            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/c.css\?789"/
+            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/123\/a.css"/
+            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/456\/b.css"/
+            should =~ /href="http:\/\/a[0-3].example.com\/assets\/stylesheets\/789\/c.css"/
           end
         end
       end
@@ -132,9 +132,9 @@ describe DynamicAssetsHelpers do
           before { helper.config.asset_host.should be_nil }
 
           it "is three tags with srcs derived from the asset name and mtime" do
-            should contain_string 'src="/assets/javascripts/a.js?123"'
-            should contain_string 'src="/assets/javascripts/b.js?456"'
-            should contain_string 'src="/assets/javascripts/c.js?789"'
+            should contain_string 'src="/assets/javascripts/123/a.js"'
+            should contain_string 'src="/assets/javascripts/456/b.js"'
+            should contain_string 'src="/assets/javascripts/789/c.js"'
           end
         end
 
@@ -142,9 +142,9 @@ describe DynamicAssetsHelpers do
           before { helper.config.stub(:asset_host).and_return "http://a.example.com" }
 
           it "is three tags with srcs whose host is a.example.com" do
-            should contain_string 'src="http://a.example.com/assets/javascripts/a.js?123"'
-            should contain_string 'src="http://a.example.com/assets/javascripts/b.js?456"'
-            should contain_string 'src="http://a.example.com/assets/javascripts/c.js?789"'
+            should contain_string 'src="http://a.example.com/assets/javascripts/123/a.js"'
+            should contain_string 'src="http://a.example.com/assets/javascripts/456/b.js"'
+            should contain_string 'src="http://a.example.com/assets/javascripts/789/c.js"'
           end
         end
 
@@ -152,9 +152,9 @@ describe DynamicAssetsHelpers do
           before { helper.config.stub(:asset_host).and_return "http://a%d.example.com" }
 
           it "is three tags with srcs whose host is a[0-3].example.com" do
-            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/a.js\?123"/
-            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/b.js\?456"/
-            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/c.js\?789"/
+            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/123\/a.js"/
+            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/456\/b.js"/
+            should =~ /src="http:\/\/a[0-3].example.com\/assets\/javascripts\/789\/c.js"/
           end
         end
       end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ ENV["RAILS_ENV"] ||= 'test'
 
 require 'dummy_rails_app/config/environment'
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamic_assets
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Robert Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -05:00
+date: 2011-04-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency