middleman-automatic-clowncar 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5fe147b74631551fc5dddbbd29da5ff5123c98808ca308897ca02dcc52492c
-  data.tar.gz: ece300ff371ad3db04edad4492eaee184774a196f119dc4a40243b96c025a0cd
+  metadata.gz: d761b96d5bf6a8657cc99f709bd1724df3c7bf675dba371003df2ef0d77257de
+  data.tar.gz: 5a7e76e82aa1d3afd78632ea06945f92fc3564f269d1e8a899e8853698050f11
 SHA512:
-  metadata.gz: 04b42bec24020afdf2dd0d762edaa8e87a98236013e5374e7624c837c845745f9c9fd8f187bdf415a307230f17f29bd555cc09f629d8e99591b1c53f1d4147e8
-  data.tar.gz: 28ab53fc3646e7c32a93e5e96cde0874dc7f95e4b76d9881355ed8511d495fe7eb0cdfc6fd4743b8695bf2bbe1bb157d457b7fb3e70d60e65a1145297b6e731a
+  metadata.gz: 14bcffaac1275723bdef8b4f7f6d430727b06723429768662c1d7c2c3745aa0c2ef2ef4857ad8819cfdcbb0f5b9d40a03e0acd22bd65d6be796784b86e696502
+  data.tar.gz: ea815b597181a54ec3ff929c486e3bfd3b98f55ee37c22590cd198e61bfc83638c45292c7842984985e543cfb345b5f565e1e62165d31b8068a2e06881c16aa9

data/features/clowncar_tag_build.feature

@@ -175,6 +175,6 @@ Feature: Generating SVG clowncars during preview mode
     And the file "testfile.html" should contain "@media%20screen%20and%20(max-width:200px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/test-image-small.jpg);%7D%7D"
     And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:201px)%20and%20(max-width:400px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/test-image-medium.jpg);%7D%7D"
     And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:401px)%20and%20(max-width:600px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/test-image-large.jpg);%7D%7D"
-    And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:601px)%7Bsvg%7Bbackground-image:url(/photos/test-image/../test-image.jpg);%7D%7D"
+    And the file "testfile.html" should contain "@media%20screen%20and%20(min-width:601px)%7Bsvg%7Bbackground-image:url(http://localhost:4567/photos/test-image/../test-image.jpg);%7D%7D"
 
 

data/lib/middleman-automatic-clowncar/extension.rb

@@ -75,7 +75,6 @@ module Middleman
         if uri.host
           path
         else
-
           svg_path = File.join(File.dirname(name),File.basename(name,".*"), path)
 
           if is_relative
@@ -158,8 +157,6 @@ module Middleman
 
 
       def generate_svg(name, is_relative, options)
-        #puts "name for generate_svg = #{name}"
-        #puts "options for generate_svg = #{options}"
         sizes, width, height = get_image_sizes(name, options)
 
         fallback_host = false
@@ -168,8 +165,10 @@ module Middleman
           if is_relative_url?(test_path)
             if options.has_key?(:host)
               fallback_host = options[:host]
-            elsif app.config[:asset_host]
+            elsif app.config[:asset_host] # this is for middleman 2 & 3, (and maybe early 4?)
               fallback_host = app.config[:asset_host]
+            elsif app.extensions[:asset_host] # this is for middleman 4+
+              fallback_host = app.extensions[:asset_host].options.host
             else
               warn "WARNING: Inline clowncar images require absolute paths. Please set a :host value"
             end
@@ -195,6 +194,22 @@ module Middleman
           Extension.options_hash[:sizes]
         end
 
+        def automatic_clowncar_escape(str)
+          alpha = "a-zA-Z"
+          alnum = "#{alpha}\\d"
+          unreserved = "\\-_.!~*'()#{alnum}"
+          reserved = ";/?:@&=+$,\\[\\]"
+          unsafe = Regexp.new("[^#{unreserved}#{reserved}]")
+          str.gsub(unsafe) do
+            us = $&
+              tmp = ''
+            us.each_byte do |uc|
+              tmp << sprintf('%%%02X', uc)
+            end
+            tmp
+          end.force_encoding(Encoding::US_ASCII)
+        end
+
         def automatic_clowncar_tag(name, options={})
           internal = ""
 
@@ -220,7 +235,7 @@ module Middleman
             %Q{<object type="image/svg+xml" style="#{object_style}" data-aspect-ratio="#{width.to_f/height.to_f}" data="#{url}">#{internal}</object>}
           else
             data = extensions[:automatic_clowncar].generate_svg(name, true, options)
-            %Q{<object type="image/svg+xml" style="#{object_style}" data-aspect-ratio="#{width.to_f/height.to_f}" data="data:image/svg+xml,#{::URI.escape(data)}">#{internal}</object>}
+            %Q{<object type="image/svg+xml" style="#{object_style}" data-aspect-ratio="#{width.to_f/height.to_f}" data="data:image/svg+xml,#{automatic_clowncar_escape(data)}">#{internal}</object>}
           end
         end
 

data/lib/middleman-automatic-clowncar/version.rb

@@ -1,3 +1,3 @@
 module MiddlemanAutomaticClowncar
-  VERSION = "4.0.2"
+  VERSION = "4.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-automatic-clowncar
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4
 platform: ruby
 authors:
 - Jeremy Green