sundawg-sinatra-assetpack-fork 0.0.12.pre1 → 0.1.6

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/image.rb

@@ -30,8 +30,8 @@ module Sinatra
       def dimensions
         return @dimensions  unless @dimensions.nil?
 
-         _, _, dim = `identify "#{@file}"`.split(' ')
-         w, h = dim.split('x')
+        dim = /(\d+) x (\d+)/.match(`file "#{@file}"`)
+        w, h = dim[1,2]
 
          if w.to_i != 0 && h.to_i != 0
            @dimensions = [w.to_i, h.to_i]

data/lib/sinatra/assetpack/options.rb

@@ -153,12 +153,21 @@ 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
 
       attrib :prebuild          # Bool
 
+      def expires(*args)
+        if args.empty?
+          @expires
+        else
+          @expires = args
+        end
+      end
+
       def js_compression(name=nil, options=nil)
         @js_compression = name  unless name.nil?
         @js_compression_options = options  if options.is_a?(Hash)
@@ -238,16 +247,22 @@ module Sinatra
       # Returns nil if a file is not found.
       # TODO: consolidate with local_file_for
       def dyn_local_file_for(requested_file, from)
-        # Remove extension
         file = requested_file
-        extension = ''
-
-        file.sub(/^(.*)(\.[^\.]+)$/) { file, extension = $1, $2 }
+        extension = File.extname(requested_file)
+        # Remove extension
+        file.gsub!(/#{extension}$/, "")
+        # Remove cache-buster (/js/app.28389 => /js/app)
+        file.gsub!(/\.[0-9]+$/, "")
+        matches = Dir[File.join(app.root, from, "#{file}.*")]
 
-        # Remove cache-buster (/js/app.28389.js => /js/app)
-        file = $1  if file =~ /^(.*)\.[0-9]+$/
+        # Fix for filenames with dots (can't do this with glob)
+        matches.select! { |f| f =~ /#{file}\.[^.]+$/ }
 
-        Dir[File.join(app.root, from, "#{file}#{extension}")].first
+        # Sort static file match, weighting exact file extension matches
+        matches.sort! do |f, _| 
+          (File.basename(f) == "#{file}#{extension}" || File.extname(f) == extension) ? -1 : 1
+        end
+        matches.first
       end
 
       # Writes `public/#{path}` based on contents of `output`.
@@ -258,7 +273,7 @@ module Sinatra
         yield path  if block_given?
 
         FileUtils.mkdir_p File.dirname(path)
-        File.open(path, 'w') { |f| f.write output }
+        File.open(path, 'wb') { |f| f.write output }
 
         if mtime
           File.utime mtime, mtime, path
@@ -305,7 +320,7 @@ module Sinatra
         paths  = paths.uniq
         tuples = paths.map { |key| [key, files[key]] }
 
-        HashArray[*tuples.flatten]
+        Hash[*tuples.flatten]
       end
 
     private

data/lib/sinatra/assetpack/package.rb

@@ -96,9 +96,12 @@ module Sinatra
         session = Rack::Test::Session.new(@assets.app)
         paths.map { |path|
           result = session.get(path)
-          response_encoding = result.content_type.split(/;\s*charset\s*=\s*/).last.upcase rescue 'ASCII-8BIT'
-          # p [:combined, path, result.body.encoding.name, response_encoding]
-          result.body.force_encoding(response_encoding).encode(Encoding.default_external || 'ASCII-8BIT')  if result.status == 200
+          if result.body.respond_to?(:force_encoding)
+            response_encoding = result.content_type.split(/;\s*charset\s*=\s*/).last.upcase rescue 'ASCII-8BIT'
+            result.body.force_encoding(response_encoding).encode(Encoding.default_external || 'ASCII-8BIT')  if result.status == 200
+          else
+            result.body  if result.status == 200
+          end
         }.join("\n")
       end
 
@@ -107,18 +110,22 @@ module Sinatra
 
     private
       def link_tag(file, options={})
-        # allow for building of assets from an application context and CDN host
         context = options[:context]
         host = options[:host]
-        file = "#{context}#{file}" unless context.nil? || context.empty?
-        file = "#{host}#{file}" unless host.nil? || host.empty?
+
+        file_path = HtmlHelpers.get_file_uri(file, @assets)
+
+        file_path = "#{context}#{file_path}" unless context.nil? || context.empty?
+        file_path = "#{host}#{file_path}" unless host.nil? || host.empty?
+
         options_copy = options.clone
         options_copy.delete(:context)
         options_copy.delete(:host)
+
         if js?
-          "<script src='#{e file}'#{kv options_copy}></script>"
+          "<script src='#{file_path}'#{kv options_copy}></script>"
         elsif css?
-          "<link rel='stylesheet' href='#{e file}'#{kv options_copy} />"
+          "<link rel='stylesheet' href='#{file_path}'#{kv options_copy} />"
         end
       end
     end

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.0.12.pre1"
+      "0.1.6"
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -15,6 +15,9 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra"
   s.add_dependency "jsmin"
   s.add_dependency "rack-test"
+  if RUBY_VERSION < "1.9"
+    s.add_runtime_dependency "backports"
+  end
   s.add_development_dependency "yui-compressor"
   s.add_development_dependency "sass"
   s.add_development_dependency "haml"
@@ -23,4 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "stylus"
   s.add_development_dependency "uglifier"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "less"
 end

data/test/app/app.rb

@@ -14,9 +14,15 @@ class Main < Sinatra::Base
   disable :show_exceptions
 
   assets {
-    #serve '/js',     :from => 'app/js'
+    serve '/js',     :from => 'app/js'
     serve '/css',    :from => 'app/css'
     serve '/images', :from => 'app/images'
+    serve '/fonts',    :from => 'app/fonts'
+    serve '/packages',    :from => 'app/packages'
+
+    js :a_package, '/packages/a_package.js', [
+      '/packages/a_package/package.js',
+    ]
 
     js :skitch, '/skitch.js', [
       '/js/hi.js',
@@ -52,6 +58,7 @@ class Main < Sinatra::Base
       '/css/scre*.css',
       '/css/screen.css'
     ]
+
   }
 
   get '/index.html' do

data/test/app/app/fonts/cantarell-regular-webfont.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="cantarellregular" horiz-adv-x="748" >
+<font-face units-per-em="2048" ascent="1513" descent="-535" />
+<missing-glyph horiz-adv-x="559" />
+<glyph horiz-adv-x="2048" />
+<glyph horiz-adv-x="2048" />
+<glyph unicode="&#xd;" horiz-adv-x="682" />
+<glyph unicode=" "  horiz-adv-x="559" />
+<glyph unicode="&#x09;" horiz-adv-x="559" />
+<glyph unicode="&#xa0;" horiz-adv-x="559" />
+<glyph unicode="A" horiz-adv-x="1382" d="M129 0l506 1421h192l506 -1421h-172l-143 414h-588l-143 -414h-158zM481 561h484l-240 694z" />
+<glyph unicode="&#xe000;" horiz-adv-x="985" d="M0 0v985h985v-985h-985z" />
+</font>
+</defs></svg> 

data/test/app/app/js/jquery-1.8.0.min.js

@@ -0,0 +1 @@
+$(function() { alert("Hello"); });

data/test/app/app/packages/a_package/package.css

@@ -0,0 +1 @@
+.hi { color: red; }

data/test/app/app/packages/a_package/package.js

@@ -0,0 +1 @@
+$(function() { alert("Hello"); });

data/test/app/config.ru

@@ -0,0 +1,2 @@
+require './app'
+run Main

data/test/arity_test.rb

@@ -17,8 +17,14 @@ class ArityTest < UnitTest
 
   test "arity in #assets" do
     paths = App.assets.packages['a.css'].paths
-    assert_equal paths,
-      [ "/css/screen.css", "/css/sqwishable.css", "/css/style.css", "/css/stylus.css", "/css/js2c.css" ]
+    expect = [ "/css/screen.css", "/css/sqwishable.css", "/css/style.css", "/css/stylus.css", "/css/js2c.css" ]
+    if RUBY_VERSION < "1.9"
+      # In 1.8.7 glob returns inconsitent files order so just check array are equivalents
+      assert_equal expect.size, paths.size
+      assert_equal 0, paths.reject{ |p| expect.include?(p) }.size
+    else
+      assert_equal expect, paths
+    end
 
     assert App.assets.js_compression == :closure
     assert App.assets.css_compression == :yui

data/test/cache_test.rb

@@ -1,8 +1,24 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class CacheTest < UnitTest
+  class App < UnitTest::App
+    register Sinatra::AssetPack
+
+    set :reload_templates, false
+    assets {
+      js :app, '/js/app.js', [
+        '/js/vendor/**/*.js',
+        '/js/assets/**/*.js',
+        '/js/hi.js',
+        '/js/hell*.js'
+      ]
+      js_compression :jsmin
+    }
+  end
+
+  def app() App; end
+
   test "Compressed js caching" do
-    app.set :reload_templates, false
     JSMin.expects(:minify).times(1).returns ""
     3.times { get '/js/app.js' }
   end

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/ignore_test.rb

@@ -20,8 +20,8 @@ class IgnoreTest < UnitTest
 
   test "ignore in package" do
     get '/main.js'
-    assert body.size > 0
-    assert !body.include?("BUMBLEBEE")
+    assert last_response.body.size > 0
+    assert !last_response.body.include?("BUMBLEBEE")
   end
 
   test "package files" do

data/test/img_test.rb

@@ -13,14 +13,14 @@ class ImgTest < UnitTest
     assert_equal last_response.headers['Content-Length'], File.size(r("/app/images/email.png")).to_s
   end
 
-  test "Image[]" do
+  test "compare" do
     i = Image['/app/images/email.png']
     j = Image['/app/images/email.png']
 
     assert j === i
   end
 
-  test "Image[]" do
+  test "dimensions" do
     i = Image['/app/images/email.png']
     j = Image['/app/images/email.png']
 

data/test/local_file_test.rb

@@ -6,6 +6,7 @@ class LocalFileTest < UnitTest
 
     assets {
       css :application, [ '/css/*.css' ]
+      serve '/fonts',    :from => 'app/fonts'
     }
   end
 
@@ -14,6 +15,11 @@ class LocalFileTest < UnitTest
     assert_equal r('app/images/background.jpg'), fn
   end
 
+  test "local file for (in existing files, custom serve path)" do
+    fn = App.assets.local_file_for '/fonts/cantarell-regular-webfont.ttf'
+    assert_equal r('app/fonts/cantarell-regular-webfont.ttf'), fn
+  end
+
   test "local file for (in nonexisting files)" do
     fn = App.assets.local_file_for '/images/404.jpg'
     assert fn.nil?

data/test/mime_type_test.rb

@@ -30,4 +30,24 @@ class AppTest < UnitTest
     get '/skitch.js'
     assert last_response.content_type =~ %r[^.*?/javascript]
   end
+
+  test 'eot' do
+    get '/fonts/cantarell-regular-webfont.eot'
+    assert last_response.content_type =~ %r[^application/vnd.ms-fontobject]
+  end
+
+  test 'svg' do
+    get '/fonts/cantarell-regular-webfont.svg'
+    assert last_response.content_type =~ %r[^image/svg\+xml]
+  end
+
+  test 'ttf' do
+    get '/fonts/cantarell-regular-webfont.ttf'
+    assert last_response.content_type =~ %r[^application/octet-stream]
+  end
+
+  test 'woff' do
+    get '/fonts/cantarell-regular-webfont.woff'
+    assert last_response.content_type =~ %r[^application/font-woff]
+  end
 end

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/sqwish_test.rb

@@ -2,6 +2,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 class SqwishTest < UnitTest
   setup do
+    app.set :reload_templates, true
     app.assets.css_compression :sqwish, :strict => true
   end
 
@@ -20,10 +21,10 @@ class SqwishTest < UnitTest
 
   if sqwish?
     test "build" do
-      Sinatra::AssetPack::Compressor
-      Sinatra::AssetPack::SqwishEngine.any_instance.expects(:css)
-
+      swqished_css = '#bg{background:green;color:red}'
+      Sinatra::AssetPack::SqwishEngine.any_instance.expects(:css).returns swqished_css
       get '/css/sq.css'
+      assert body == swqished_css
     end
   else
     puts "(No Sqwish found; skipping sqwish tests)"

data/test/test_helper.rb

@@ -1,10 +1,15 @@
 require 'contest'
 require 'jsmin'
 require 'tilt'
+require 'haml'
+require 'sass'
 require 'stylus'
+require 'stylus/tilt'
 require 'rack/test'
 require 'yaml'
-require 'mocha'
+require 'mocha/setup'
+
+ENV['RACK_ENV'] = 'test'
 
 require File.expand_path('../app/app.rb', __FILE__)
 

data/test/tilt_test.rb

@@ -5,6 +5,7 @@ class OptionsTest < UnitTest
     @formats = Sinatra::AssetPack.tilt_formats
     assert @formats['sass'] == 'css'
     assert @formats['scss'] == 'css'
+    assert @formats['less'] == 'css'
     assert @formats['coffee'] == 'js'
   end
 end