jekyll-drawio 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62bdc02bcf3506343b120c054bfdf6662a4afc0234a504a22c18b90b75f7eb11
-  data.tar.gz: 536dd289302a471dac0601b518736a3ab8ca0c105bf5522b0bf46382a4c97386
+  metadata.gz: 77b54ec04817d915d1751c45b42c95c0966a42c9d4bc49db0942a34755a49cc5
+  data.tar.gz: 82a4263627eb1df5cd9f9c94502dc6dc3fb7d468a0d5b2b75ad408e15bd4ab19
 SHA512:
-  metadata.gz: d9a38fae82bcac537cf5a9e2379270e1f18107024acf66ce6db81289e51eb192e35636f09e4acc539ce14c3e5632eb2785a183745592c7456f148b687ed6da6c
-  data.tar.gz: a845ed537bdf20b61e7e950d80672daf426bfa1e1172580ca0d260e23bacba4838ea22d8ce967fd9d386c4de36650dbd8e0f89c77f012c23447b8e27e894fcf4
+  metadata.gz: bb92b079556c1bde06902b2e550c47151ae2cdbdaa8cd239bbf601a62aac3312776d81939ecd0c81d653000d5a2015cfefaa7d70bb711fbbd01fa484138370c3
+  data.tar.gz: 3acea9b0f8d1adf3a94ef49c02710a97213441bc9a0f66f66458959e0276c259b1c0ae9cfddde77bd13270a9b80bbf94d4886629167020e2249ae5ac91fd000d

data/lib/diagram_extractor.rb

@@ -0,0 +1,18 @@
+class DiagramExtractor
+  def initialize
+  end
+
+  def extract_diagram(path, diagram_num)
+    doc = File.open(path) { |f| Nokogiri::XML(f) }
+    diagrams = doc.xpath("//mxfile//diagram")
+    puts "Diagrams found at \"#{path}\": #{diagrams.length}. " \
+         "Selected: #{diagram_num}. "
+
+    diagram = diagrams[diagram_num]
+
+    diagram_name = diagram["name"]
+    diagram_content = diagram.to_html
+
+    return diagram_name, diagram_content
+  end
+end

data/lib/jekyll-drawio/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module DrawIO
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/jekyll-drawio.rb

@@ -1,21 +1,51 @@
 require "jekyll"
 require "jekyll-drawio/version"
+require "diagram_extractor"
 require "nokogiri"
 require "erb"
 
 MODULE_TAG_NAME = "drawio"
 
+def split_parameters_line(parameters_line)
+  params = []
+  tmp = ""
+
+  parameters_line.each_char do |symbol|
+    if symbol == " "
+      params.push tmp
+      tmp = ""
+    else
+      tmp += symbol
+    end
+  end
+
+  params.push tmp
+  params
+end
+
 class DrawIOConverter < Liquid::Tag
-  attr_accessor :path_to_diagram, :selected_diagram_num, :diagram_height
+  attr_accessor :path_to_diagram,
+                :selected_diagram_num,
+                :diagram_height,
+                :markup,
+                :diagram_extractor
 
-  def initialize(tagName, variables, tokens)
+  def initialize(tagName, markup, tokens)
     super
     @path_to_diagram = ""
-    @selected_diagram_num = nil
+    @selected_diagram_num = 0
     @diagram_height = 200
+    @markup = markup
+    @diagram_extractor = DiagramExtractor.new()
+  end
+
+  def parse_content(context)
+    parameters_line = Liquid::Template.parse(@markup).render context
+    parameters_line.strip!
+    parameters = split_parameters_line(parameters_line)
 
-    variables.each do |variable|
-      param_value_pair = variable.split "="
+    parameters.each do |param|
+      param_value_pair = param.split "="
       if param_value_pair[0] == "path"
         # TODO: find appropriate method to trim the string
         @path_to_diagram = param_value_pair[1].tr('\"', "")
@@ -29,22 +59,13 @@ class DrawIOConverter < Liquid::Tag
     puts "path=\"#{@path_to_diagram}\" page_num=#{@selected_diagram_num}"
   end
 
-  def extract_diagram(path)
-    doc = File.open(path) { |f| Nokogiri::XML(f) }
-    diagrams = doc.xpath("//mxfile//diagram")
-    puts "Diagrams found at \"#{path}\": #{diagrams.length}. " \
-         "Selected: #{@selected_diagram_num}. "
-
-    diagram = diagrams[@selected_diagram_num]
-
-    diagram_name = diagram["name"]
-    diagram_content = diagram.to_html
-
-    return diagram_name, diagram_content
-  end
-
   def render(context)
-    diagram_name, diagram_content = self.extract_diagram @path_to_diagram
+    if @markup.empty?
+      return "Error processing input, incorrect syntax"
+    end
+    parse_content context
+
+    diagram_name, diagram_content = self.diagram_extractor.extract_diagram @path_to_diagram, @selected_diagram_num
     encoded_diagram = ERB::Util.url_encode diagram_content
     encoded_diagram_name = ERB::Util.url_encode diagram_name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-drawio
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Illia Gorbatiuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -42,16 +42,22 @@ dependencies:
   name: erb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: 
 email:
 - ilya.gorbatiuk@gmail.com
@@ -59,6 +65,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/diagram_extractor.rb
 - lib/jekyll-drawio.rb
 - lib/jekyll-drawio/version.rb
 homepage: https://github.com/mutcher/jekyll-drawio
@@ -82,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Jekyll plugin to generate HTML snippets for embedding draw.io diagrams