jekyll-inline-svg 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bf9be464ebca5b3baa4e81c3b7d1a13d5d7742
-  data.tar.gz: 78f54ea9f7fb75ea242b4e2a564215047e1c0ca8
+  metadata.gz: 2eb1e13bf0039d420fd5c05e6624cbf3182280be
+  data.tar.gz: e81cdccb89d2a003a980ec5ac29edde53bea63d5
 SHA512:
-  metadata.gz: 72c858a2f7341528df0df482d0397c2ee7f03cf2e7494bbda9ff5d0197ae282bea8d22f1de486b7322f4258f06be08fb1a571331f4d251e39afc869522c020d0
-  data.tar.gz: 5201dab3105efaf21387ce87c78f38aa133cb6bcc4e81225185218140814ab6c1f63e80e51e29314d7e16036d4230cb9cc06cbcbe62bec0ac5f8dd3d62735da6
+  metadata.gz: e49ad0f22e7fba4f23d79912138923d176da6f0d7cfad4996afe5c18922cd3f958168dbb25bee2bd1b7febab4a8505a20882f165812f9ba3aac079463623572a
+  data.tar.gz: f41352fb1f2b80955bf271b6ba989c27b5961f804591163b091151402a5251ef580d84e5211226ad2af47b18a424bacc450968a11a3eaed084fce0afcf70487f

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.4

data/Gemfile.lock

@@ -1,51 +1,62 @@
 PATH
   remote: .
   specs:
-    jekyll-inline-svg (1.0.0)
+    jekyll-inline-svg (1.0.1)
       jekyll (~> 3.3)
       svg_optimizer (= 0.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
+    concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    ffi (1.9.18)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    ffi (1.9.25)
     forwardable-extended (2.6.0)
-    jekyll (3.5.2)
+    http_parser.rb (0.6.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.8.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
       liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.0)
+    jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.14.0)
+    jekyll-watch (2.0.0)
+      listen (~> 3.0)
+    kramdown (1.17.0)
     liquid (4.0.0)
-    listen (3.0.8)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.2.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    pathutil (0.14.0)
+    mini_portile2 (2.3.0)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
+    public_suffix (3.0.2)
     rake (12.0.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (1.11.1)
+    rouge (3.1.1)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -59,8 +70,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
     rspec-support (3.6.0)
+    ruby_dep (1.5.0)
     safe_yaml (1.0.4)
-    sass (3.5.1)
+    sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -78,4 +90,4 @@ DEPENDENCIES
   rspec (~> 3.6)
 
 BUNDLED WITH
-   1.15.4
+   1.16.2

data/jekyll-inline-svg.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   A Liquid tag to inline and optimize SVG images in your HTML
   Supports custom DOM Attributes parameters and variables interpretation.
   EOF
-  spec.version     = "1.0.1"
+  spec.version     = "1.1.0"
   spec.authors     = ["Sebastien DUMETZ"]
   spec.email       = "s.dumetz@holusion.com"
   spec.homepage    = "https://github.com/sdumetz/jekyll-inline-svg"

data/lib/jekyll-inline-svg.rb

@@ -23,7 +23,7 @@ module Jekyll
 
       #Separate file path from other attributes
       PATH_SYNTAX = %r!
-        ^(?<path>[^\s"']+|"[^"]*"|'[^']*')
+        ^(?<path>[^\s"']+|"[^"]+"|'[^']+')
         (?<params>.*)
       !x
 
@@ -41,9 +41,9 @@ module Jekyll
         (?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.\-#]+))
       !x
 
-      def initialize(tag_name, input, tokens)
+      def initialize(tag_name, markup, tokens)
         super
-        @svg, @params = JekyllInlineSvg.parse_params(input)
+        @svg, @params = JekyllInlineSvg.parse_params(markup)
       end
 
       #lookup Liquid variables from markup in context
@@ -70,11 +70,18 @@ module Jekyll
       end
       #Parse parameters. Returns : [svg_path, parameters]
       # Does not interpret variables as it's done at render time
-      def self.parse_params(input)
-        matched = input.strip.match(PATH_SYNTAX)
-        path = matched["path"].gsub("\"","").gsub("'","").strip
-        markup = matched["params"].strip
-        return path, markup
+      def self.parse_params(markup)
+        matched = markup.strip.match(PATH_SYNTAX)
+        if !matched
+          raise SyntaxError, <<~END
+          Syntax Error in tag 'highlight' while parsing the following markup:
+          #{markup}
+          Valid syntax: svg <path> [property=value]
+          END
+        end
+        path = matched["path"].sub(%r!^["']!,"").sub(%r!["']$!,"").strip
+        params = matched["params"].strip
+        return path, params
       end
       def fmt(params)
         r = params.to_a.select{|v| v[1] != ""}.map {|v| %!#{v[0]}="#{v[1]}"!}
@@ -93,11 +100,22 @@ module Jekyll
         mod.set(params)
         return mod
       end
+      def add_file_to_dependency(site, path, context)
+        if context.registers[:page] && context.registers[:page].key("path")
+          site.regenerator.add_dependency(
+            site.in_source_dir(context.registers[:page]["path"]),
+            path
+          )
+        end
+      end
+
       def render(context)
         #global site variable
         site = context.registers[:site]
         #check if given name is a variable. Otherwise use it as a file name
         svg_file = Jekyll.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)
         #because ie11 require to have a height AND a width

data/spec/jekyll-inline-svg_spec.rb

@@ -13,7 +13,7 @@ describe(Jekyll::Tags::JekyllInlineSvg) do
     Nokogiri::HTML(read(f))
   end
 
-  describe "Parse parameters" do
+  describe "#parse_params" do
     it "parse XML root parameters" do
       svg, params = Jekyll::Tags::JekyllInlineSvg.parse_params("/path/to/foo size=40 style=\"hello\"")
       expect(svg).to eq("/path/to/foo")
@@ -44,6 +44,9 @@ describe(Jekyll::Tags::JekyllInlineSvg) do
       svg, params = Jekyll::Tags::JekyllInlineSvg.parse_params("'/path/to/foo space' id='bar' style=\"hello\"")
       expect(params).to eq("id='bar' style=\"hello\"")
     end
+    it "raise error on invalid syntax" do
+      expect {Jekyll::Tags::JekyllInlineSvg.parse_params("")}.to raise_error (SyntaxError)
+    end
   end
   [
     Jekyll.configuration({

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-inline-svg
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sebastien DUMETZ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A SVG Inliner for Jekyll