sinatra-static-assets 1.0.2 → 1.0.3

data/lib/sinatra/static_assets.rb

@@ -3,6 +3,10 @@ require 'sinatra/base'
 module Sinatra
   module StaticAssets
     module Helpers
+
+      @@asset_timestamps_cache = {}
+      @@asset_mutex ||= Mutex.new
+
       # In HTML <link> and <img> tags have no end tag.
       # In XHTML, on the contrary, these tags must be properly closed.
       #
@@ -40,6 +44,35 @@ module Sinatra
       def url_for(addr, absolute = false)
         uri(addr, absolute == :full ? true : false, true)
       end
+      
+      def is_uri?(path)
+          path =~ %r{^[-a-z]+://|^cid:|^//}
+      end
+
+      def asset_url_for(source)
+        url = url_for(source)
+        return url if is_uri?(source)
+          
+        timestamp = asset_timestamp(source)
+        url += "?#{timestamp}" unless timestamp.empty?
+        return url
+      end
+
+      def asset_timestamp(source)
+        if timestamp = @@asset_timestamps_cache[source]
+          return timestamp
+        else
+          path = asset_file_path(source)
+          timestamp = File.exists?(path) ? File.mtime(path).to_i.to_s : ''
+          @@asset_mutex.synchronize {
+            @@asset_timestamps_cache[source] = timestamp
+          }
+        end
+      end
+
+      def asset_file_path(path)
+        File.join(settings.root, 'public', path)
+      end
 
       def tag(name, local_options = {})
         start_tag = "<#{name}#{tag_options(local_options) if local_options}"
@@ -63,12 +96,12 @@ module Sinatra
       def stylesheet_tag(source, options = {})
         tag("link", { :type => "text/css",
             :charset => "utf-8", :media => "screen", :rel => "stylesheet",
-            :href => url_for(source) }.merge(options))
+            :href => asset_url_for(source) }.merge(options))
       end
 
       def javascript_tag(source, options = {})
         tag("script", { :type => "text/javascript", :charset => "utf-8",
-            :src => url_for(source) }.merge(options)) do
+            :src => asset_url_for(source) }.merge(options)) do
             end
       end
 

data/sinatra-static-assets.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sinatra-static-assets"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.authors     = ["Włodek Bzyl"]
   s.email       = ["matwb@ug.edu.pl"]
   s.homepage    = ""

data/test/public/test.css

@@ -0,0 +1,2 @@
+/* Dummy CSS file for tests */ 
+html { background: white }

data/test/sinatra_app.rb

@@ -1,6 +1,3 @@
-path = File.expand_path("../lib" + File.dirname(__FILE__))
-$:.unshift(path) unless $:.include?(path)
-
 require 'rubygems'
 
 require 'sinatra'
@@ -15,6 +12,14 @@ get "/url_for" do
 EOD
 end
 
+get "/asset_url_for" do
+  content_type "text/plain"
+  <<"EOD"
+#{asset_url_for("test.css")}
+#{asset_url_for("http://example.org/test.css")}
+EOD
+end
+
 get "/image_tag" do
   content_type "text/plain"
   <<"EOD"
@@ -25,7 +30,7 @@ end
 get "/stylesheet_link_tag" do
   content_type "text/plain"
   <<"EOD"
-#{stylesheet_link_tag("/stylesheets/winter.css", "/stylesheets/summer.css", :media => "projection")}
+#{stylesheet_link_tag("/stylesheets/winter.css", "/stylesheets/summer.css", "test.css", :media => "projection")}
 EOD
 end
 

data/test/sinatra_baseapp.rb

@@ -1,6 +1,3 @@
-path = File.expand_path("../lib" + File.dirname(__FILE__))
-$:.unshift(path) unless $:.include?(path)
-
 require 'rubygems'
 require 'sinatra/base'
 

data/test/sinatra_static_assets_test.rb

@@ -1,6 +1,8 @@
+require './test/test_helper'
 require './test/sinatra_app'
 require 'test/unit'
 require 'rack/test'
+require 'sinatra/static_assets'
 
 set :environment, :test
 
@@ -18,6 +20,15 @@ class SintraStaticAssetsTest < Test::Unit::TestCase
 /bar/
 /bar/foo
 http://example.org/bar/foo
+EOD
+  end
+  
+  def test_asset_url_for_returns_timestamp_only_on_existing_paths
+    get '/asset_url_for', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body, <<EOD
+/bar/test.css?#{asset_timestamp('test.css')}
+http://example.org/test.css
 EOD
   end
 
@@ -35,6 +46,7 @@ EOD
     assert_equal last_response.body,  <<EOD
 <link charset="utf-8" href="/bar/stylesheets/winter.css" media="projection" rel="stylesheet" type="text/css">
 <link charset="utf-8" href="/bar/stylesheets/summer.css" media="projection" rel="stylesheet" type="text/css">
+<link charset="utf-8" href="/bar/test.css?#{asset_timestamp('test.css')}" media="projection" rel="stylesheet" type="text/css">
 EOD
   end
 

data/test/sinatra_static_assets_xhtml_test.rb

@@ -1,3 +1,4 @@
+require './test/test_helper'
 require './test/sinatra_baseapp'
 require 'test/unit'
 require 'rack/test'

data/test/test_helper.rb

@@ -0,0 +1,6 @@
+path = File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+$:.unshift(path) unless $:.include?(path)
+
+def asset_timestamp(source)
+  File.mtime("./test/public/#{source}").to_i.to_s
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-static-assets
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &14567420 !ruby/object:Gem::Requirement
+  requirement: &16409220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *14567420
+  version_requirements: *16409220
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &14566340 !ruby/object:Gem::Requirement
+  requirement: &16408580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14566340
+  version_requirements: *16408580
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &14565080 !ruby/object:Gem::Requirement
+  requirement: &16407840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14565080
+  version_requirements: *16407840
 description: ! "This Sinatra extensions provides following helper methods:\n    -
   image_tag\n    - stylesheet_link_tag\n    - javascript_script_tag"
 email:
@@ -97,10 +97,12 @@ files:
 - examples/winter/winter.rb
 - lib/sinatra/static_assets.rb
 - sinatra-static-assets.gemspec
+- test/public/test.css
 - test/sinatra_app.rb
 - test/sinatra_baseapp.rb
 - test/sinatra_static_assets_test.rb
 - test/sinatra_static_assets_xhtml_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sinatra-static-assets
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Sinatra extension.