sinatra-assetpack 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.1.2)
+    sinatra-assetpack (0.1.3)
       jsmin
       rack-test
       sinatra
@@ -29,9 +29,9 @@ GEM
     metaclass (0.0.1)
     mocha (0.13.2)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
+    multi_json (1.6.0)
     open4 (1.3.0)
-    rack (1.5.0)
+    rack (1.5.2)
     rack-protection (1.3.2)
       rack
     rack-test (0.6.2)
@@ -66,6 +66,6 @@ DEPENDENCIES
   rake
   sass
   sinatra-assetpack!
-  stylus
+  stylus (< 0.7.1)
   uglifier
   yui-compressor

data/HISTORY.md

@@ -1,3 +1,12 @@
+v0.1.4 - Feb 12, 2013
+----------------------
+
+### Added
+  * Multiple asset hosts support. (#27)
+
+### Fixed
+  * Lock stylus to 0.7.0 until 0.7.1 is supported.
+
 v0.1.3 - Feb 3, 2013
 ----------------------
 

data/README.md

@@ -2,9 +2,10 @@
 
 >  Package your assets transparently in Sinatra.
 
-[![Build Status](https://travis-ci.org/rstacruz/sinatra-assetpack.png)](https://travis-ci.org/rstacruz/sinatra-assetpack)
+[![Build Status](https://travis-ci.org/rstacruz/sinatra-assetpack.png?branch=master)](https://travis-ci.org/rstacruz/sinatra-assetpack)
+[![Gem Version](https://badge.fury.io/rb/sinatra-assetpack.png)](http://badge.fury.io/rb/sinatra-assetpack)
 [![Dependency Status](https://gemnasium.com/rstacruz/sinatra-assetpack.png)](https://gemnasium.com/rstacruz/sinatra-assetpack)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rstacruz/sinatra-assetpack)
+[![Code Climate](https://codeclimate.com/github/rstacruz/sinatra-assetpack.png)](https://codeclimate.com/github/rstacruz/sinatra-assetpack)
 
 How it works
 ------------

data/examples/basic/app.rb

@@ -26,7 +26,18 @@ class App < Sinatra::Base
       '/css/more/*.css'
     ]
 
-    prebuild true
+    prebuild false
+
+    # Can set this as an environment variable like "HOST" or "CDN_HOST"
+    # This will add the domain name to the beginning of compiled assets
+    # Useful if you need to serve production assets from a CDN
+    asset_hosts [
+      '//cdn-0.example.org',
+      '//cdn-1.example.org',
+      '//cdn-2.example.org',
+      '//cdn-3.example.org'
+    ]
+
   end
 
   get '/' do

data/lib/sinatra/assetpack/css.rb

@@ -11,7 +11,7 @@ module Sinatra
             if options.to_s.include?('embed')
               to_data_uri(local)
             else
-              BusterHelpers.add_cache_buster(file, local)
+              HtmlHelpers.get_file_uri(file, assets)
             end
           else
             path

data/lib/sinatra/assetpack/helpers.rb

@@ -15,7 +15,9 @@ module Sinatra
         local = settings.assets.local_file_for src
         if local
           i = Image[local]
-          attrs[:src] = BusterHelpers.add_cache_buster(src, local)
+
+          attrs[:src] = HtmlHelpers.get_file_uri(src, settings.assets)
+
           if i.dimensions?
             attrs[:width]  ||= i.width
             attrs[:height] ||= i.height

data/lib/sinatra/assetpack/html_helpers.rb

@@ -12,6 +12,18 @@ module Sinatra
       def kv(hash)
         hash.map { |k, v| " #{e k}='#{e v}'" }.join('')
       end
+
+      def get_file_uri(file, assets)
+        raise RuntimeError, "You must pass in an asset for a URI to be created for it." if file.nil?
+
+        local = assets.local_file_for file
+
+        if assets.asset_hosts.nil?
+          BusterHelpers.add_cache_buster(file, local)
+        else
+          assets.asset_hosts[Digest::MD5.hexdigest(file).to_i(16) % assets.asset_hosts.length]+BusterHelpers.add_cache_buster(file, local)
+        end
+      end
     end
   end
 end

data/lib/sinatra/assetpack/options.rb

@@ -153,6 +153,7 @@ module Sinatra
       attrib :js_compression    # Symbol, compression method for JS
       attrib :css_compression   # Symbol, compression method for CSS
       attrib :output_path       # '/public'
+      attrib :asset_hosts       # [ 'http://cdn0.example.org', 'http://cdn1.example.org' ]
 
       attrib :js_compression_options   # Hash
       attrib :css_compression_options  # Hash

data/lib/sinatra/assetpack/package.rb

@@ -110,10 +110,12 @@ module Sinatra
 
     private
       def link_tag(file, options={})
+        file_path = HtmlHelpers.get_file_uri(file, @assets)
+
         if js?
-          "<script src='#{e file}'#{kv options}></script>"
+          "<script src='#{file_path}'#{kv options}></script>"
         elsif css?
-          "<link rel='stylesheet' href='#{e file}'#{kv options} />"
+          "<link rel='stylesheet' href='#{file_path}'#{kv options} />"
         end
       end
     end

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.1.3"
+      "0.1.4"
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coffee-script"
   s.add_development_dependency "contest"
   s.add_development_dependency "mocha"
-  s.add_development_dependency "stylus"
+  s.add_development_dependency "stylus", "< 0.7.1"
   s.add_development_dependency "uglifier"
   s.add_development_dependency "rake"
   s.add_development_dependency "less"

data/test/glob_test.rb

@@ -21,6 +21,7 @@ class GlobTest < UnitTest
   end
 
   should "match double-star globs recursively" do
+    app.stubs(:development?).returns(true)
     get '/a'
     assert body.include?("a/b/c1/hello.")
     assert body.include?("a/b/c2/hi.")
@@ -28,12 +29,14 @@ class GlobTest < UnitTest
   end
 
   should "match single-star globs in filenames" do
+    app.stubs(:development?).returns(true)
     get '/b'
     assert body.include?("a/b/c2/hi.")
     assert body.include?("a/b/c2/hola.")
   end
 
   should "match single-star globs in paths" do
+    app.stubs(:development?).returns(true)
     get '/c'
     assert body.include?("a/b/c1/hello.")
     assert body.include?("a/b/c2/hi.")

data/test/redundant_test.rb

@@ -5,6 +5,7 @@ class RedundantTest < UnitTest
   Main.get("/helpers/css/redundant") { css :redundant }
 
   test "redundant" do
+    app.stubs(:development?).returns(true)
     get '/helpers/css/redundant'
     assert body.scan(/screen/).count == 1
   end

data/test/test_helper.rb

@@ -8,6 +8,8 @@ require 'rack/test'
 require 'yaml'
 require 'mocha/setup'
 
+ENV['RACK_ENV'] = 'test'
+
 require File.expand_path('../app/app.rb', __FILE__)
 
 class UnitTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -176,16 +176,16 @@ dependencies:
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
     none: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
     none: false
 - !ruby/object:Gem::Dependency
   name: uglifier