jekyll-drawio 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97d28b88662422e5a90c85b6b01faf9195cdd9041ae302dafb55fff94ddfe101
-  data.tar.gz: a822c03eef5073e26e7d494e3b60c9c6b0ee1bea8d0fcbe922d4a02fb30e9539
+  metadata.gz: 77b54ec04817d915d1751c45b42c95c0966a42c9d4bc49db0942a34755a49cc5
+  data.tar.gz: 82a4263627eb1df5cd9f9c94502dc6dc3fb7d468a0d5b2b75ad408e15bd4ab19
 SHA512:
-  metadata.gz: af7f6f4063834fee805f7c2b541a98eee83cc95cf2347028d20120280a69277004b003159d32c1be29d74cb3ae5317c7dff374d941785f21b7de7a6cad29345e
-  data.tar.gz: 5c9e365bfef257cd8164f258b1cb97d87e0d16db5f56f96b1661ed1907ffd33fc79ebfdabe5d27c0ebc02b18c00a77c5a83550a751e440f2e5cd2f4cca03d365
+  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.0.0"
-    end
+  module DrawIO
+    VERSION = "1.1.1"
   end
+end

data/lib/jekyll-drawio.rb

@@ -1,22 +1,54 @@
 require "jekyll"
 require "jekyll-drawio/version"
-require 'nokogiri'
-require 'erb'
+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,
+                :markup,
+                :diagram_extractor
 
-  def initialize(tagName, variables, tokens)
+  def initialize(tagName, markup, tokens)
     super
-    @variables = variables.split " "
     @path_to_diagram = ""
-    @selected_diagram_num = nil
+    @selected_diagram_num = 0
     @diagram_height = 200
-    
-    @variables.each do |variable|
-      param_value_pair = variable.split "="
+    @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)
+
+    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('\"', '')
+        @path_to_diagram = param_value_pair[1].tr('\"', "")
       elsif param_value_pair[0] == "page_number"
         @selected_diagram_num = param_value_pair[1].to_i
       elsif param_value_pair[0] == "height"
@@ -24,36 +56,27 @@ class DrawIOConverter < Liquid::Tag
       end
     end
 
-    puts "path=\"#{ @path_to_diagram}\" page_num=#{ @selected_diagram_num }"
-  end
-
-  def extract_diagram(path, selected_diagram_num)
-    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.content.to_s
-
-    return diagram_name, diagram_content
+    puts "path=\"#{@path_to_diagram}\" page_num=#{@selected_diagram_num}"
   end
 
   def render(context)
-    diagram_name, diagram_content = self.extract_diagram @path_to_diagram, @selected_diagram_num
+    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
 
-    puts "Parsed diagram: name=#{ diagram_name } length=#{ diagram_content.length } height=#{ @diagram_height }"
+    puts "Parsed diagram: name=#{diagram_name} length=#{diagram_content.length} height=#{@diagram_height}"
 
     viewer_url_base = "https://viewer.diagrams.net/?highlight=0000ff&edit=_blank&layers=1&nav=1"
-        viewer_url = "#{ viewer_url_base }&title=#{ encoded_diagram_name }\#R#{ encoded_diagram }"
-    viewer_style = "style=\"width:100%;height:#{ @diagram_height }px\""
+    viewer_url = "#{viewer_url_base}&title=#{encoded_diagram_name}\#R#{encoded_diagram}"
+    viewer_style = "style=\"width:100%;height:#{@diagram_height}px\""
 
-    %Q{<iframe frameborder="0" #{ viewer_style } src="#{ viewer_url }"></iframe>}
+    %Q{<iframe frameborder="0" #{viewer_style} src="#{viewer_url}"></iframe>}
   end
 
-  Liquid::Template.register_tag "drawio", self
+  Liquid::Template.register_tag MODULE_TAG_NAME, self
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-drawio
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Illia Gorbatiuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -30,28 +30,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: erb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        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: '4.0'
+        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