sinatra-assetpack 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e742977ba0329b1f960c46f4294fa2cb860d35de
-  data.tar.gz: 45e3dd99cc00c05bf524751f0a1f19e0a8a43693
+  metadata.gz: 55ba0d85167b1dcab1109b1ac78c9e36da5f15fc
+  data.tar.gz: bae9f997d86fda18ef4cb1564142db0463f91665
 SHA512:
-  metadata.gz: 7b2d990a88e9acb49884f9d764fe5c7f8b17b045da773b245200f2ff3a21617429cd525358ca9cc594b859bf7725a8658446a1f53bfe63078f968646f211e719
-  data.tar.gz: 23d6d7a5a7f2cdab53406e16a572ba068d46e3042607595032e19d8560f19ec8f64ffc78cd6adf3ca70a69fc67c7fa8e0cf6fd30e76c5f36441858e958907747
+  metadata.gz: f336d7eef59f6b4bc98ea19c31464bd1c1d564347f919b67cb3ef25b652494772e194898029b2c5569218e81974ffd8864c937906da28abc7a4930dfc6646fae
+  data.tar.gz: 2097ac2b02fbd0fd933a044a64803a71fa685e134e873508dd8490fbc6f08459896eef5eab6ea8c5a8eac1e915f0e0625177196bcdfa81fd3084f03cef3b2fe0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.3.3 - April 29, 2014
+
+  * Fix : Skip CSS preprocessing for malformed URIs (#167)
+  * Fix : Updates dependent require calls on invocation (#168)
+  * Doc : Add doc for asset hosts (#156)
+
 ## v0.3.2 - January 10, 2014
 
   * Change : Support .ico files (#147)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.3.2)
+    sinatra-assetpack (0.3.3)
       jsmin
       rack-test
       sinatra

data/README.md

@@ -560,6 +560,38 @@ class App < Sinatra::Base
 end
 ```
 
+### assets.asset_hosts
+Adds asset hosts to be used in production.
+
+Useful for hosting your assets on CDNs.
+
+``` ruby
+# Usage:
+assets {
+  asset_hosts ['URL1', 'URL2']
+}
+```
+
+#### Example
+In this example, all assets are served from multiple CDN subdomains:
+
+``` ruby
+class App < Sinatra::Base
+  assets {
+    serve '/css',     :from => 'app/css'
+    serve '/js',      :from => 'app/js'
+
+    asset_hosts [
+      '//cdn-0.example.org',
+      '//cdn-1.example.org'
+    ]
+
+    css :a, ["/css/style.css"]
+    js :b, ["/js/hello.js"]
+  }
+end
+```
+
 ## Helpers
 
 These are helpers you can use in your views.

data/certs/j15e.pem

@@ -1,20 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBJMRswGQYDVQQDDBJqZWFu
+MIIDmjCCAoKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRswGQYDVQQDDBJqZWFu
 cGhpbGlwcGUuZG95bGUxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT
-8ixkARkWA2NvbTAeFw0xMzAzMTEyMjM5MjNaFw0xNDAzMTEyMjM5MjNaMEkxGzAZ
+8ixkARkWA2NvbTAeFw0xNDA0MjkyMDM5MjNaFw0xNTA0MjkyMDM5MjNaMEkxGzAZ
 BgNVBAMMEmplYW5waGlsaXBwZS5kb3lsZTEVMBMGCgmSJomT8ixkARkWBWdtYWls
 MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEApQtzOyMoi48Pc0BRF++BXc2ulECpOypwYqnzIdbE5+iLownixYB3KkKm
-VxIlo9pYWIp5JR+Uphv/P9vKJAIjfldtlus6o8xFT0HujXyEMMbFMGHH01PvDYkx
-vnMw5O6YVdtbsKvjknB4JOcOmxQAeXBunLBJk0huOLALlDW38UZF3AKNVPpR+Gst
-gTZCIAPq22wB9I0HYfyCitjrMVK4jTHgjPjNNQn4BhuhkqEWr5JkVtipGCUFyl45
-2ISskOPckLW/qwCq4vyjVK6JIZb2Ei9DHtip44u7KjFEX5QdvHyu81xatMmtKvYn
-WWKZ/2HCdWRRiPSuHmBR/QlMlUN69QIDAQABozkwNzAJBgNVHRMEAjAAMB0GA1Ud
-DgQWBBQk1vhL7od7qZLEfBssQNqzht1wwDALBgNVHQ8EBAMCBLAwDQYJKoZIhvcN
-AQEFBQADggEBADglXYkTD1Btadr2ehKDOSATfLVeh9ThwZ6PeKP8bPWKOrHPbTN8
-Aandvv6g6samg7p/viRwsE29MTAcfqCdFp8v35ase2PyiXrJ0QJP7r3CBo+nwGVO
-hybD84/vTA9CSBaFX2Xtj0dC5o6eW6/vWoVeJUcMNX/O/r8lRWn24WhFkEzW9n1R
-2CVeZs78AXWTyU0l0dyswpav0AczXg4UK3Y2M9oYyBmdfem6m614SOrOFBIGjmF4
-kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
-e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
+CgKCAQEAoy9v4jCylD10QNplfQn2RjDj7e+GOFn1Kv4pZ8opaVqqQjgZPIifHJ00
+PBngH4L27Qn6Q874Bv8klnoFUPKzX3zPun2ot2VQ0facmR83E1g5H9hmZVqtdg+K
+TnauTvKZ64cXfqEJ4dqHxiuYSDqZfHiaOvdbzoL1MJBU1ars7qnRfsvVLAkDja5x
+4DQ+ZJsxFu0xSKDZKdDg1Js1JHfb1oPRXwbiv+clDxSoIWgu5eRMfDY9/mXIfo89
+meeO0/4Ud42gsROVQS32OJLmczJjRj9xY2tTKnIU76vEZouqiLKn8Ylwpb/n9d4W
+Iq8ruVk2Q0XKrSYA2e+kPCt5M1DArQIDAQABo4GMMIGJMAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgSwMB0GA1UdDgQWBBQRseuuQiwORxjEL3SmrCKF18k7HzAnBgNVHREE
+IDAegRxqZWFucGhpbGlwcGUuZG95bGVAZ21haWwuY29tMCcGA1UdEgQgMB6BHGpl
+YW5waGlsaXBwZS5kb3lsZUBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAB2x
+wa3rDskwP2dQT8vlVvNCiBc7lOw4TJkpd9l5wwep+6umh1GIFt80BZ5VomGo+1Sx
+yUuD+VYOaaOLGDF5qqirIn5VDvjNpYKw6s8XKvKawWu61znAZkiklNz9YTog6mo1
+0/2ggQHWuMoSM8ZNUWg6UKRvSiT+3S0gGyfrybepm9ZFiQVFrFkgLQ+Lt/0vzBJD
+osc8G2grd5N2ieCykW2dfdKftrAoHy9zstg0CTTkFHaoQesLfEE6HdGImfIe2qpJ
+vo0Ni/EOoxL0d1qrp9TiARbe5JDIK4KWKJcyJrsOCnAUNwfqwf0riBGpsnCRwQi7
+c8m4yoP9xz6wjpS7gxQ=
 -----END CERTIFICATE-----

data/lib/sinatra/assetpack.rb

@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'sinatra'
 
 module Sinatra
   module AssetPack

data/lib/sinatra/assetpack/css.rb

@@ -5,7 +5,13 @@ module Sinatra
     module Css
       def self.preproc(source, assets)
         source.gsub(/url\((["']?)(.*?)(["']?)\)/) do |match|
-          uri = URI.parse($2)
+
+          # Not parsable by URI.parse
+          begin
+            uri = URI.parse($2)
+          rescue URI::InvalidURIError
+            next match
+          end
 
           # Not a valid complete url
           next match if uri.path.nil?

data/lib/sinatra/assetpack/version.rb

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

data/sinatra-assetpack.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.strip.split("\n")
   s.executables = Dir['bin/*'].map { |f| File.basename(f) }
   s.cert_chain  = ['certs/j15e.pem']
-  s.signing_key = File.expand_path('~/.gem/private_key.pem') if $0 =~ /gem\z/
+  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
   s.required_ruby_version = '>= 1.9.2'
 
   if File.exists?('UPGRADING')

data/test/app/app/css/bad_uri.scss

@@ -0,0 +1,3 @@
+form {
+  background-image: url('data:image/svg+xml;base64, PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSI2cHgiIGhlaWdodD0iM3B4IiB2aWV3Qm94PSIwIDAgNiAzIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA2IDMiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxwb2x5Z29uIHBvaW50cz0iNS45OTIsMCAyLjk5MiwzIC0wLjAwOCwwICIvPjwvc3ZnPg==');
+  }

data/test/preproc_test.rb

@@ -42,9 +42,17 @@ class PreprocTest < UnitTest
   end
 
   test "ignores data-uris" do
-    app.stubs(:clear_cach).returns(true)
+    app.stubs(:clear_cache).returns(true)
     app.stubs(:development?).returns(false)
     get '/css/bariol.css'
     assert body =~ %r{data:application/x-font-woff;charset=utf-8;base64,[A-Za-z0-9=/]{100,}}
   end
+
+  test "skips malformed data-uris" do
+    app.stubs(:clear_cache).returns(true)
+    app.stubs(:development?).returns(false)
+    get '/css/bad_uri.css'
+    puts body
+    assert body =~ %r{data:image/svg\+xml;base64, PHN2ZyB4bW}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Rico Sta. Cruz
@@ -11,26 +11,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRjCCAi6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBJMRswGQYDVQQDDBJqZWFu
+  MIIDmjCCAoKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRswGQYDVQQDDBJqZWFu
   cGhpbGlwcGUuZG95bGUxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT
-  8ixkARkWA2NvbTAeFw0xMzAzMTEyMjM5MjNaFw0xNDAzMTEyMjM5MjNaMEkxGzAZ
+  8ixkARkWA2NvbTAeFw0xNDA0MjkyMDM5MjNaFw0xNTA0MjkyMDM5MjNaMEkxGzAZ
   BgNVBAMMEmplYW5waGlsaXBwZS5kb3lsZTEVMBMGCgmSJomT8ixkARkWBWdtYWls
   MRMwEQYKCZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEApQtzOyMoi48Pc0BRF++BXc2ulECpOypwYqnzIdbE5+iLownixYB3KkKm
-  VxIlo9pYWIp5JR+Uphv/P9vKJAIjfldtlus6o8xFT0HujXyEMMbFMGHH01PvDYkx
-  vnMw5O6YVdtbsKvjknB4JOcOmxQAeXBunLBJk0huOLALlDW38UZF3AKNVPpR+Gst
-  gTZCIAPq22wB9I0HYfyCitjrMVK4jTHgjPjNNQn4BhuhkqEWr5JkVtipGCUFyl45
-  2ISskOPckLW/qwCq4vyjVK6JIZb2Ei9DHtip44u7KjFEX5QdvHyu81xatMmtKvYn
-  WWKZ/2HCdWRRiPSuHmBR/QlMlUN69QIDAQABozkwNzAJBgNVHRMEAjAAMB0GA1Ud
-  DgQWBBQk1vhL7od7qZLEfBssQNqzht1wwDALBgNVHQ8EBAMCBLAwDQYJKoZIhvcN
-  AQEFBQADggEBADglXYkTD1Btadr2ehKDOSATfLVeh9ThwZ6PeKP8bPWKOrHPbTN8
-  Aandvv6g6samg7p/viRwsE29MTAcfqCdFp8v35ase2PyiXrJ0QJP7r3CBo+nwGVO
-  hybD84/vTA9CSBaFX2Xtj0dC5o6eW6/vWoVeJUcMNX/O/r8lRWn24WhFkEzW9n1R
-  2CVeZs78AXWTyU0l0dyswpav0AczXg4UK3Y2M9oYyBmdfem6m614SOrOFBIGjmF4
-  kzgF4O2OL+8O23we4E1LvfRn5gV77Dij6s9V4HHzMBuLwnNb8T+6lOnUWbtiIddD
-  e8c8i7PlrzhVJ/8sXUJsCkyE8d2MyRyjlxM=
+  CgKCAQEAoy9v4jCylD10QNplfQn2RjDj7e+GOFn1Kv4pZ8opaVqqQjgZPIifHJ00
+  PBngH4L27Qn6Q874Bv8klnoFUPKzX3zPun2ot2VQ0facmR83E1g5H9hmZVqtdg+K
+  TnauTvKZ64cXfqEJ4dqHxiuYSDqZfHiaOvdbzoL1MJBU1ars7qnRfsvVLAkDja5x
+  4DQ+ZJsxFu0xSKDZKdDg1Js1JHfb1oPRXwbiv+clDxSoIWgu5eRMfDY9/mXIfo89
+  meeO0/4Ud42gsROVQS32OJLmczJjRj9xY2tTKnIU76vEZouqiLKn8Ylwpb/n9d4W
+  Iq8ruVk2Q0XKrSYA2e+kPCt5M1DArQIDAQABo4GMMIGJMAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBQRseuuQiwORxjEL3SmrCKF18k7HzAnBgNVHREE
+  IDAegRxqZWFucGhpbGlwcGUuZG95bGVAZ21haWwuY29tMCcGA1UdEgQgMB6BHGpl
+  YW5waGlsaXBwZS5kb3lsZUBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAB2x
+  wa3rDskwP2dQT8vlVvNCiBc7lOw4TJkpd9l5wwep+6umh1GIFt80BZ5VomGo+1Sx
+  yUuD+VYOaaOLGDF5qqirIn5VDvjNpYKw6s8XKvKawWu61znAZkiklNz9YTog6mo1
+  0/2ggQHWuMoSM8ZNUWg6UKRvSiT+3S0gGyfrybepm9ZFiQVFrFkgLQ+Lt/0vzBJD
+  osc8G2grd5N2ieCykW2dfdKftrAoHy9zstg0CTTkFHaoQesLfEE6HdGImfIe2qpJ
+  vo0Ni/EOoxL0d1qrp9TiARbe5JDIK4KWKJcyJrsOCnAUNwfqwf0riBGpsnCRwQi7
+  c8m4yoP9xz6wjpS7gxQ=
   -----END CERTIFICATE-----
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsmin
@@ -265,6 +267,7 @@ files:
 - test/app/.gitignore
 - test/app/Rakefile
 - test/app/app.rb
+- test/app/app/css/bad_uri.scss
 - test/app/app/css/bariol.scss
 - test/app/app/css/behavior.htc
 - test/app/app/css/js2c.css