relaton-render 3.0.0.pre.alpha.1 → 3.0.0.pre.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f301bc95c707486b2546c988eb50acef801327df7ec89b53f319045fba834e25
-  data.tar.gz: 0c16ff123fddd608086af6d9a4b3577bfe0f828df4304be9e0a031e4afff86e2
+  metadata.gz: b1d41488064d32008b3f44f81635f4bf8e096341adb5434eb270b440b9f7bfbe
+  data.tar.gz: 7b3b00fdadc97f66749d98f028684016a7d917977a3900c2d852a6127e4126f2
 SHA512:
-  metadata.gz: 251ca7594d0e52edd0a42f6bfc840f6fed7a383a9e0f46cc34a20daa720e3c0c455b184169f4448d73aee6cd737d2dd6431a7ff5e05f37b3f3be4eca0584feaa
-  data.tar.gz: 15a48d602d48b469197df9472d0fd7c3304507f50edb5bfdddb4299f6eadafe6d0a1ceb9bf65b706d4f111b379be980e94b12a6c089e2f836f8f8da6aa16251a
+  metadata.gz: 1c73e86c124a5cb571305da9b9dc8ac0a35eeabadc89f2d9fa819ca95edd3bbe097356c4e5e4f2199542c94a0939338bfd3b04d6f1f3933708b266751b5b75c9
+  data.tar.gz: 539376d05813f377ca9d8fa36dff0c023e477daf4c7fb435b487a4e2da22bb98e185f65a1ff3a2e17b838e881028a8f7a3c7de1a27f7c5d7f5f616274f71c349

data/lib/relaton/render/general.rb

@@ -25,21 +25,29 @@ module Relaton
       CiteTemplate = Struct.new(:template_raw)
 
       def initialize(options = {})
+        options = deep_symbolize(options)
         @lang = options[:language] || options[:lang] || "en"
-        @renderer = Iso690::Renderer.new(
-          lang: @lang,
-          script: options[:script] || "Latn",
-          labels: options[:i18nhash] || {},
-        )
+        renderer_opts = { lang: @lang, script: options[:script] || "Latn",
+                          labels: options[:i18nhash] || {} }
+        # A flavor names its own CitationStyle instance (name or YAML path)
+        options[:style] and renderer_opts[:style] = options[:style]
+        @renderer = Iso690::Renderer.new(**renderer_opts)
         warn_general_config if options[:config]
       end
 
-      def render(model, **opts)
-        @renderer.render(model, **opts)
+      def render(model, embedded: false, **opts)
+        model = to_model(model)
+        text =
+          if model.respond_to?(:formattedref) && model.formattedref
+            model.formattedref.content
+          else
+            @renderer.render(model, **opts)
+          end
+        embedded ? text : "<formattedref>#{text}</formattedref>"
       end
 
       def citation(model, **opts)
-        @renderer.citation(model, **opts)
+        @renderer.citation(to_model(model), **opts)
       end
 
       # isodoc's references rendering: renderings[id][:formattedref]
@@ -145,6 +153,26 @@ module Relaton
         end
       end
 
+      # 1.x accepted string- and symbol-keyed options alike (the old
+      # engine deep-symbolized via metanorma-utils); isodoc's bibrenderer
+      # and every flavor still pass string keys.
+      def deep_symbolize(value)
+        case value
+        when Hash then value.to_h { |k, v| [k.to_sym, deep_symbolize(v)] }
+        when Array then value.map { |v| deep_symbolize(v) }
+        else value
+        end
+      end
+
+      # 1.x render/citation accepted a bibitem XML string; the Iso690
+      # engine consumes model instances.
+      def to_model(model)
+        return model unless model.is_a?(String)
+
+        klass = facade_bibitem_class
+        klass.from_xml(model)
+      end
+
       def warn_general_config
         return if General.config_warned
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.1".freeze
+    VERSION = "3.0.0.pre.alpha.3".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.1
+  version: 3.0.0.pre.alpha.3
 platform: ruby
 authors:
 - Ribose Inc.