sinatra-assetpack 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36980bbe81aa1db5f97f6fcedb9cd0d3d18a917c
-  data.tar.gz: b051cfbb48584c044bd4145a9dd91a4941b7b864
+  metadata.gz: e742977ba0329b1f960c46f4294fa2cb860d35de
+  data.tar.gz: 45e3dd99cc00c05bf524751f0a1f19e0a8a43693
 SHA512:
-  metadata.gz: f6482f3a6d2dbbc4608c4c8a7fa711f90b8836da96aa58935cc452e5a4e6cdee0e9702bc893f1c726fc8ec08c691a3aa84469877032d37edf9f9a8c124989d29
-  data.tar.gz: 0031c2f116f04cf2bc388fa819216db737401bd759c08894a3a4bf44fcfe0ab0c73ff0f20951532c5cc4fac05f16471004809c7ddbfbf251bf3dc160275233bb
+  metadata.gz: 7b2d990a88e9acb49884f9d764fe5c7f8b17b045da773b245200f2ff3a21617429cd525358ca9cc594b859bf7725a8658446a1f53bfe63078f968646f211e719
+  data.tar.gz: 23d6d7a5a7f2cdab53406e16a572ba068d46e3042607595032e19d8560f19ec8f64ffc78cd6adf3ca70a69fc67c7fa8e0cf6fd30e76c5f36441858e958907747

data/.travis.yml

@@ -10,5 +10,6 @@ rvm:
   - ruby-head
 matrix:
   allow_failures:
+    - rvm: rbx-19mode
     - rvm: jruby-head
-    - rvm: ruby-head
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.3.2 - January 10, 2014
+
+  * Change : Support .ico files (#147)
+  * Change : lock tilt gem to 1.0, not tilt 2.0 compatible yet.
+  * Fix : Account for suburi in img helper (#144)
+  * Fix : Improve image_path helper (#146)
+  * Fix : No broken HTML for crazy file names (#150)
+
 ## v0.3.1 - August 1, 2013
 
   * Fix : Use Tilt mappings when sorting candidates for dynamic requests. (#122)

data/Gemfile.lock

@@ -1,67 +1,61 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.3.1)
+    sinatra-assetpack (0.3.2)
       jsmin
       rack-test
       sinatra
-      tilt (>= 1.3.0)
+      tilt (>= 1.3.0, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    POpen4 (0.1.4)
-      Platform (>= 0.4.0)
-      open4
-    Platform (0.4.0)
-    awesome_print (1.1.0)
+    awesome_print (1.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     columnize (0.3.6)
-    commonjs (0.2.6)
+    commonjs (0.2.7)
     contest (0.1.3)
-    debugger (1.6.0)
+    debugger (1.6.5)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
+      debugger-ruby_core_source (~> 1.3.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    gem-release (0.6.0)
-    haml (4.0.3)
+    debugger-ruby_core_source (1.3.1)
+    execjs (2.0.2)
+    gem-release (0.7.1)
+    haml (4.0.5)
       tilt
     jsmin (1.0.1)
-    less (2.3.2)
-      commonjs (~> 0.2.6)
+    json (1.8.1)
+    json (1.8.1-java)
+    less (2.4.0)
+      commonjs (~> 0.2.7)
     metaclass (0.0.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.7)
-    open4 (1.3.0)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.1.0)
-    sass (3.2.9)
-    sinatra (1.4.3)
+    rake (10.1.1)
+    sass (3.2.13)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    stylus (0.7.2)
+    stylus (1.0.0)
       execjs
       stylus-source
-    stylus-source (0.31.0)
+    stylus-source (0.38.0)
     tilt (1.4.1)
-    uglifier (2.1.1)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    yui-compressor (0.9.6)
-      POpen4 (>= 0.1.4)
+      json (>= 1.8.0)
+    yui-compressor (0.12.0)
 
 PLATFORMS
   java

data/README.md

@@ -393,8 +393,8 @@ Redundancies will be taken care of.
 assets {
   css :NAME, [ PATH1, PATH2, ... ]
   css :NAME, 'URI', [ PATH1, PATH2, ... ]
-  js:NAME, [ PATH1, PATH2, ... ]
-  js:NAME, 'URI', [ PATH1, PATH2, ... ]
+  js :NAME, [ PATH1, PATH2, ... ]
+  js :NAME, 'URI', [ PATH1, PATH2, ... ]
 }
 ```
 

data/UPGRADING

@@ -3,15 +3,15 @@
 ##################################################
 
 Please note that sinatra-assetpack `img` helper method
-no more set the image width and height because this default
-behavior is not desirable with most recent CSS techniques
+no longer sets the image width and height. This default
+behavior is not desirable with more recent CSS techniques
 regarding high resolutions images for "retina" displays
-ans "responsive" design CSS using for exemple width:100%.
+and "responsive" design CSS using, for example, width:100%.
 
 <img src="retina.jpg" width="1200" height="600">
 
-Is now simply this (unless you explicity set them) :
+Is now simply this (unless you explicitly set them) :
 
 <img src="retina.jpg">
 
-See https://github.com/rstacruz/sinatra-assetpack/pull/121
+See https://github.com/rstacruz/sinatra-assetpack/pull/121

data/lib/sinatra/assetpack.rb

@@ -9,7 +9,7 @@ module Sinatra
     # Returns a list of formats that can be served.
     # Anything not in this list will be rejected.
     def self.supported_formats
-      @supported_formats ||= %w(css js png jpg gif svg otf eot ttf woff htc)
+      @supported_formats ||= %w(css js png jpg gif svg otf eot ttf woff htc ico)
     end
 
     # Returns a map of what MIME format each Tilt type returns.
@@ -37,7 +37,7 @@ module Sinatra
       out
     end
 
-    # Clear Tilt::Cache (used for primarily for tests)
+    # Clear Tilt::Cache (used primarily for tests)
     def self.clear_tilt_cache!(cache, app)
       cache.clear
       #app.clear_tilt_cache = false  # Maybe it can be an option on app we can enable/disable?

data/lib/sinatra/assetpack/helpers.rb

@@ -10,12 +10,17 @@ module Sinatra
       end
 
       def img(src, options={})
-        attrs = { :src => HtmlHelpers.get_file_uri(src, settings.assets) }
+        attrs = { :src => image_path(src) }
         attrs = attrs.merge(options)
 
         "<img#{HtmlHelpers.kv attrs} />"
       end
 
+      def image_path(src)
+        file_path = HtmlHelpers.get_file_uri(src, settings.assets)
+        File.join(request.script_name, file_path)
+      end
+
       def show_asset_pack(type, *args)
         names = Array.new
         while args.first.is_a?(Symbol)

data/lib/sinatra/assetpack/options.rb

@@ -216,7 +216,7 @@ module Sinatra
       # Returns the local file for a given URI path.
       # Returns nil if a file is not found.
       def local_file_for(request)
-        request.squeeze!('/')
+        request = request.squeeze('/')
         serve_path, from = served.detect { |path, _| request.start_with?(path) }
 
         return if !from

data/lib/sinatra/assetpack/package.rb

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

data/lib/sinatra/assetpack/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module AssetPack
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
 
     # @deprecated Please use AssetPack::VERSION instead
     def self.version

data/sinatra-assetpack.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'jsmin'
   s.add_dependency 'rack-test'
   s.add_dependency 'sinatra'
-  s.add_dependency 'tilt', '>= 1.3.0'
+  s.add_dependency 'tilt', '>= 1.3.0', '< 2.0'
 
   # Supported preprocessors (each is optional)
   s.add_development_dependency 'coffee-script'

data/test/app/app.rb

@@ -76,5 +76,11 @@ class Main < Sinatra::Base
       != css :application, :media => 'screen'
     }.strip
   end
+
+  get '/helpers/email' do
+    haml %{
+      != img '/images/email.png'
+    }.strip
+  end
 end
 

data/test/helpers_test.rb

@@ -6,6 +6,8 @@ class HelpersTest < UnitTest
   Main.get('/helper/css/all') { css :application, :sq }
   Main.get('/helper/css/app') { css :application }
   Main.get('/helper/css/sq') { css :sq }
+  Main.get('/helper/foo_path') { image_path '/images/foo.jpg' }
+  Main.get('/helper/email_path') { image_path '/images/email.png' }
 
   test "img non-existing" do
     get '/helper/foo'
@@ -26,6 +28,26 @@ class HelpersTest < UnitTest
     assert body =~ %r{src='/images/email.[a-f0-9]{32}.png'}
   end
 
+  test "image_path non-existing" do
+    get '/helper/foo_path'
+
+    assert body == "/images/foo.jpg"
+  end
+
+  test "image_path existing (development)" do
+    app.stubs(:development?).returns(true)
+    get '/helper/email_path'
+
+    assert body == "/images/email.png"
+  end
+
+  test "image_path existing (production)" do
+    app.stubs(:development?).returns(false)
+    get '/helper/email_path'
+
+    assert body =~ %r{\A/images/email.[a-f0-9]{32}.png\z}
+  end
+
   test "css" do
     re = Array.new
     get '/helper/css/app'; re << body

data/test/local_file_test.rb

@@ -32,4 +32,13 @@ class LocalFileTest < UnitTest
     fn = App.assets.local_file_for '/images/404.jpg'
     assert fn.nil?
   end
+
+  test "local file for (with remote url)" do
+    url  = 'http://example.com/images/200.jpg'
+    copy = url.dup
+    fn   = App.assets.local_file_for copy
+    assert fn.nil?
+    assert_equal url, copy
+  end
+
 end

data/test/subpath_test.rb

@@ -19,6 +19,18 @@ class SubpathTest < UnitTest
     assert body =~ %r{link rel='stylesheet' href='/subpath/css/application.[a-f0-9]{32}.css' media='screen'}
   end
 
+  test "helpers img (mounted on a subpath, development)" do
+    Main.settings.stubs(:environment).returns(:development)
+    get '/subpath/helpers/email'
+    assert body =~ %r{src='/subpath/images/email.png'}
+  end
+
+  test "helpers img (mounted on a subpath, production)" do
+    Main.settings.stubs(:environment).returns(:production)
+    get '/subpath/helpers/email'
+    assert body =~ %r{src='/subpath/images/email.[a-f0-9]{32}.png'}
+  end
+
   test '/subpath/js/hello.js (plain js)' do
     get '/subpath/js/hello.js'
     assert body == '$(function() { alert("Hello"); });'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -30,160 +30,166 @@ cert_chain:
   kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
   e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
   -----END CERTIFICATE-----
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsmin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stylus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Package your assets for Sinatra.
@@ -193,8 +199,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -327,20 +333,20 @@ homepage: http://github.com/rstacruz/sinatra-assetpack
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
+post_install_message: |
   ##################################################
   #  NOTE FOR UPGRADING FROM PRE-3.0.0 VERSION     #
   ##################################################
 
   Please note that sinatra-assetpack `img` helper method
-  no more set the image width and height because this default
-  behavior is not desirable with most recent CSS techniques
+  no longer sets the image width and height. This default
+  behavior is not desirable with more recent CSS techniques
   regarding high resolutions images for "retina" displays
-  ans "responsive" design CSS using for exemple width:100%.
+  and "responsive" design CSS using, for example, width:100%.
 
   <img src="retina.jpg" width="1200" height="600">
 
-  Is now simply this (unless you explicity set them) :
+  Is now simply this (unless you explicitly set them) :
 
   <img src="retina.jpg">
 
@@ -350,17 +356,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Asset packager for Sinatra.