relaton-render 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b834b958e0a0c893b641087a171141972d18626cd01c66bce85e29a898d4fa40
-  data.tar.gz: 44b06318fdd7c00cca50fb0b309a84faaa26f914bade814f2a4389998076e7a1
+  metadata.gz: d4f484dc0f8b679d7aa4e200ea5288c7b08120ed482eb50dbb4feb6d8f4ebc18
+  data.tar.gz: 5775265c429b2861268f838b794d8a2a874c6caa789b73d77b4e1e6983b7a57e
 SHA512:
-  metadata.gz: cd66e65e6a282d5926701f28965bcb6e857acc4fb675936effd18e7c40b957c9ec645522bdbea2ff50f7f12b5db44bddb1a3d66b1ca986b113b9cba38bd0a8fc
-  data.tar.gz: ad226183da8ff58d03f8b8cc75e9795b20a503f5c73adb6df6210f5c95382da1992a51d86a19acd526c38977d010437bc64171943704ce15f8c7586af9558af1
+  metadata.gz: 4fd197eee29210c266c87a38b195a6358d8446aefac03baac057b15a93524b2f590c5470ed1ae419595b986067d20f725878e058574acd146b0435e4eebce8be
+  data.tar.gz: b53ec5cadb07fe27883468c83b1799ed0191efaa56cf5bf11715f0320a4d9c0329ce99e7447e8b558b2ae1ebac953f42c20e6f83f7a3831bee952c27452992bf

data/lib/relaton/render/general/render.rb

@@ -4,7 +4,7 @@ require_relative "uri"
 require "yaml"
 require "liquid"
 require "date"
-require "relaton_bib"
+require "relaton/bib"
 require "metanorma-utils"
 require_relative "../template/template"
 require_relative "../../../isodoc/i18n"
@@ -162,11 +162,25 @@ module Relaton
       end
 
       def xml2relaton(bib)
-        bib.is_a?(Nokogiri::XML::Element) and
-          bib = bib.to_xml(encoding: "UTF-8", indent: 0,
-                           save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
-        bib.is_a?(String) && Nokogiri::XML(bib).errors.empty? and
-          bib = RelatonBib::XMLParser.from_xml(bib) or bib
+        bib.is_a?(Relaton::Bib::ItemData) and return bib
+        xml = xml_string2noko(bib)
+        bib = xml.to_xml(encoding: "UTF-8", indent: 0,
+                         save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+          .gsub(/ xmlns="[^"]*"/, "")
+        Relaton::Bib::Bibitem.from_xml(bib)
+      end
+
+      def xml_string2noko(bib)
+        case bib
+        when String
+          xml = Nokogiri::XML(bib)
+          xml.errors.empty? or return bib
+          xml.root
+        when Nokogiri::XML::Element
+          bib
+        when Nokogiri::XML::Document
+          bib.root
+        end
       end
 
       def fmtref(doc)
@@ -198,7 +212,7 @@ module Relaton
       end
 
       def also_pub_as(doc)
-        r = doc.relation.select { |x| x.type == "hasRepresentation" }
+        r = Array(doc.relation).select { |x| x.type == "hasRepresentation" }
         r.map do |x|
           _, out = render_single_bibitem(x.bibitem)
           @i18n.select(nil).also_pub_as + out
@@ -252,7 +266,7 @@ module Relaton
         p = Nokogiri::XML(bib) or return
         (p.errors.empty? && p.root.at("./bibitem")) or return nil
         p.root.xpath("./bibitem").each_with_object([]) do |b, m|
-          m << RelatonBib::XMLParser.from_xml(b.to_xml)
+          m << Relaton::Bib::Bibitem.from_xml(b.to_xml)
         end
       end
 

data/lib/relaton/render/parse/parse_contributors.rb

@@ -3,6 +3,9 @@ module Relaton
     class Parse
       def content(node)
         node.nil? and return node
+        node.is_a?(String) and
+          return node.strip.gsub("</title>", "").gsub("<title>", "")
+            .gsub(/>\n\s*</, "><").gsub(/\n\s*/, " ")
         node.content.is_a?(Array) and return node.content.map { |x| content(x) }
         ret = node.content.strip
           .gsub("</title>", "").gsub("<title>", "")
@@ -35,7 +38,7 @@ module Relaton
       end
 
       def extract_initials(person)
-        initials = content(person.name.initials)&.sub(/(.)\.?$/, "\\1.")
+        initials = content(person.name.formatted_initials)&.sub(/(.)\.?$/, "\\1.")
           &.split /(?<=\.) /
         initials ||= person.name.forename.map(&:initial)
           .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
@@ -44,13 +47,13 @@ module Relaton
 
       def forenames_parse(person)
         person.name.forename.map do |x|
-          x.content.empty? ? esc("#{x.initial}.") : content(x)
+          x.content.nil? || x.content.empty? ? esc("#{x.initial}.") : content(x)
         end
       end
 
       # de S. => one initial, M.-J. => one initial
       def initials_parse(person)
-        i = content(person.name.initials) or
+        i = content(person.name.formatted_initials) or
           return person.name.forename.map(&:initial)
               .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
 
@@ -63,10 +66,8 @@ module Relaton
       end
 
       def extractname(contributor)
-        org = contributor.entity if contributor.entity
-          .is_a?(RelatonBib::Organization)
-        person = contributor.entity if contributor.entity
-          .is_a?(RelatonBib::Person)
+        org = contributor.organization
+        person = contributor.person
         return { nonpersonal: extract_orgname(org) } if org
         return extract_personname(person) if person
 
@@ -75,8 +76,9 @@ module Relaton
 
       def contributor_role(contributors)
         contributors.length.positive? or return nil
-        desc = contributors[0].role.first.description.join("\n")
-        type = contributors[0].role.first.type
+        role = contributors[0].role.first
+        desc = Array(role&.description).map(&:content).join("\n")
+        type = role&.type
         desc.empty? ? type : desc
       end
 
@@ -98,17 +100,17 @@ module Relaton
           add.nil? and next
           cr = add and break
         end
-        cr.nil? and cr = doc.contributor
+        cr.nil? and cr = Array(doc.contributor)
         cr
       end
 
       def datepick(date)
         date.nil? and return nil
-        on = date.on
+        at = date.at
         from = date.from
         to = date.to
-        on and return { on: on }
-        from and return { from: from, to: to }
+        at and return { on: at.to_s }
+        from and return { from: from.to_s, to: to&.to_s }
         nil
       end
 
@@ -122,22 +124,22 @@ module Relaton
 
       # year-only
       def date(doc, host)
-        ret = date1(doc.date)
-        host and ret ||= date1(host.date)
+        ret = date1(Array(doc.date))
+        host and ret ||= date1(Array(host.date))
         datepick(ret)&.transform_values do |v|
           v&.sub(/-.*$/, "")
         end
       end
 
       def date_updated(doc, host)
-        ret = doc.date.detect { |x| x.type == "updated" }
-        host and ret ||= host.date.detect { |x| x.type == "updated" }
+        ret = Array(doc.date).detect { |x| x.type == "updated" }
+        host and ret ||= Array(host.date).detect { |x| x.type == "updated" }
         datepick(ret)
       end
 
       def date_accessed(doc, host)
-        ret = doc.date.detect { |x| x.type == "accessed" }
-        host and ret ||= host.date.detect { |x| x.type == "accessed" }
+        ret = Array(doc.date).detect { |x| x.type == "accessed" }
+        host and ret ||= Array(host.date).detect { |x| x.type == "accessed" }
         datepick(ret)
       end
 
@@ -153,8 +155,8 @@ module Relaton
         host and x ||= pick_contributor(host, "publisher")
         x.nil? and return nil
         x.map do |c|
-          content(c.entity.abbreviation) ||
-            content(c.entity.name.first)
+          content(c.organization.abbreviation) ||
+            content(c.organization.name.first)
         end
       end
 
@@ -175,8 +177,8 @@ module Relaton
       end
 
       def pick_contributor(doc, role)
-        ret = doc.contributor.select do |c|
-          c.role.any? { |r| r.type == role }
+        ret = Array(doc.contributor).select do |c|
+          Array(c.role).any? { |r| r.type == role }
         end
         ret.empty? ? nil : ret
       end

data/lib/relaton/render/parse/parse_extract.rb

@@ -2,18 +2,18 @@ module Relaton
   module Render
     class Parse
       def host(doc)
-        doc.relation.detect { |r| r.type == "includedIn" }&.bibitem
+        doc.relation&.detect { |r| r.type == "includedIn" }&.bibitem
       end
 
       # TODO : first is naive choice
       def title(doc)
-        doc.nil? || doc.title.empty? and return nil
-        t = doc.title.select { |x| x.title.language&.include? @lang }
-        t.empty? and t = doc.title
+        doc.nil? || doc.title.nil? || doc.title.empty? and return nil
+        t = Array(doc.title).select { |x| x.language == @lang }
+        t.empty? and t = Array(doc.title)
         t1 = t.select { |x| x.type == "main" }
         t1.empty? and t1 = t
         t1.first or return
-        esc(content(t1.first.title))
+        esc(content(t1.first))
       end
 
       def medium(doc, host)
@@ -25,9 +25,9 @@ module Relaton
 
       def size(doc)
         x = doc.size or return nil
-        x.size.each_with_object({}) do |v, m|
+        x.value.each_with_object({}) do |v, m|
           m[v.type] ||= []
-          m[v.type] << v.value
+          m[v.type] << v.content
         end
       end
 
@@ -42,8 +42,8 @@ module Relaton
       end
 
       def place(doc, host)
-        x = doc.place
-        x.empty? && host and x = host.place
+        x = Array(doc.place)
+        x.empty? && host and x = Array(host.place)
         x.empty? and return x
         x.map { |p| place1(p) }
       end
@@ -52,26 +52,24 @@ module Relaton
         c = place.city
         r = place.region
         n = place.country
-        c.nil? && r.empty? && n.empty? and return place.name
-        ret = [c] + r.map(&:name) + n.map(&:name)
-        ret.compact
-        #@i18n.l10n(ret.compact.join(", "))
+        c.nil? && r.empty? && n.empty? and return place.formatted_place
+        [c, *r.map(&:content), *n.map(&:content)].compact.join(", ")
       end
 
       def series(doc)
-        doc.series.detect { |s| s.type == "main" } ||
-          doc.series.detect { |s| s.type.nil? } ||
-          doc.series.first
+        doc.series&.detect { |s| s.type == "main" } ||
+          doc.series&.detect { |s| s.type.nil? } ||
+          doc.series&.first
       end
 
       def series_title(series, _doc)
         series.nil? and return nil
-        series.title.respond_to?(:titles) && !series.title.titles.empty? and
-          return content(series.title.titles.first.title)
-        series.title.respond_to?(:title) and
-          return content(series.title.title)
-        series.title.respond_to?(:formattedref) and
-          content(series.formattedref)
+        t = Array(series.title).select { |x| x.language == @lang }
+        t.empty? and t = Array(series.title)
+        t1 = t.select { |x| x.type == "main" }
+        t1.empty? and t1 = t
+        t1.first.nil? and return nil
+        content(t1.first)
       end
 
       def series_formatted(series, _doc)
@@ -99,7 +97,8 @@ module Relaton
       end
 
       def series_place(series, _doc)
-        series.place
+        p = series.place or return nil
+        place1(p)
       end
 
       def series_dates(series, _doc)
@@ -112,7 +111,7 @@ module Relaton
       def access_location(doc, host)
         x = doc.accesslocation || host&.accesslocation or
           return nil
-        x.first
+        Array(x).first
       end
 
       def included(type)
@@ -121,7 +120,7 @@ module Relaton
 
       def type(doc)
         type = doc.type and return type
-        doc.relation.any? { |r| r.type == "includedIn" } and return "inbook"
+        doc.relation&.any? { |r| r.type == "includedIn" } and return "inbook"
         "book"
       end
 
@@ -149,25 +148,34 @@ module Relaton
 
       def localized_string_or_text(str)
         case str
-        when RelatonBib::LocalizedString then content(str)
+        when Relaton::Bib::LocalizedString then content(str)
         when String then str
         end
       end
 
       def extent(doc)
-        doc.extent.each_with_object([]) do |e, acc|
+        Array(doc.extent).each_with_object([]) do |e, acc|
           case e
-          when RelatonBib::Extent, RelatonBib::LocalityStack
-            a = e.locality.each_with_object([]) do |e1, m|
-              if e1.is_a?(RelatonBib::LocalityStack)
-                m << extent1(e1.locality)
-              else
-                m.empty? and m << {}
-                m[-1].merge!(extent1(Array(e1)))
+          when Relaton::Bib::Extent, Relaton::Bib::LocalityStack
+            if e.locality.any?
+              a = e.locality.each_with_object([]) do |e1, m|
+                if e1.is_a?(Relaton::Bib::LocalityStack)
+                  m << extent1(e1.locality)
+                else
+                  m.empty? and m << {}
+                  m[-1].merge!(extent1(Array(e1)))
+                end
+              end
+              acc << a
+            else
+              Array(e.locality_stack).each do |stack|
+                a = stack.locality.each_with_object([{}]) do |e1, m|
+                  m[-1].merge!(extent1(Array(e1)))
+                end
+                acc << a
               end
             end
-            acc << a
-          when RelatonBib::Locality
+          when Relaton::Bib::Locality
             acc << extent1(Array(e))
           end
         end
@@ -184,7 +192,7 @@ module Relaton
       end
 
       def status(doc)
-        v = doc&.status&.stage&.value
+        v = doc&.status&.stage&.content
         #@i18n.get.dig("stage", v) || v
       end
     end

data/lib/relaton/render/parse/parse_id.rb

@@ -2,7 +2,7 @@ module Relaton
   module Render
     class Parse
       # filter applied across full list of auth_id
-      def auth_id_filter(ids)
+      def auth_id_filter(ids = [])
         id_scope_filter(ids)
       end
 
@@ -44,12 +44,12 @@ module Relaton
 
       def authoritative_identifier(doc)
         out = []
-        [auth_id_filter(doc.docidentifier), doc.docidentifier].each do |a|
+        [auth_id_filter(Array(doc.docidentifier)), Array(doc.docidentifier)].each do |a|
           out = authoritative_identifier_select(a)
           out.empty? or break
         end
         # prevent l10n of identifier contents
-        out.map(&:id).map { |i| esc(i.strip) }
+        out.map(&:content).map { |i| esc(i.strip) }
       end
 
       def authoritative_identifier_select(idents)
@@ -70,10 +70,10 @@ module Relaton
       end
 
       def other_identifier(doc)
-        doc.docidentifier.each_with_object([]) do |id, ret|
+        Array(doc.docidentifier).each_with_object([]) do |id, ret|
           type = id_type_norm(id)
           other_identifier_include.include? type or next
-          ret << [type, id.id]
+          ret << [type, id.content]
         end
       end
 
@@ -82,10 +82,10 @@ module Relaton
       end
 
       def doi(doc)
-        out = doc.docidentifier.each_with_object([]) do |id, ret|
+        out = Array(doc.docidentifier).each_with_object([]) do |id, ret|
           type = id.type&.sub(/^(DOI)\..*$/i, "\\1") or next
           type.casecmp("doi").zero? or next
-          ret << id.id
+          ret << id.content
         end
         out.empty? ? nil : out.map { |i| esc(i.strip) }
       end
@@ -97,10 +97,10 @@ module Relaton
       end
 
       def biblio_tag(doc)
-        ret = doc.docidentifier.detect do |id|
+        ret = Array(doc.docidentifier).detect do |id|
           id.scope&.downcase == "biblio-tag"
         end
-        ret&.id
+        ret&.content
       end
 
       def uri(doc)
@@ -108,19 +108,19 @@ module Relaton
         %w(citation uri src).each do |t|
           uri = uri_type_select(doc, t) and break
         end
-        uri ||= doc.link.detect do |u|
+        uri ||= Array(doc.source).detect do |u|
           u.language == @lang && !u.type&.casecmp("doi")&.zero?
         end
-        uri ||= doc.link.detect { |u| !u.type&.casecmp("doi")&.zero? }
+        uri ||= Array(doc.source).detect { |u| !u.type&.casecmp("doi")&.zero? }
         uri or return nil
         uri.content.to_s.strip
       end
 
       def uri_type_select(doc, type)
-        uri = doc.link.detect do |u|
+        uri = Array(doc.source).detect do |u|
           u.type&.downcase == type && u.language == @lang
         end and return uri
-        uri = doc.link.detect { |u| u.type&.downcase == type } and return uri
+        uri = Array(doc.source).detect { |u| u.type&.downcase == type } and return uri
         nil
       end
     end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "1.0.5".freeze
+    VERSION = "1.1.0".freeze
   end
 end

data/relaton-render.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "liquid", "~> 5"
   spec.add_dependency "metanorma-utils", "~> 2"
   spec.add_dependency "nokogiri"
-  spec.add_dependency "relaton-bib", ">= 1.20.0"
+  spec.add_dependency "relaton-bib", ">= 2.0.0.pre.alpha.6", "< 3"
   spec.add_dependency "twitter_cldr"
   spec.add_dependency "tzinfo-data" # we need this for windows only
   # spec.metadata["rubygems_mfa_required"] = "true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-03-30 00:00:00.000000000 Z
+date: 2026-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -212,14 +212,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 2.0.0.pre.alpha.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 2.0.0.pre.alpha.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: twitter_cldr
   requirement: !ruby/object:Gem::Requirement