asciidoctor-json-value-loader 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42153124059073f5c20cadd6d3852a9059d4f89942917614902285f389bc03c
-  data.tar.gz: a82a3c5bb0d44202b11d571581a4c233435b09af8f96971e625f59049b77ad8c
+  metadata.gz: 4b86d0a1e7e4af629f5c1dc606436e5d90e46e4cd127f58bdab01302449ca8cc
+  data.tar.gz: 6cf0cd4337d4ac231b8572e6e9fccd5e9ef1328b2fef6533a501de287e3aa497
 SHA512:
-  metadata.gz: 37a37322e6d10e5a367a3e33399342dfa9b17dac40f6a6221add0e8797383d12c20f7e8836e70cfd702f85bfc5956e2bc67043245b9623c0da00eadb26b63f5e
-  data.tar.gz: a75835618b1a14c60c5cba15672b1c8107fa3e73f2cf67a1009b571cd2b7c477eb47185058bceb2d67427704a261667f41d6f9f41243b165a7f684b44ef43177
+  metadata.gz: 792bdf653a388f8f72ebc08e1839e622bb58e8ecfd8f32fe44aa9215215f331574209ac8655a10cee3a9c18e16f95d8bab4b474875f564d1e1fac86cef757b78
+  data.tar.gz: aaf4bbcb76df06811218b4a38a29c7693dc783fcbfe7ab976731ec8fd1e6dc7d98744959b1521e530b32a1f91b4b0af8256436319ce843b81f9ab9da8ba85023

data/lib/asciidoctor-json-value-loader.rb

@@ -2,19 +2,30 @@ require 'asciidoctor'
 require 'json'
 require 'uri'
 
-class JsonValueLoadInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+class JsonValueLoaderFilePathTreeProcessor < Asciidoctor::Extensions::TreeProcessor
+  def process(document)
+    document.set_attr('json-value-loader-target-file', document.attr('docfile'))
+  end
+end
+
+
+class JsonValueLoaderInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
   include Asciidoctor::Logging
 
   use_dsl
 
   named "json-value"
-  name_positional_attributes 'volnum'
+  name_positional_attributes 'delimitter'
+  default_attrs 'delimiter' => '/'
 
   def process parent, target, attrs
 
-    path, query = target.split(':')
+    path, query = target.split(':', 2)
+    delimiter = attrs['delimiter']
+
+    dir = File.dirname(parent.document.attr('json-value-loader-target-file'))
 
-    query = query.split('.').map do |q|
+    query = query.split(delimiter).map do |q|
       decoded = URI.decode_www_form_component(q)
       if decoded.match(/^\d+$/) then
         decoded.to_i
@@ -23,7 +34,8 @@ class JsonValueLoadInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
       end
     end
 
-    json = JSON.parse(File.open(path, 'r:utf-8', &:read))
+    filepath = File.join(dir, path)
+    json = JSON.parse(File.open(File.join(dir, path), 'r:utf-8', &:read))
 
     content = json.dig(*query)
     parent.logger.warn "json-value-loader: #{target} has no value." if content.nil?
@@ -42,5 +54,6 @@ class JsonValueLoadInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
 end
 
 Asciidoctor::Extensions.register do
-  inline_macro JsonValueLoadInlineMacro
+  tree_processor JsonValueLoaderFilePathTreeProcessor
+  inline_macro JsonValueLoaderInlineMacro
 end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-json-value-loader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - msr1k
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-13 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -25,7 +25,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: |
-  Adds asciidoctor a funcitons to load specific JSON value from JSON file
+  Adds asciidoctor a funciton to load specific JSON value from JSON file
+
   (See: https://github.com/msr1k/asciidoctor-json-value-loader)
 email: msr0210@gmail.com
 executables: []