feat: ✨ Allow svg in partial without passing "site: site" explicitly (#4

) * Adding parts to the test suite which borked for me * When you don't pass site: site, it breaks * Applying my fix * run format Co-authored-by: Andrew Mason <andrewmcodes@protonmail.com>
andrewmcodes · Jul 20, 2020 · 542aea2 · 542aea2
1 parent b072c40
commit 542aea2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/lib/bridgetown-inline-svg/svg-tag.rb b/lib/bridgetown-inline-svg/svg-tag.rb
@@ -74,7 +74,7 @@ def self.parse_params(markup)
       matched = markup.strip.match(PATH_SYNTAX)
       unless matched
         raise SyntaxError, <<~END
-          Syntax Error in tag 'highlight' while parsing the following markup:
+          Syntax Error in tag 'svg' while parsing the following markup:
           #{markup}
           Valid syntax: svg <path> [property=value]
         END
@@ -119,6 +119,7 @@ def render(context)
       # check if given name is a variable. Otherwise use it as a file name
       svg_file = Bridgetown.sanitized_path(site.source, interpolate(@svg, context))
       return unless svg_file
+
       add_file_to_dependency(site, svg_file, context)
       # replace variables with their current value
       params = split_params(@params, context)
@@ -128,15 +129,16 @@ def render(context)
       end
       # params = @params
       file = File.open(svg_file, "rb").read
-      conf = lookup_variable(context, "site.svg")
+
+      conf = site.config["svg"] || {}
+
       if conf["optimize"] == true
-        xml = SvgOptimizer.optimize(file, [create_plugin(params)] + PLUGINS)
+        SvgOptimizer.optimize(file, [create_plugin(params)] + PLUGINS)
       else
         xml = Nokogiri::XML(file)
         params.each { |key, val| xml.root.set_attribute(key, val) }
-        xml = xml.root.to_xml
+        xml.root.to_xml
       end
-      xml
     end
   end
 end
diff --git a/spec/fixtures/src/_components/navbar.liquid b/spec/fixtures/src/_components/navbar.liquid
@@ -0,0 +1,3 @@
+<div id="component-navbar">
+  {% svg images/square.svg width="100" height="100" %}
+</div>
diff --git a/spec/fixtures/src/_components/partial.liquid b/spec/fixtures/src/_components/partial.liquid
@@ -0,0 +1,3 @@
+<div id="component-partial">
+  {% svg images/square.svg width="100" height="100" %}
+</div>
diff --git a/spec/fixtures/src/_layouts/default.html b/spec/fixtures/src/_layouts/default.html
@@ -6,5 +6,11 @@
   <body>
     THIS IS MY LAYOUT
     {{ content }}
+
+    {% render "navbar" site: site %}
+
+    <div id="layout">
+      {% svg images/square.svg width: 100 height: 100 %}
+    </div>
   </body>
 </html>
diff --git a/spec/fixtures/src/index.html b/spec/fixtures/src/index.html
@@ -40,3 +40,5 @@
 <div id="optimize">
   {% svg /images/{{page.svgname}}.svg data-foo="" %}
 </div>
+
+{% render "partial" %}