dynamic_assets 0.7.0 → 0.7.1

data/app/helpers/dynamic_assets_helpers.rb

@@ -1,26 +1,26 @@
 
 module DynamicAssetsHelpers
 
-  def stylesheet_asset_tag(group_key, http_attributes = {})
+  def stylesheet_asset_tag(group_key, options = {})
     DynamicAssets::Manager.asset_references_for_group_key(:stylesheets, group_key).map do |asset_ref|
 
       tag :link, {
         :type   => "text/css",
         :rel    => "stylesheet",
         :media  => "screen",
-        :href   => asset_url(asset_ref)
-      }.merge!(http_attributes)
+        :href   => asset_url(asset_ref, options.delete(:token))
+      }.merge!(options)
 
     end.join.html_safe
   end
 
-  def javascript_asset_tag(group_key, http_attributes = {})
+  def javascript_asset_tag(group_key, options = {})
     DynamicAssets::Manager.asset_references_for_group_key(:javascripts, group_key).map do |asset_ref|
 
       content_tag :script, "", {
         :type => "text/javascript",
-        :src  => asset_url(asset_ref)
-      }.merge!(http_attributes)
+        :src  => asset_url(asset_ref, options.delete(:token))
+      }.merge!(options)
 
     end.join.html_safe
   end
@@ -28,12 +28,12 @@ module DynamicAssetsHelpers
 
 protected
 
-  def asset_path(asset_ref)
+  def asset_path(asset_ref, token = nil)
     path_args = []
     path_args << asset_ref.name
 
     signature = asset_ref.signature DynamicAssets::ViewContext.get(controller)
-    path_args << { :signature => signature } if signature.present?
+    path_args << { :signature => signature, :token => token } if signature.present?
 
     case asset_ref
     when DynamicAssets::StylesheetReference then stylesheet_asset_path *path_args
@@ -42,8 +42,8 @@ protected
     end
   end
 
-  def asset_url(asset_ref)
-    path = asset_path asset_ref
+  def asset_url(asset_ref, token = nil)
+    path = asset_path asset_ref, token
     path = "/" + path unless path[0,1] == "/"
 
     host = compute_asset_host path

data/config/routes.rb

@@ -1,14 +1,14 @@
 
 Rails.application.routes.draw do
 
-  match '/assets/javascripts(/v/:signature)/:name.:format' => 'assets#show_javascript',
+  match '/assets(-:token)/javascripts(/v/:signature)/: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.
     }
 
-  match '/assets/stylesheets(/v/:signature)/:name.:format' => 'assets#show_stylesheet',
+  match '/assets(-:token)/stylesheets(/v/:signature)/: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.

metadata

@@ -2,7 +2,7 @@
 name: dynamic_assets
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Robert Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 -05:00
+date: 2011-06-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1939636484692022246
+      hash: 2926007834367923587
       segments: 
       - 0
       version: "0"