relaton-bib 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd9ee52233758a976f5f9d4e549c61c899a643afddf3486215b219b868041d76
-  data.tar.gz: dc9878b905a4412fe8237f71a422f23252a7f9933e882e1d502333890e00ba1d
+  metadata.gz: de6c6f8d155863ad2ac349a7f700057304a853d49bef05cccef7d0b18f077efa
+  data.tar.gz: 3507f0906a299bfa8cd08a052077bc3293f1814414d29f3a1ffe53979bdd1532
 SHA512:
-  metadata.gz: 07d38211e4b0e19152e0c92341902f3a93482795c4cd1b019e67b33dd95edfba630cd9c474f8b3c930bf36dee99f346f8142f49252e296a2867580ffb53082ba
-  data.tar.gz: 3a070a16d70d30bc72750325d314ab548938d224e58aa584748572be85b4e5e66d94b8ca204583faa40231adacd86a0eec1ea4d40c4d4261ab2dbc484492d7db
+  metadata.gz: a36b8aaca8049117da0b969df10e60ea09d3788b5e1e337073bb9b2a38add00319343a813db4e4b403f7a88a391b2c404c50bdd360aee7d5da9334c8d3a8b0ba
+  data.tar.gz: 5192b67352e20fbdbcc9ab491cd9161a2bde3c526ad99ccd8829f1c967e2d4eda12ff92be2022e218269d5a0fe9aaa2925519bd8c49cb9c8faebbf124e87a610

data/grammars/isodoc.rng

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -864,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>

data/lib/relaton_bib.rb

@@ -1,5 +1,7 @@
+require "forwardable"
 require "relaton_bib/version"
 require "relaton_bib/deep_dup"
+require "relaton_bib/localized_string"
 require "relaton_bib/bibliographic_item"
 require "relaton_bib/hit_collection"
 require "relaton_bib/hit"
@@ -34,7 +36,7 @@ module RelatonBib
 
   # @param array [Array]
   # @return [Array<String>, String]
-  def single_element_array(array) # rubocop:disable Metrics/CyclomaticComplexity
+  def single_element_array(array) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     if array.size > 1
       array.map { |e| e.is_a?(String) ? e : e.to_hash }
     else

data/lib/relaton_bib/biblio_note.rb

@@ -1,4 +1,31 @@
 module RelatonBib
+  class BiblioNoteCollection
+    extend Forwardable
+
+    def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
+                   :each, :map, :reduce, :detect, :length
+
+    def initialize(notes)
+      @array = notes
+    end
+
+    # @param bibnote [RelatonBib::BiblioNote]
+    # @return [self]
+    def <<(bibnote)
+      @array << bibnote
+      self
+    end
+
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts)
+      bnc = @array.select { |bn| bn.language&.include? opts[:lang] }
+      bnc = @array unless bnc.any?
+      bnc.each { |bn| bn.to_xml opts[:builder] }
+    end
+  end
+
   class BiblioNote < FormattedString
     # @return [String, NilClass]
     attr_reader :type

data/lib/relaton_bib/bibliographic_date.rb

@@ -6,7 +6,8 @@ module RelatonBib
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed
-               updated issued transmitted copied unchanged circulated adapted].freeze
+               updated issued transmitted copied unchanged circulated adapted
+               vote-started vote-ended].freeze
 
     # @return [String]
     attr_reader :type

data/lib/relaton_bib/bibliographic_item.rb

@@ -45,7 +45,7 @@ module RelatonBib
     attr_reader :id, :type, :docnumber, :edition, :doctype
 
     # @!attribute [r] title
-    # @return [Array<RelatonBib::TypedTitleString>]
+    # @return [RelatonBib::TypedTitleStringCollection]
 
     # @return [Array<RelatonBib::TypedUri>]
     attr_reader :link
@@ -59,10 +59,10 @@ module RelatonBib
     # @return [Array<RelatonBib::ContributionInfo>]
     attr_reader :contributor
 
-    # @return [RelatonBib::BibliongraphicItem::Version, NilClass]
+    # @return [RelatonBib::BibliographicItem::Version, NilClass]
     attr_reader :version
 
-    # @return [Array<RelatonBib::BiblioNote>]
+    # @return [RelatonBib::BiblioNoteCollection]
     attr_reader :biblionote
 
     # @return [Array<String>] language Iso639 code
@@ -126,7 +126,8 @@ module RelatonBib
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # @param id [String, NilClass]
-    # @param title [Array<RelatonBib::TypedTitleString>]
+    # @param title [RelatonBib::TypedTitleStringCollection,
+    #   Array<Hash, RelatonBib::TypedTitleString>]
     # @param formattedref [RelatonBib::FormattedRef, NilClass]
     # @param type [String, NilClass]
     # @param docid [Array<RelatonBib::DocumentIdentifier>]
@@ -136,7 +137,7 @@ module RelatonBib
     # @param docstatus [RelatonBib::DocumentStatus, NilClass]
     # @param edition [String, NilClass]
     # @param version [RelatonBib::BibliographicItem::Version, NilClass]
-    # @param biblionote [Array<RelatonBib::BiblioNote>]
+    # @param biblionote [RelatonBib::BiblioNoteCollection]
     # @param series [Array<RelatonBib::Series>]
     # @param medium [RelatonBib::Medium, NilClas]
     # @param place [Array<String, RelatonBib::Place>]
@@ -193,9 +194,7 @@ module RelatonBib
         warn %{[relaton-bib] document type "#{args[:type]}" is invalid.}
       end
 
-      @title = (args[:title] || []).map do |t|
-        t.is_a?(Hash) ? TypedTitleString.new(t) : t
-      end
+      @title = TypedTitleStringCollection.new(args[:title])
 
       @date = (args[:date] || []).map do |d|
         d.is_a?(Hash) ? BibliographicDate.new(d) : d
@@ -224,7 +223,7 @@ module RelatonBib
       @docnumber      = args[:docnumber]
       @edition        = args[:edition]
       @version        = args[:version]
-      @biblionote     = args.fetch :biblionote, []
+      @biblionote     = args.fetch :biblionote, BiblioNoteCollection.new([])
       @language       = args.fetch :language, []
       @script         = args.fetch :script, []
       @status         = args[:docstatus]
@@ -262,7 +261,7 @@ module RelatonBib
     # @return [RelatonBib::FormattedString, Array<RelatonBib::FormattedString>]
     def abstract(lang: nil)
       if lang
-        @abstract.detect { |a| a.language.include? lang }
+        @abstract.detect { |a| a.language&.include? lang }
       else
         @abstract
       end
@@ -300,14 +299,18 @@ module RelatonBib
       "#{makeid(identifier, false)}#{year}"
     end
 
-    # @param builder [Nokogiri::XML::Builder, NillClass] (nil)
-    # @return [String]
-    def to_xml(builder = nil, **opts, &block)
-      if builder
-        render_xml builder, **opts, &block
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [Symbol, NilClass] :date_format (:short), :full
+    # @option opts [String, Symbol] :lang language
+    # @return [String] XML
+    def to_xml(**opts, &block)
+      if opts[:builder]
+        render_xml **opts, &block
       else
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
-          render_xml xml, **opts, &block
+          render_xml builder: xml, **opts, &block
         end.doc.root.to_xml
       end
     end
@@ -387,12 +390,10 @@ module RelatonBib
       bibtex.to_s
     end
 
-    # @param lang [String] language code Iso639
-    # @return [Array<RelatonIsoBib::TypedTitleString>]
+    # @param lang [String, nil] language code Iso639
+    # @return [RelatonIsoBib::TypedTitleStringCollection]
     def title(lang: nil)
-      if lang then @title.select { |t| t.title.language&.include? lang }
-      else @title
-      end
+      @title.lang lang
     end
 
     # @param type [Symbol] type of url, can be :src/:obp/:rss
@@ -420,7 +421,7 @@ module RelatonBib
       me.disable_id_attribute
       me.relation << DocumentRelation.new(type: "instance", bibitem: self)
       me.language.each do |l|
-        me.title.delete_if { |t| t.type == "title-part" }
+        me.title.delete_title_part!
         ttl = me.title.select do |t|
           t.type != "main" && t.title.language&.include?(l)
         end
@@ -665,35 +666,40 @@ module RelatonBib
     # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     # rubocop:disable Style/NestedParenthesizedCalls, Metrics/BlockLength
 
-    # @param builder [Nokogiri::XML::Builder]
-    # @return [String]
-    def render_xml(builder, **opts)
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] bibdata
+    # @option opts [Symbol, NilClass] :date_format (:short), :full
+    # @option opts [String] :lang language
+    def render_xml(**opts)
       root = opts[:bibdata] ? :bibdata : :bibitem
-      xml = builder.send(root) do
+      xml = opts[:builder].send(root) do |builder|
         builder.fetched fetched if fetched
-        title.each { |t| builder.title { t.to_xml builder } }
+        title.to_xml **opts
         formattedref&.to_xml builder
         link.each { |s| s.to_xml builder }
-        docidentifier.each { |di| di.to_xml builder }
+        docidentifier.each { |di| di.to_xml **opts }
         builder.docnumber docnumber if docnumber
         date.each { |d| d.to_xml builder, **opts }
         contributor.each do |c|
           builder.contributor do
-            c.role.each { |r| r.to_xml builder }
-            c.to_xml builder
+            c.role.each { |r| r.to_xml **opts }
+            c.to_xml **opts
           end
         end
         builder.edition edition if edition
         version&.to_xml builder
-        biblionote.each { |n| n.to_xml builder }
+        biblionote.to_xml **opts
         opts[:note]&.each do |n|
           builder.note(n[:text], format: "text/plain", type: n[:type])
         end
         language.each { |l| builder.language l }
         script.each { |s| builder.script s }
-        abstract.each { |a| builder.abstract { a.to_xml(builder) } }
+        abstr = abstract.select { |ab| ab.language&.include? opts[:lang] }
+        abstr = abstract unless abstr.any?
+        abstr.each { |a| builder.abstract { a.to_xml(builder) } }
         status&.to_xml builder
-        copyright&.each { |c| c.to_xml builder }
+        copyright&.each { |c| c.to_xml **opts }
         relation.each { |r| r.to_xml builder, **opts }
         series.each { |s| s.to_xml builder }
         medium&.to_xml builder
@@ -702,7 +708,9 @@ module RelatonBib
         accesslocation.each { |al| builder.accesslocation al }
         license.each { |l| builder.license l }
         classification.each { |cls| cls.to_xml builder }
-        keyword.each { |kw| builder.keyword { kw.to_xml(builder) } }
+        kwrd = keyword.select { |kw| kw.language&.include? opts[:lang] }
+        kwrd = keyword unless kwrd.any?
+        kwrd.each { |kw| builder.keyword { kw.to_xml(builder) } }
         validity&.to_xml builder
         if block_given? then yield builder
         elsif opts[:bibdata] && (doctype || editorialgroup || ics&.any? ||

data/lib/relaton_bib/bibtex_parser.rb

@@ -6,7 +6,7 @@ module RelatonBib
     class << self
       # @param bibtex [String]
       # @return [Hash{String=>RelatonBib::BibliographicItem}]
-      def from_bibtex(bibtex)
+      def from_bibtex(bibtex) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         BibTeX.parse(bibtex).reduce({}) do |h, bt|
           h[bt.key] = BibliographicItem.new(
             id: bt.key,
@@ -35,7 +35,7 @@ module RelatonBib
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::DocumentIdentifier>]
-      def fetch_docid(bibtex)
+      def fetch_docid(bibtex) # rubocop:disable Metrics/AbcSize
         docid = []
         docid << DocumentIdentifier.new(id: bibtex.isbn.to_s, type: "isbn") if bibtex["isbn"]
         docid << DocumentIdentifier.new(id: bibtex.lccn.to_s, type: "lccn") if bibtex["lccn"]
@@ -67,17 +67,17 @@ module RelatonBib
       end
 
       # @param bibtex [BibTeX::Entry]
-      # @return [Array<Hash>]
+      # @return [RelatonBib::TypedTitleStringCollection]
       def fetch_title(bibtex)
         title = []
         title << { type: "main", content: bibtex.title.to_s } if bibtex["title"]
         title << { type: "main", content: bibtex.subtitle.to_s } if bibtex["subtitle"]
-        title
+        TypedTitleStringCollection.new title
       end
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<Hash>]
-      def fetch_contributor(bibtex)
+      def fetch_contributor(bibtex) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
         contributor = []
         fetch_person(bibtex["author"]).each do |entity|
           contributor << { entity: entity, role: [{ type: "author" }] }
@@ -94,7 +94,7 @@ module RelatonBib
         if bibtex["institution"]
           contributor << {
             entity: { name: bibtex.institution.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }]
+            role: [{ type: "distributor", description: ["sponsor"] }],
           }
         end
 
@@ -145,11 +145,11 @@ module RelatonBib
       end
 
       # @param bibtex [BibTeX::Entry]
-      # @return [Array<RelatonBib::BiblioNote>]
+      # @return [RelatonBib::BiblioNoteCollection]
       def fetch_note(bibtex)
         bibtex.select do |k, _v|
           %i[annote howpublished comment note content].include? k
-        end.reduce([]) do |mem, note|
+        end.reduce(BiblioNoteCollection.new([])) do |mem, note|
           type = case note[0]
                  when :note then nil
                  when :content then "tableOfContents"
@@ -164,13 +164,14 @@ module RelatonBib
       def fetch_relation(bibtex)
         return [] unless bibtex["booktitle"]
 
-        title = TypedTitleString.new(type: "main", content: bibtex.booktitle.to_s)
-        [{ type: "partOf", bibitem: BibliographicItem.new(title: [title]) }]
+        ttl = TypedTitleString.new(type: "main", content: bibtex.booktitle.to_s)
+        title = TypedTitleStringCollection.new [ttl]
+        [{ type: "partOf", bibitem: BibliographicItem.new(title: title) }]
       end
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::BibItemLocality>]
-      def fetch_extent(bibtex)
+      def fetch_extent(bibtex) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         bibtex.select do |k, _v|
           %i[chapter pages volume].include? k
         end.reduce([]) do |mem, loc|
@@ -188,13 +189,13 @@ module RelatonBib
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::Series>]
-      def fetch_series(bibtex)
+      def fetch_series(bibtex) # rubocop:disable Metrics/MethodLength
         series = []
         if bibtex["journal"]
           series << Series.new(
             type: "journal",
             title: TypedTitleString.new(content: bibtex.journal.to_s),
-            number: bibtex["number"]&.to_s,
+            number: bibtex["number"]&.to_s
           )
         end
 
@@ -207,7 +208,7 @@ module RelatonBib
 
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::TypedUri>]
-      def fetch_link(bibtex)
+      def fetch_link(bibtex) # rubocop:disable Metrics/AbcSize
         link = []
         link << TypedUri.new(type: "src", content: bibtex.url.to_s) if bibtex["url"]
         link << TypedUri.new(type: "doi", content: bibtex.doi.to_s) if bibtex["doi"]
@@ -242,4 +243,4 @@ module RelatonBib
       end
     end
   end
-end
+end

data/lib/relaton_bib/contribution_info.rb

@@ -31,11 +31,15 @@ module RelatonBib
       end
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.role(type: type) do
-        description.each do |d|
-          builder.description { |desc| d.to_xml(desc) }
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize
+      opts[:builder].role(type: type) do |builder|
+        desc = description.select { |d| d.language&.include? opts[:lang] }
+        desc = description unless desc.any?
+        desc.each do |d|
+          builder.description { |b| d.to_xml(b) }
         end
       end
     end
@@ -83,9 +87,11 @@ module RelatonBib
       @role   = role.map { |r| ContributorRole.new(**r) }
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      entity.to_xml builder
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String, Symbol] :lang language
+    def to_xml(**opts)
+      entity.to_xml **opts
     end
 
     # @return [Hash]

data/lib/relaton_bib/contributor.rb

@@ -129,12 +129,16 @@ module RelatonBib
       @description  = description
     end
 
-    # @params builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.affiliation do
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize
+      opts[:builder].affiliation do |builder|
         builder.name { name.to_xml builder } if name
-        description.each { |d| builder.description { d.to_xml builder } }
-        organization.to_xml builder
+        desc = description.select { |d| d.language&.include? opts[:lang] }
+        desc = description unless desc.any?
+        desc.each { |d| builder.description { d.to_xml builder } }
+        organization.to_xml **opts
       end
     end
 
@@ -151,7 +155,7 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer]
     # @return [String]
-    def to_asciibib(prefix = "", count = 1)
+    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize
       pref = prefix.empty? ? prefix : prefix + "."
       out = count > 1 ? "#{pref}affiliation::\n" : ""
       out += name.to_asciibib "#{pref}affiliation.name" if name

data/lib/relaton_bib/copyright_association.rb

@@ -38,19 +38,21 @@ module RelatonBib
       @scope = scope
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.copyright do
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String, Symbol] :lang language
+    def to_xml(**opts)
+      opts[:builder].copyright do |builder|
         builder.from from ? from.year : "unknown"
         builder.to to.year if to
-        owner.each { |o| builder.owner { o.to_xml builder } }
+        owner.each { |o| builder.owner { o.to_xml **opts } }
         builder.scope scope if scope
       end
     end
     # rubocop:enable Metrics/AbcSize
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       owners = single_element_array(owner.map { |o| o.to_hash["organization"] })
       hash = {
         "owner" => owners,

data/lib/relaton_bib/document_identifier.rb

@@ -45,10 +45,15 @@ module RelatonBib
     #
     # Add docidentifier xml element
     #
-    # @param [Nokogiri::XML::Builder] builder
-    #
-    def to_xml(builder)
-      element = builder.docidentifier id
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize
+      lid = if type == "URN" && opts[:lang]
+              id.sub %r{(?<=:)(?:\w{2},)*?(#{opts[:lang]})(?:,\w{2})*}, '\1'
+            else id
+            end
+      element = opts[:builder].docidentifier lid
       element[:type] = type if type
       element[:scope] = scope if scope
     end

data/lib/relaton_bib/document_relation.rb

@@ -63,7 +63,7 @@ module RelatonBib
       opts.delete :note
       builder.relation(type: type) do
         builder.description { description.to_xml builder } if description
-        bibitem.to_xml(builder, **opts.merge(embedded: true))
+        bibitem.to_xml(**opts.merge(builder: builder, embedded: true))
         locality.each { |l| l.to_xml builder }
         source_locality.each { |l| l.to_xml builder }
       end
@@ -71,7 +71,7 @@ module RelatonBib
     # rubocop:enable Metrics/AbcSize
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = { "type" => type, "bibitem" => bibitem.to_hash }
       hash["description"] = description.to_hash if description
       hash["locality"] = single_element_array(locality) if locality&.any?

data/lib/relaton_bib/document_relation_collection.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-require "forwardable"
-
 module RelatonBib
   # Document relation collection
   class DocRelationCollection
     extend Forwardable
 
     def_delegators :@array, :<<, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :detect, :map, :length
+                   :each, :detect, :map, :reduce, :length
 
     # @param relation [Array<RelatonBib::DocumentRelation, Hash>]
     # @option relation [String] :type

data/lib/relaton_bib/document_status.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-
-require "relaton_bib/localized_string"
-
 module RelatonBib
   # Document status.
   class DocumentStatus

data/lib/relaton_bib/hash_converter.rb

@@ -58,7 +58,8 @@ module RelatonBib
       def title_hash_to_bib(ret)
         return unless ret[:title]
 
-        ret[:title] = array(ret[:title]).reduce([]) do |m, t|
+        ret[:title] = array(ret[:title])
+          .reduce(TypedTitleStringCollection.new) do |m, t|
           if t.is_a?(Hash) then m << t
           else
             m + TypedTitleString.from_string(t)
@@ -139,20 +140,14 @@ module RelatonBib
         )
       end
 
-      def biblionote_hash_to_bib(ret) # rubocop:disable Metrics/MethodLength
+      def biblionote_hash_to_bib(ret) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         return unless ret[:biblionote]
 
         ret[:biblionote] = array(ret[:biblionote])
-        (ret[:biblionote])&.each_with_index do |n, i|
-          ret[:biblionote][i] = if n.is_a?(String)
-                                  BiblioNote.new content: n
-                                else
-                                  BiblioNote.new(
-                                    content: n[:content], type: n[:type],
-                                    language: n[:language], script: n[:script],
-                                    format: n[:format]
-                                  )
-                                end
+          .reduce(BiblioNoteCollection.new([])) do |mem, n|
+          mem << if n.is_a?(String) then BiblioNote.new content: n
+                 else BiblioNote.new(n)
+                 end
         end
       end
 
@@ -178,7 +173,7 @@ module RelatonBib
         DocumentStatus::Stage.new(**args)
       end
 
-      def contributors_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      def contributors_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength,Metrics/PerceivedComplexity
         return unless ret[:contributor]
 
         ret[:contributor] = array(ret[:contributor])
@@ -209,6 +204,9 @@ module RelatonBib
         org[:identifier] = array(org[:identifier])&.map do |a|
           OrgIdentifier.new(a[:type], a[:id])
         end
+        org[:subdivision] = array(org[:subdivision]).map do |sd|
+          LocalizedString.new sd
+        end
         org
       end
 

data/lib/relaton_bib/hit.rb

@@ -20,7 +20,7 @@ module RelatonBib
 
     # @return [String]
     def inspect
-      "<#{self.class}:#{format('%#.14x', object_id << 1)} "\
+      "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} "\
       "@text=\"#{@hit_collection&.text}\" "\
       "@fetched=\"#{!@fetch.nil?}\" "\
       "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
@@ -31,13 +31,17 @@ module RelatonBib
       raise "Not implemented"
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder = nil, **opts)
-      if builder
-        fetch.to_xml builder, **opts
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String, Symbol] :lang language
+    # @return [String] XML
+    def to_xml(**opts)
+      if opts[:builder]
+        fetch.to_xml **opts
       else
         builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
-          fetch.to_xml xml, **opts
+          fetch.to_xml **opts.merge(builder: xml)
         end
         builder.doc.root.to_xml
       end

data/lib/relaton_bib/hit_collection.rb

@@ -4,7 +4,8 @@ module RelatonBib
   class HitCollection
     extend Forwardable
 
-    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size, :each, :each_slice
+    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size, :each,
+                   :each_slice, :reduce
 
     # @return [TrueClass, FalseClass]
     attr_reader :fetched
@@ -36,12 +37,17 @@ module RelatonBib
       self
     end
 
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String, Symbol] :lang language
+    # @return [String] XML
     def to_xml(**opts)
       builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
         xml.documents do
           @array.each do |hit|
             hit.fetch
-            hit.to_xml xml, **opts
+            hit.to_xml **opts.merge(builder: xml)
           end
         end
       end
@@ -49,8 +55,8 @@ module RelatonBib
     end
 
     def select(&block)
-      me = self.deep_dup
-      array_dup = self.instance_variable_get(:@array).deep_dup
+      me = deep_dup
+      array_dup = instance_variable_get(:@array).deep_dup
       me.instance_variable_set(:@array, array_dup)
       array_dup.select!(&block)
       me

data/lib/relaton_bib/localized_string.rb

@@ -49,7 +49,7 @@ module RelatonBib
     end
 
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def to_xml(builder) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       return unless content
 
       if content.is_a?(Array)
@@ -62,7 +62,7 @@ module RelatonBib
     end
 
     # @return [Hash]
-    def to_hash # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       if content.is_a? String
         return content unless language || script
 
@@ -77,7 +77,7 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer] number of elements
     # @return [String]
-    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       pref = prefix.empty? ? prefix : prefix + "."
       if content.is_a? String
         out = count > 1 ? "#{prefix}::\n" : ""

data/lib/relaton_bib/organization.rb

@@ -55,7 +55,7 @@ module RelatonBib
     # @return [RelatonBib::LocalizedString, NilClass]
     attr_reader :abbreviation
 
-    # @return [RelatonBib::LocalizedString, NilClass]
+    # @return [Array<RelatonBib::LocalizedString>]
     attr_reader :subdivision
 
     # @return [Array<RelatonBib::OrgIdentifier>]
@@ -63,11 +63,11 @@ module RelatonBib
 
     # @param name [String, Hash, Array<String, Hash>]
     # @param abbreviation [RelatoBib::LocalizedString, String]
-    # @param subdivision [RelatoBib::LocalizedString, String]
+    # @param subdivision [Array<RelatoBib::LocalizedString>]
     # @param url [String]
     # @param identifier [Array<RelatonBib::OrgIdentifier>]
     # @param contact [Array<RelatonBib::Address, RelatonBib::Contact>]
-    def initialize(**args) # rubocop:disable Metrics/AbcSize
+    def initialize(**args) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       raise ArgumentError, "missing keyword: name" unless args[:name]
 
       super(url: args[:url], contact: args.fetch(:contact, []))
@@ -79,17 +79,23 @@ module RelatonBib
               end
 
       @abbreviation = localized_string args[:abbreviation]
-      @subdivision  = localized_string args[:subdivision]
+      @subdivision  = (args[:subdivision] || []).map do |sd|
+        localized_string sd
+      end
       @identifier   = args.fetch(:identifier, [])
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder) # rubocop:disable Metrics/AbcSize
-      builder.organization do
-        name.each do |n|
-          builder.name { |b| n.to_xml b }
-        end
-        builder.subdivision { |s| subdivision.to_xml s } if subdivision
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+      opts[:builder].organization do |builder|
+        nm = name.select { |n| n.language&.include? opts[:lang] }
+        nm = name unless nm.any?
+        nm.each { |n| builder.name { |b| n.to_xml b } }
+        sbdv = subdivision.select { |sd| sd.language&.include? opts[:lang] }
+        sbdv = subdivision unless sbdv.any?
+        sbdv.each { |sd| builder.subdivision { sd.to_xml builder } }
         builder.abbreviation { |a| abbreviation.to_xml a } if abbreviation
         builder.uri url if uri
         identifier.each { |identifier| identifier.to_xml builder }
@@ -98,23 +104,28 @@ module RelatonBib
     end
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = { "name" => single_element_array(name) }
       hash["abbreviation"] = abbreviation.to_hash if abbreviation
       hash["identifier"] = single_element_array(identifier) if identifier&.any?
-      hash["subdivision"] = subdivision.to_hash if subdivision
+      if subdivision&.any?
+        hash["subdivision"] = single_element_array(subdivision)
+      end
       { "organization" => hash.merge(super) }
     end
 
     # @param prefix [String]
     # @param count [Integer]
     # @return [String]
-    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
       pref = prefix.sub /\*$/, "organization"
       out = count > 1 ? "#{pref}::\m" : ""
       name.each { |n| out += n.to_asciibib "#{pref}.name", name.size }
       out += abbreviation.to_asciibib "#{pref}.abbreviation" if abbreviation
-      out += subdivision.to_asciibib "#{pref}.subdivision" if subdivision
+      subdivision.each do |sd|
+        out += "#{pref}.subdivision::" if subdivision.size > 1
+        out += sd.to_asciibib "#{pref}.subdivision"
+      end
       identifier.each { |n| out += n.to_asciibib pref, identifier.size }
       out += super pref
       out

data/lib/relaton_bib/person.rb

@@ -44,23 +44,33 @@ module RelatonBib
       @completename = args[:completename]
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      builder.name do
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String] :lang language
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      opts[:builder].name do |builder|
         if completename
           builder.completename { completename.to_xml builder }
         else
-          prefix.each { |p| builder.prefix { p.to_xml builder } }
-          forename.each { |f| builder.forename { f.to_xml builder } }
-          initial.each { |i| builder.initial { i.to_xml builder } }
+          pref = prefix.select { |p| p.language&.include? opts[:lang] }
+          pref = prefix unless pref.any?
+          pref.each { |p| builder.prefix { p.to_xml builder } }
+          frnm = forename.select { |f| f.language&.include? opts[:lang] }
+          frnm = forename unless frnm.any?
+          frnm.each { |f| builder.forename { f.to_xml builder } }
+          init = initial.select { |i| i.language&.include? opts[:lang] }
+          init = initial unless init.any?
+          init.each { |i| builder.initial { i.to_xml builder } }
           builder.surname { surname.to_xml builder }
-          addition.each { |a| builder.addition { a.to_xml builder } }
+          addn = addition.select { |a| a.language&.include? opts[:lang] }
+          addn = addition unless addn.any?
+          addn.each { |a| builder.addition { a.to_xml builder } }
         end
       end
     end
 
     # @return [Hash]
-    def to_hash # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       hash = {}
       hash["forename"] = single_element_array(forename) if forename&.any?
       hash["initial"] = single_element_array(initial) if initial&.any?
@@ -73,7 +83,7 @@ module RelatonBib
 
     # @param pref [String]
     # @return [String]
-    def to_asciibib(pref) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def to_asciibib(pref) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
       prf = pref.empty? ? pref : pref + "."
       prf += "name."
       out = forename.map do |fn|
@@ -170,11 +180,13 @@ module RelatonBib
       @identifier = identifier
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.person do
-        name.to_xml builder
-        affiliation.each { |a| a.to_xml builder }
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [String, Symbol] :lang language
+    def to_xml(**opts)
+      opts[:builder].person do |builder|
+        name.to_xml **opts
+        affiliation.each { |a| a.to_xml **opts }
         identifier.each { |id| id.to_xml builder }
         contact.each { |contact| contact.to_xml builder }
       end

data/lib/relaton_bib/place.rb

@@ -25,7 +25,7 @@ module RelatonBib
     # @return [Hash]
     def to_hash
       if uri || region
-        hash = { name: name }
+        hash = { "name" => name }
         hash["uri"] = uri if uri
         hash["region"] = region if region
         hash

data/lib/relaton_bib/structured_identifier.rb

@@ -3,7 +3,8 @@ module RelatonBib
     include RelatonBib
     extend Forwardable
 
-    def_delegators :@collection, :any?, :size, :[], :detect
+    def_delegators :@collection, :any?, :size, :[], :detect, :map, :each,
+                   :reduce
 
     # @param collection [Array<RelatonBib::StructuredIdentifier>]
     def initialize(collection)

data/lib/relaton_bib/typed_title_string.rb

@@ -1,4 +1,76 @@
 module RelatonBib
+  class TypedTitleStringCollection
+    extend Forwardable
+
+    def_delegators :@array, :[], :first, :last, :empty?, :any?, :size,
+                   :each, :detect, :map, :reduce, :length
+
+    # @param title [Array<RelatonBib::TypedTitleString, Hash>]
+    def initialize(title = [])
+      @array = (title || []).map do |t|
+        t.is_a?(Hash) ? TypedTitleString.new(t) : t
+      end
+    end
+
+    # @param lang [String, nil] language code Iso639
+    # @return [RelatonIsoBib::TypedTitleStringCollection]
+    def lang(lang = nil)
+      if lang
+        TypedTitleStringCollection.new select_lang(lang)
+      else self
+      end
+    end
+
+    def delete_title_part!
+      titles.delete_if { |t| t.type == "title-part" }
+    end
+
+    # @return [RelatonBib::TypedTitleStringCollection]
+    def select
+      TypedTitleStringCollection.new(titles.select { |t| yield t })
+    end
+
+    # @param init [Array, Hash]
+    # @return [RelatonBib::TypedTitleStringCollection]
+    # def reduce(init)
+    #   self.class.new @array.reduce(init) { |m, t| yield m, t }
+    # end
+
+    # @param title [RelatonBib::TypedTitleString]
+    # @return [self]
+    def <<(title)
+      titles << title
+      self
+    end
+
+    # @param tcoll [RelatonBib::TypedTitleStringCollection]
+    # @return [RelatonBib::TypedTitleStringCollection]
+    def +(tcoll)
+      TypedTitleStringCollection.new titles + tcoll.titles
+    end
+
+    def titles
+      @array
+    end
+
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] XML builder
+    # @option opts [String, Symbol] :lang language
+    def to_xml(**opts)
+      tl = select_lang(opts[:lang])
+      tl = titles unless tl.any?
+      tl.each { |t| opts[:builder].title { t.to_xml opts[:builder] } }
+    end
+
+    private
+
+    # @param lang [String]
+    # @return [Array<RelatonBib::TypedTitleString]
+    def select_lang(lang)
+      titles.select { |t| t.title.language&.include? lang }
+    end
+  end
+
   class TypedTitleString
     # @return [String]
     attr_reader :type
@@ -38,6 +110,7 @@ module RelatonBib
       end.compact
       tts << new(type: "main", content: ttls.compact.join(" - "),
                  language: lang, script: script)
+      TypedTitleStringCollection.new tts
     end
 
     # @param title [String]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.4.0".freeze
+  VERSION = "1.5.1".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -20,7 +20,7 @@ module RelatonBib
       # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
 
       # @return [Hash]
-      def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity
+      def item_data(bibitem) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         ext = bibitem.at "//ext"
         {
           id: bibitem[:id]&.empty? ? nil : bibitem[:id],
@@ -75,7 +75,7 @@ module RelatonBib
       end
 
       def fetch_note(item)
-        item.xpath("./note").map do |n|
+        bnotes = item.xpath("./note").map do |n|
           BiblioNote.new(
             content: n.text,
             type: n[:type],
@@ -84,6 +84,7 @@ module RelatonBib
             script: n[:script]
           )
         end
+        BiblioNoteCollection.new bnotes
       end
 
       def fetch_language(item)
@@ -98,7 +99,7 @@ module RelatonBib
         end
       end
 
-      def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
+      def fetch_series(item) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/MethodLength,Metrics/PerceivedComplexity
         item.xpath("./series").reduce([]) do |mem, sr|
           abbr = sr.at "abbreviation"
           abbreviation = abbr &&
@@ -164,10 +165,15 @@ module RelatonBib
         end
       end
 
+      # @param item [Nokogiri::XML::Element]
+      # @return [RelatonBib::TypedTitleStringCollection]
       def fetch_titles(item)
-        item.xpath("./title").map { |t| ttitle t }
+        ttl = item.xpath("./title").map { |t| ttitle t }
+        TypedTitleStringCollection.new ttl
       end
 
+      # @param title [Nokogiri::XML::Element]
+      # @return [RelatonBib::TypedTitleString]
       def ttitle(title)
         return unless title
 
@@ -202,7 +208,9 @@ module RelatonBib
                                   abbreviation: elm[:abbreviation])
       end
 
-      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      # @param node [Nokogiri::XML::Elemen]
+      # @return [Array<RelatonBib::BibliographicDate>]
+      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         item.xpath("./date").reduce([]) do |a, d|
           type = d[:type].to_s.empty? ? "published" : d[:type]
           if (on = d.at("on"))
@@ -222,14 +230,15 @@ module RelatonBib
         identifier = org.xpath("./identifier").map do |i|
           OrgIdentifier.new(i[:type], i.text)
         end
+        subdiv = org.xpath("subdivision").map &:text
         Organization.new(name: names,
                          abbreviation: org.at("abbreviation")&.text,
-                         subdivision: org.at("subdivision")&.text,
+                         subdivision: subdiv,
                          url: org.at("uri")&.text,
                          identifier: identifier)
       end
 
-      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         affiliations = person.xpath("./affiliation").map do |a|
           org = a.at "./organization"
           desc = a.xpath("./description").map do |e|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug