relaton-bib 1.3.1 → 1.5.0

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

@@ -20,30 +20,40 @@ module RelatonBib
     def remove_part
       case @type
       when "Chinese Standard" then @id.sub!(/\.\d+/, "")
-      else
-        @id.sub!(/-\d+/, "")
+      when "ISO", "IEC" then @id.sub!(/-[^:]+/, "")
+      when "URN" then remove_urn_part
       end
     end
 
     def remove_date
       case @type
       when "Chinese Standard" then @id.sub!(/-[12]\d\d\d/, "")
-      else
-        @id.sub!(/:[12]\d\d\d/, "")
+      when "ISO", "IEC" then @id.sub!(/:[12]\d\d\d/, "")
+      when "URN"
+        @id.sub!(/^(urn:iec:std:[^:]+:[^:]+:)[^:]*/, '\1')
       end
     end
 
     def all_parts
-      @id += " (all parts)"
+      if type == "URN"
+        @id.sub!(%r{^(urn:iec:std(?::[^:]*){4}).*}, '\1:ser')
+      else
+        @id += " (all parts)"
+      end
     end
 
     #
     # 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
@@ -67,5 +77,24 @@ module RelatonBib
       out += "#{pref}docid.id:: #{id}\n"
       out
     end
+
+    private
+
+    def remove_urn_part # rubocop:disable Metrics/MethodLength
+      @id.sub!(%r{^
+        (urn:iso:std:[^:]+ # ISO prefix and originator
+          (?::(?:data|guide|isp|iwa|pas|r|tr|ts|tta)) # type
+          ?:\d+) # docnumber
+        (?::-[^:]+)? # partnumber
+        (?::(draft|cancelled|stage-[^:]+))? # status
+        (?::ed-\d+)?(?::v[^:]+)? # edition and version
+        (?::\w{2}(?:,\w{2})*)? # langauge
+      }x, '\1') # remove partnumber, status, version, and language
+      @id.sub!(%r{^
+        (urn:iec:std:[^:]+ # IEC prefix and originator
+          :\d+) # docnumber
+        (?:-[^:]+)? # partnumber
+      }x, '\1') # remove partnumber
+    end
   end
 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,7 +1,5 @@
 # frozen_string_literal: true
 
-require "forwardable"
-
 module RelatonBib
   # Document relation collection
   class DocRelationCollection

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/editorial_group.rb

@@ -32,5 +32,10 @@ module RelatonBib
         tc.to_asciibib pref, technical_committee.size
       end.join
     end
+
+    # @return [true]
+    def presence?
+      true
+    end
   end
 end

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

@@ -36,12 +36,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 +54,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