sinatra-assetpack 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 188c63c21768ada8ce6b04d78d71cc57a0910379
-  data.tar.gz: 54d64ece5af1de3334eafa6cc35caae866b7ce3c
+  metadata.gz: d663bf9909c651baf667925dc70d3e434e3df7d5
+  data.tar.gz: 44e7f4b6b69d7ef2de0405d38b64a0d75fc95416
 SHA512:
-  metadata.gz: eb6d31246a8b947ca3fcc032b3d98638ca913c1cfffc9cbb567e7649286999bc0d112137382bd43023b32c4e926f67a301ae8ab7335f03fa518d4c2903be9768
-  data.tar.gz: 033400d94121789374c1a5b770a22362d6a50fe4706056a54535d033c347bf560a854411cc489c4490c9c21ae59aaa9d2f01b110d14f9ee860eb6234c63a8dee
+  metadata.gz: 661a0a911bc4f8deb66185be8ea943d025efb80f26b85a337873830989d4113a7b6e66bbc44b19be9ac1734dae684d9841022f82c2aabbff940449785906ef4f
+  data.tar.gz: 9c4cca3b82255e195c06044604afda72582e5ba09d85081b3ec8230460b9141ef39a4e49c87f760b114cd816e5d795c35b10d2e95cec862e7ca7df544be1e3ae

data.tar.gz.sig

@@ -1,2 +1 @@
-���R�{�54x����x��.s�Y^	�� b�Q�A�#��G�����e���a[PK2"Kw���6�M��.�Qq!p�l@�e����I'f��1�X�
-�ʬ6�ߛ#=���F���R@2��I�\Ի�2�$����sX�C�'�v�7�����0�Z�{�0+��pz�k��J�5���v�9�/�z7wK���*=�pJ��꓏�_��9�nWA�tD��؟�ϖ���3�fsc�Z�Jȕ��Y
+$����$ܯ�
��P��~��W!7�բ�W�@�`�Z7��<�
���j3�#7/�O�2�`�8�E_ar$q��}ʲ�2,A¹����x]����9A��Jݹ���Y�Λc��+f�ӂ1׎��M�����)<_��D�^ȏ��\QD8�=��X��̰�%v��=����JAa� k�1���:����gv����,G�^Rƙnlq���{C�r��<<����]�Ll�$Z��LJ�;��ֹ���s�dO��	sF@�

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v0.2.8 - June 25, 2013
+
+### Fixed
+  * CSS preprocessing should not rewriting external url or not served assets. (#116)
+
 ## v0.2.7 - June 22, 2013
 
 ### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.2.7)
+    sinatra-assetpack (0.2.8)
       jsmin
       rack-test
       sinatra
@@ -18,7 +18,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.1)
+    coffee-script-source (1.6.2)
     columnize (0.3.6)
     commonjs (0.2.6)
     contest (0.1.3)
@@ -31,33 +31,33 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     gem-release (0.6.0)
-    haml (4.0.0)
+    haml (4.0.3)
       tilt
     jsmin (1.0.1)
-    less (2.3.1)
+    less (2.3.2)
       commonjs (~> 0.2.6)
     metaclass (0.0.1)
-    mocha (0.13.3)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.0)
+    multi_json (1.7.7)
     open4 (1.3.0)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
-    sass (3.2.7)
+    rake (10.1.0)
+    sass (3.2.9)
     sinatra (1.4.3)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    stylus (0.7.1)
+    stylus (0.7.2)
       execjs
       stylus-source
     stylus-source (0.31.0)
-    tilt (1.3.5)
-    uglifier (1.3.0)
+    tilt (1.4.1)
+    uglifier (2.1.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     yui-compressor (0.9.6)

data/lib/sinatra/assetpack/css.rb

@@ -3,32 +3,34 @@ require 'uri'
 module Sinatra
   module AssetPack
     module Css
-      def self.preproc(str, assets)
-        str.gsub(/url\((["']?)(?!["']?data:)(.*?)(["']?)\)/) { |url|
-          css_url = URI.parse($2)
-          file = css_url.path
-          options = css_url.query
-          local = assets.local_file_for file
-
-          url = if local
-            if options.to_s.include?('embed')
-              to_data_uri(local)
-            else
-              url = HtmlHelpers.get_file_uri(file, assets)
-              serve = URI(url)
-              serve.query = css_url.query
-              serve.fragment = css_url.fragment
-              serve.to_s
-            end
-          else
-            $2
-          end
-
-          "url(#{$1}#{url}#{$3})"
-        }
+      def self.preproc(source, assets)
+        source.gsub(/url\((["']?)(.*?)(["']?)\)/) do |match|
+          uri = URI.parse($2)
+
+          # Not a valid complete url
+          next match if uri.path.nil?
+
+          # Not found in served assets
+          local = assets.local_file_for(uri.path)
+          next match if local.nil?
+
+          asset_url = build_url(assets, local, uri)
+          "url(#{$1}#{asset_url}#{$3})"
+        end
+      end
+
+      def self.build_url(assets, local, uri)
+        if uri.query && uri.query.include?('embed')
+          build_data_uri(local)
+        else
+          serve = URI(HtmlHelpers.get_file_uri(uri.path, assets))
+          serve.query = uri.query
+          serve.fragment = uri.fragment
+          serve.to_s
+        end
       end
 
-      def self.to_data_uri(file)
+      def self.build_data_uri(file)
         require 'base64'
 
         data = File.read(file)

data/lib/sinatra/assetpack/options.rb

@@ -218,7 +218,9 @@ module Sinatra
         return if !from
 
         path = File.join(expand_from(from), request.sub(serve_path, ''))
-        path if File.exist?(path)
+        return if !File.file?(path)
+
+        path
       end
 
       # Returns the local file for a given URI path. (for dynamic files)

data/lib/sinatra/assetpack/version.rb

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

data/test/app/app.rb

@@ -3,6 +3,8 @@ $:.unshift File.expand_path('../../../lib', __FILE__)
 require 'sinatra/base'
 require 'sinatra/assetpack'
 require 'coffee-script'
+require 'sass'
+require 'haml'
 
 class Main < Sinatra::Base
   set :root, File.dirname(__FILE__)

data/test/app/app/css/style.css

@@ -1,3 +1,4 @@
 div { color: red; }
 body { background: url(/images/background.jpg); }
 #nonexistent { background: url(/images/404.png); }
+@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700');

data/test/asset_host_test.rb

@@ -54,8 +54,7 @@ class AssetHostTest < UnitTest
     app.stubs(:development?).returns(false)
     get '/css/style.css'
     assert body =~ /background: url\(\/\/cdn-[0|1].example.org\/images\/background.[a-f0-9]{32}.jpg\)/
-
-    # does not alter non-existing files (design or flaw???)
+    # Does not alter not served assets
     assert body.include?('background: url(/images/404.png)')
   end
 

data/test/preproc_test.rb

@@ -15,12 +15,18 @@ class PreprocTest < UnitTest
     assert body =~ %r{background.[a-f0-9]{32}.jpg}
   end
 
-  test "no cache-busting number for non-existent images" do
+  test "no cache-busting hash for non-existent images" do
     app.stubs(:development?).returns(false)
     get '/css/style.css'
     assert body.include?('background: url(/images/404.png)')
   end
 
+  test "no cache-busting hash for non-existent images" do
+    app.stubs(:development?).returns(false)
+    get '/css/style.css'
+    assert body.include?("@import url('//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700');")
+  end
+
   test "preproc on minify" do
     app.stubs(:clear_cache).returns(true)
     app.stubs(:development?).returns(false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -30,7 +30,7 @@ cert_chain:
   kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
   e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
   -----END CERTIFICATE-----
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsmin