sinatra-exstatic-assets 2.0.0 → 2.0.1

data/CHANGES.md

@@ -1,9 +1,16 @@
 # CH CH CH CHANGES! #
 
+## Friday the 18th of April 2014, v2.0.1 ##
+
+* Bug fix, remote urls were sometimes being prepended with the public folder, fixed.
+
+----
+
+
 ## Saturday the 25th of May 2013, v2.0.0 ##
 
 * First release as the renamed library.
 * Bumped version number to 2 to make complete break from previous version numbers.
 * Added this file!
 
-----
+----

data/Gemfile

@@ -13,6 +13,7 @@ group :test do
   gem "simplecov"
   gem 'turn', :require => false
   gem "rack-test-accepts", :require => "rack/test/accepts"
+  gem "timecop"
 end
 
 group :development do

data/examples/app/public/js/helpers.js

@@ -0,0 +1 @@
+// nowt

data/examples/app2/public/js/helpers.js

@@ -0,0 +1 @@
+// nowt

data/lib/sinatra/exstatic_assets/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Exstatic
     # Library version
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
   end
 end

data/lib/sinatra/exstatic_assets.rb

@@ -137,12 +137,13 @@ module Sinatra
       # @see Sinatra::Helpers#uri
       def sss_url_for(addr, options=nil)
         options ||= {}
-        absolute = options.delete :absolute
+        opts = {timestamp: true}.merge options
+        absolute = opts.delete :absolute
         absolute = false if absolute.nil?
-        script_tag = options.delete(:script_tag)
-        script_tag = true if script_tag.nil?
+        script_tag = opts.delete(:script_tag)
+        script_tag = true if script_tag.nil? unless addr.is_uri?
         href = uri addr, absolute, script_tag
-        addr.respond_to?(:querystring) ?
+        addr.respond_to?(:querystring) && opts[:timestamp] ?
           "#{href}#{addr.querystring}" :
           href
       end
@@ -193,7 +194,10 @@ module Sinatra
 
       # Make's sure the options don't get mixed up with the other args.
       def sss_extract_options(a)
-        opts = a.last.respond_to?(:keys) ? a.pop : {}
+        opts = a.last.respond_to?(:keys) ?
+          a.pop :
+          {}
+        opts ||= {}
         [a, opts]
       end
 
@@ -283,7 +287,8 @@ module Sinatra
         # xhtml style like <link rel="shortcut icon" href="http://example.com/myicon.ico" />
         options[:rel] ||= settings.xhtml ? "shortcut icon" : "icon"
 
-        options[:href] = sss_url_for(source, options.delete(:url_options))
+        url_options = options.delete(:url_options) || {}
+        options[:href] = sss_url_for(Asset.new(source), url_options.merge(timestamp: false))
         
         Tag.new "link", options
       end

data/spec/spec_helper.rb

@@ -29,10 +29,19 @@ Dir[ File.join( Spec_dir, "/support/**/*.rb")].each do |f|
 end
 
 require 'rack/test/accepts'
+require 'timecop'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
   config.include Rack::Test::Accepts, :type => :request
+
+  config.before(:each, :time_sensitive => true) do
+    Timecop.freeze "2013-03-31 00:00:00 0000"
+  end
+
+  config.after(:each, :time_sensitive => true) do
+    Timecop.return
+  end
 end
 

data/spec/static_assets_spec.rb

@@ -22,7 +22,8 @@ describe Asset, :time_sensitive do
     its(:"is_uri?") { should be_false }
     its(:querystring) { should == "?ts=#{Time.now.to_i}" }
   end
-  context "Given a url" do    let(:filename) { "http://code.jquery.com/jquery-1.9.1.min.js" }
+  context "Given a url" do
+    let(:filename) { "http://code.jquery.com/jquery-1.9.1.min.js" }
     let(:expected) { "http://code.jquery.com/jquery-1.9.1.min.js" }
     it { should_not be_nil }
     it { should == expected }
@@ -111,12 +112,25 @@ describe "Private methods", :time_sensitive do
     it { should == expected }
   end
   context "Images" do
-    let(:url) { "/images/foo.png" }
-    let(:filename) { "/images/foo.png" }
-    let(:expected) { %Q!<img src="/bar/images/foo.png?ts=#{time}" />! }
-    subject { o.send :sss_image_tag, url }
-    it { should_not be_nil }
-    it { should == expected }
+    context "Local" do
+      let(:url) { "/images/foo.png" }
+      let(:filename) { "/images/foo.png" }
+      let(:expected) { %Q!<img src="/bar/images/foo.png?ts=#{time}" />! }
+      subject { o.send :sss_image_tag, url }
+      it { should_not be_nil }
+      it { should == expected }
+    end
+    context "Remote" do
+      let(:url) { "http://example.org/images/foo.png" }
+      let(:filename) { "/images/foo.png" }
+      let(:expected) { %Q!<img src="#{url}" />! }
+      subject { 
+        o.send  :sss_image_tag,
+                url
+      }
+      it { should_not be_nil }
+      it { should == expected }
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-exstatic-assets
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -48,12 +48,14 @@ files:
 - examples/app/public/css/screen.css
 - examples/app/public/favicon.ico
 - examples/app/public/images/3609420787_f7fc0e53c7.jpg
+- examples/app/public/js/helpers.js
 - examples/app/views/index.erb
 - examples/app/views/layout.erb
 - examples/app2/main.rb
 - examples/app2/public/css/base.css
 - examples/app2/public/css/screen.css
 - examples/app2/public/favicon
+- examples/app2/public/js/helpers.js
 - examples/app2/views/index.erb
 - examples/app2/views/layout.erb
 - examples/config.rb