middleman-automatic-clowncar 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb5f4a1d2d056c1cbb78aeaa7e7664cda1ccf635d2e59f3f212cd3a86120292
-  data.tar.gz: 64efd1a0055266e1b1088168549cff7235012bba8cccfbcc98ff55c476ef36b5
+  metadata.gz: d761b96d5bf6a8657cc99f709bd1724df3c7bf675dba371003df2ef0d77257de
+  data.tar.gz: 5a7e76e82aa1d3afd78632ea06945f92fc3564f269d1e8a899e8853698050f11
 SHA512:
-  metadata.gz: 39a2c5954571df7fe5bd6cdefb17310ce5e89f10ee7433b47baa134b186820c77deb21d292719fde649536a9549de78182a2dfedcd2b74108325dc8222f280ca
-  data.tar.gz: 8f0d69e6ec729802644bbbfbb4a31ad48c6fc23e13221a6afef149171fe4b0c225969b6f69a4e18a32117c251bff088d47ec347458ed80889b319760912e4287
+  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
@@ -236,8 +235,6 @@ 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)
-            puts "data ==============="
-            puts data
             %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.3"
+  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.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Jeremy Green