relaton-bib 1.12.7 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4b986a04f391a2e552c13d8ee897e73c398f3acb27deda3bb203da627f585b
-  data.tar.gz: 05540e11934396b938df0c902d926c37b1c49c8aa215b7888827bb42d19d4042
+  metadata.gz: 61c7501f15c50370c99043dafc2950b2bb5314725abae9e2c58fc4c2959ee5ac
+  data.tar.gz: b9bc6f11bd966f6155145cb9f9cc22a9ce1873b549ace92b356c29566ab02139
 SHA512:
-  metadata.gz: f82094e85351832f3738216ce8ba72c68f7f26e9bcd7379cbe49b2e9a2bc0318ce1d4507462d3dbfed61ba57fc9bc692daf4998cbc84fb3bc2f54a14bed7e72a
-  data.tar.gz: 66de7c5f7b612c203694d6adacb0fdbf09dd34380f24bfe6e3d298f50d61d52af844f2803f8e75644839ce0b256726db55fc9058a649f9f42c8c3198f6e279ab
+  metadata.gz: f8f4bdccc1d8d2de570471187b5484d49f18b4b58b1f3c87b91dc97ffbe69a277ed890261ca6cbbe298fb2f61f56ca827cb814e70a18015943e63e6d23209305
+  data.tar.gz: d343cbca3b0c3c22e3775c13573c0e06b553f557aa03b592cb249c863f23ecde405c794f0cdd594bdc292e9639d56a21a28ffdec50ee9d1c8a3b6a430056274a

data/.github/workflows/rake.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   rake:
-    uses: relaton/support/.github/workflows/rake.yml@master
+    uses: relaton/support/.github/workflows/rake.yml@master

data/.github/workflows/release.yml

@@ -0,0 +1,22 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: relaton/support/.github/workflows/release.yml@master
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.RELATON_CI_RUBYGEMS_API_KEY }}

data/docs/hash.adoc

@@ -49,7 +49,7 @@ The structure below is given in YAML format:
 # bibliographic item anchor, used to crossreference within document
 id: ISO/TC211
 # date record was created
-fetched: 2019-06-30
+fetched: '2019-06-30'
 # titles are an array, with a mandatory type and content, and optional format, language and script
 title:
   - type: main
@@ -66,9 +66,9 @@ docid:
   type: ISO
   id: TC211
 # document number
-docnumber: 211
+docnumber: '211'
 # edition
-edition: 1
+edition: '1'
 # language is an array
 language:
   - en
@@ -78,7 +78,7 @@ script:
   Latn
 # version contains revision date and draft (as array)
 version:
-  revision_date: 2019-04-01
+  revision_date: '2019-04-01'
   draft: draft
 # note is an array of type and content
 biblionote:
@@ -94,12 +94,12 @@ docstatus:
 # date is an array, with mandatory type, and either an "on" value or a "from" and optional "to" value
 date:
   - type: issued
-    value: 2014
+    value: '2014'
   - type: published
-    from: 2014-04
-    to: 2014-05
+    from: '2014-04'
+    to: '2014-05'
   - type: accessed
-    value: 2015-05-20
+    value: '2015-05-20'
 # abstract is an array, with content, and optional language, script, format
 abstract:
   - content: >
@@ -114,7 +114,8 @@ abstract:
 # as the type.
 # Organisations have attributes name, url, abbreviation, subdivision, contacts, identifiers
 # Persons have attributes name, affiliation, contacts
-# Person names have attributes surname, completename, initials, forename, additions, prefixes.
+# Person names have attributes, given, surname, additions, prefixes or completename.
+# Given has formatted_initials or forename.
 # Initials, forename, additions, prefixes are arrays.
 # Name field values are either strings, or hashes, with content and language and script attributes.
 # The language and script attribute can also be given on the name.
@@ -126,9 +127,11 @@ abstract:
 # The affiliation description can be a single string, or a hash of content, language, script, and format.
 contributor:
   - organization:
-      name: International Organization for Standardization
+      name:
+        content: International Organization for Standardization
       url: www.iso.org
-      abbreviation: ISO
+      abbreviation:
+        content: ISO
       subdivision: division
     role:
       type: publisher
@@ -140,25 +143,29 @@ contributor:
           language: en
       affiliation:
         - organization:
-            name: IETF
-            abbreviation: IETF
-             identifier:
-               - type: uri
-                 id: www.ietf.org
+            name:
+              content: IETF
+            abbreviation:
+              content: IETF
+            identifier:
+              - type: uri
+                id: www.ietf.org
           description: Affiliation description
       contact:
-        - street:
-          - 8 Street St
-          city: City
-          postcode: 123456
-          country: Country
-          state: State
-        - type: phone
-          value: 223322
+        - address:
+            street:
+              - 8 Street St
+            city: City
+            postcode: '123456'
+            country: Country
+            state: State
+        - phone: '223322'
     role: author
-  - person:
-      name: IETF
-      abbreviation: IETF
+  - organization:
+      name:
+        content: Internet Engineering Task Force
+      abbreviation:
+        content: IETF
       identifier:
         - type: uri
           id: www.ietf.org
@@ -166,18 +173,24 @@ contributor:
       publisher
   - person:
       name:
-        language: en
-        initial:
-          - A.
-        surname: Bierman
+        given:
+          forename:
+            initial: A
+            language: en
+          formatted_initials:
+            content: A.
+        surname:
+          content: Bierman
       affiliation:
-        -  organization:
-             name: IETF
-             abbreviation: IETF
-           description:
-             content: Affiliation description
-             language: en
-             script: Latn
+        - organization:
+            name:
+              content: IETF
+            abbreviation:
+              content: IETF
+        description:
+          content: Affiliation description
+          language: en
+          script: Latn
       identifier:
         - type: uri
           id: www.person.com
@@ -187,11 +200,13 @@ contributor:
 # a "from" date, and an optional "to" date
 copyright:
    owner:
-     name: International Organization for Standardization
-     abbreviation: ISO
+     name:
+      content: International Organization for Standardization
+     abbreviation:
+      content: ISO
      url: www.iso.org
-   from: 2014
-   to: 2020
+   from: '2014'
+   to: '2020'
 # link is an array of URIs, with a type and content
 link:
   - type: src
@@ -206,15 +221,17 @@ link:
 relation:
   - type: updates
     bibitem:
-      formattedref: ISO 19115:2003
+      formattedref:
+        content: ISO 19115:2003
     bib_locality:
       type: page
-      reference_from: 7
-      reference_to: 10
+      reference_from: '7'
+      reference_to: '10'
   - type: updates
     bibitem:
       type: standard
-      formattedref: ISO 19115:2003/Cor 1:2006
+      formattedref:
+        content: ISO 19115:2003/Cor 1:2006
 # series are an array, containing a type, and either a formattedref, or:
 # a title, a place, an organization (string),
 # an abbreviation, a from, a to, a number, and a partnumber.
@@ -236,8 +253,8 @@ series:
       content: ABVR
       language: en
       script: Latn
-    from: 2009-02-01
-    to: 2010-12-20
+    from: '2009-02-01'
+    to: '2010-12-20'
     number: serie1234
     partnumber: part5678
   - type: alt
@@ -255,7 +272,7 @@ place: bib place
 # extent is an array, containing type, a reference_from, and an optional reference_to
 extent:
   type: section
-  reference_from: 7
+  reference_from: '7'
 # accesslocation is an array of strings
 accesslocation:
   - accesslocation1
@@ -266,9 +283,9 @@ classification:
   value: value
 # validity contains a begins date, an ends date, and a revision date
 validity:
-  begins: 2010-10-10 12:21
-  ends: 2011-02-03 18:30
-  revision: 2011-03-04 09:00
+  begins: '2010-10-10 12:21'
+  ends: '2011-02-03 18:30'
+  revision: '2011-03-04 09:00'
 ----
 
 == Metanorma structure (AsciiBib): nested definition list

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/grammars/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -1274,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2493,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/relaton_bib/bibliographic_item.rb

@@ -115,7 +115,7 @@ module RelatonBib
     attr_reader :validity
 
     # @return [Date]
-    attr_reader :fetched
+    attr_accessor :fetched
 
     # @return [Array<RelatonBib::LocalizedString>]
     attr_reader :keyword
@@ -265,7 +265,11 @@ module RelatonBib
       # we should pass the fetched arg from scrappers
       @fetched        = args.fetch :fetched, nil
       @keyword        = (args[:keyword] || []).map do |kw|
-        LocalizedString.new(kw)
+        case kw
+        when Hash then LocalizedString.new(kw[:content], kw[:language], kw[:script])
+        when String then LocalizedString.new(kw)
+        else kw
+        end
       end
       @license        = args.fetch :license, []
       @doctype        = args[:doctype]
@@ -1013,17 +1017,19 @@ module RelatonBib
       if person.name.completename
         builder.parent[:fullname] = person.name.completename.content
       elsif person.name.forename.any?
-        builder.parent[:fullname] = person.name.forename.map(&:content).join
+        builder.parent[:fullname] = person.name.forename.map do |n|
+          n.content || n.initial
+        end.join " "
       end
-      if person.name.initial.any?
-        builder.parent[:initials] = person.name.initial.map(&:content).join
+      if person.name.initials
+        builder.parent[:initials] = person.name.initials.content
       elsif person.name.forename.any?
         builder.parent[:initials] = person.name.forename.map do |f|
-          "#{f.content[0]}."
+          "#{f.initial || f.content[0]}."
         end.join
       end
       if person.name.surname
-        if person.name.forename.any?
+        if !person.name.completename && person.name.forename.any? && person.name.surname
           builder.parent[:fullname] += " #{person.name.surname}"
         end
         builder.parent[:surname] = person.name.surname.content

data/lib/relaton_bib/bibtex_parser.rb

@@ -25,7 +25,7 @@ module RelatonBib
             link: fetch_link(bt),
             language: fetch_language(bt),
             classification: fetch_classification(bt),
-            keyword: fetch_keyword(bt)
+            keyword: fetch_keyword(bt),
           )
           h
         end
@@ -123,7 +123,7 @@ module RelatonBib
           parts = name.split ", "
           surname = LocalizedString.new parts.first
           fname = parts.size > 1 ? parts[1].split : []
-          forename = fname.map { |fn| LocalizedString.new fn }
+          forename = fname.map { |fn| Forename.new content: fn }
           Person.new name: FullName.new(surname: surname, forename: forename)
         end
       end

data/lib/relaton_bib/bibxml_parser.rb

@@ -264,13 +264,30 @@ module RelatonBib
     # @return [RelatonBib::FullName]
     def full_name(author, reference)
       lang = language reference
+      initials = localized_string(author[:initials], lang) if author[:initials]
       FullName.new(
         completename: localized_string(author[:fullname], lang),
-        initial: [localized_string(author[:initials], lang)].compact,
-        surname: localized_string(author[:surname], lang),
+        initials: initials, forename: forename(author[:initials], lang),
+        surname: localized_string(author[:surname], lang)
       )
     end
 
+    #
+    # Create forenames with initials
+    #
+    # @param [String] initials initials
+    # @param [String] lang language
+    #
+    # @return [Array<RelatonBib::Forename>] forenames
+    #
+    def forename(initials, lang)
+      return [] unless initials
+
+      initials.split(/\.-?\s?|\s/).map do |i|
+        Forename.new(initial: i, language: lang)
+      end
+    end
+
     # @param author [Nokogiri::XML::Element]
     # @return [Array<RelatonBib::Affiliation>]
     def affiliation(author)

data/lib/relaton_bib/forename.rb

@@ -0,0 +1,65 @@
+module RelatonBib
+  class Forename < LocalizedString
+    # @return [RelatonBib::Forename] forename
+    attr_accessor :initial
+
+    #
+    # Initialize Forename instance
+    #
+    # @param [String] content content of forename, can be empty
+    # @param [Array<String>] language languages, `en`, `fr`, `de` etc.
+    # @param [Array<String>] script scripts `Latn`, `Cyrl` etc.
+    # @param [String, nil] initial initial of forename
+    #
+    def initialize(content: nil, language: [], script: [], initial: nil)
+      @initial = initial
+      super content, language, script
+    end
+
+    def to_s
+      content.nil? ? initial : super
+    end
+
+    #
+    # Render forename to XML
+    #
+    # @param [Nokogiri::XML::Builder] builder XML builder
+    #
+    def to_xml(builder)
+      node = builder.forename { super }
+      node[:initial] = initial if initial
+    end
+
+    #
+    # Render forename to hash
+    #
+    # @return [Hash, String] forename hash or string representation
+    #
+    def to_hash
+      ls = super
+      # if initial
+      hash = ls.is_a?(Hash) ? ls : { "content" => ls }
+      hash["initial"] = initial if initial
+      hash
+      # else
+      #   ls
+      # end
+    end
+
+    #
+    # Render forename to asciibib
+    #
+    # @param [String] pref prefix
+    # @param [Integer] count size of array
+    #
+    # @return [String] asciibib string
+    #
+    def to_asciibib(pref, count = 1)
+      prf = pref.empty? ? pref : "#{pref}."
+      prf += "forename"
+      out = super prf, count
+      out += "#{prf}.initial:: #{initial}\n" if initial
+      out
+    end
+  end
+end

data/lib/relaton_bib/full_name.rb

@@ -0,0 +1,103 @@
+module RelatonBib
+  # Person's full name
+  class FullName
+    include RelatonBib
+
+    # @return [Array<RelatonBib::Forename>]
+    attr_accessor :forename
+
+    # @return [Array<RelatonBib::LocalizedString>]
+    attr_accessor :initials
+
+    # @return [RelatonBib::LocalizedString, nil]
+    attr_accessor :surname, :completename
+
+    # @return [Array<RelatonBib::LocalizedString>]
+    attr_accessor :addition
+
+    # @return [Array<RelatonBib::LocalizedString>]
+    attr_accessor :prefix
+
+    #
+    # Initialize FullName instance
+    #
+    # @param surname [RelatonBib::LocalizedString, nil] surname or completename
+    #   should be present
+    # @param forename [Array<RelatonBib::Forename>] forename
+    # @param initials [RelatonBib::LocalizedString, String, nil] string of initials
+    # @param addition [Array<RelatonBib::LocalizedString>] array of additions
+    # @param prefix [Array<RelatonBib::LocalizedString>] array of prefixes
+    # @param completename [RelatonBib::LocalizedString, nil] completename or
+    #   surname should be present
+    #
+    def initialize(**args)
+      unless args[:surname] || args[:completename]
+        raise ArgumentError, "Should be given :surname or :completename"
+      end
+
+      @surname      = args[:surname]
+      @forename     = args.fetch :forename, []
+      @initials     = args[:initials].is_a?(String) ? LocalizedString.new(args[:initials]) : args[:initials]
+      @addition     = args.fetch :addition, []
+      @prefix       = args.fetch :prefix, []
+      @completename = args[:completename]
+    end
+
+    # @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
+          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| f.to_xml builder }
+          builder.send(:"formatted-initials") { initials.to_xml builder } if initials
+          builder.surname { surname.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,Metrics/PerceivedComplexity,Metrics/MethodLength
+      hash = {}
+      if forename.any? || initials
+        hash["given"] = {}
+        hash["given"]["forename"] = single_element_array(forename) if forename&.any?
+        hash["given"]["formatted_initials"] = initials.to_hash if initials
+      end
+      hash["surname"] = surname.to_hash if surname
+      hash["addition"] = single_element_array(addition) if addition&.any?
+      hash["prefix"] = single_element_array(prefix) if prefix&.any?
+      hash["completename"] = completename.to_hash if completename
+      hash
+    end
+
+    # @param pref [String]
+    # @return [String]
+    def to_asciibib(pref) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      prf = pref.empty? ? pref : "#{pref}."
+      prf += "name"
+      given = "#{pref}.given"
+      out = forename.map do |fn|
+        fn.to_asciibib given, forename.size
+      end.join
+      out += initials.to_asciibib "#{given}.formatted-initials" if initials
+      out += surname.to_asciibib "#{prf}.surname" if surname
+      addition.each do |ad|
+        out += ad.to_asciibib "#{prf}.addition", addition.size
+      end
+      prefix.each { |pr| out += pr.to_asciibib "#{prf}.prefix", prefix.size }
+      out += completename.to_asciibib "#{prf}.completename" if completename
+      out
+    end
+  end
+end

data/lib/relaton_bib/hash_converter.rb

@@ -33,7 +33,8 @@ module RelatonBib
         accesslocation_hash_to_bib(ret)
         classification_hash_to_bib(ret)
         validity_hash_to_bib(ret)
-        ret[:keyword] = RelatonBib.array(ret[:keyword])
+        keyword_hash_to_bib(ret)
+        # ret[:keyword] = RelatonBib.array(ret[:keyword])
         ret[:license] = RelatonBib.array(ret[:license])
         editorialgroup_hash_to_bib ret
         ics_hash_to_bib ret
@@ -42,9 +43,11 @@ module RelatonBib
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
-      # def timestamp_hash(ret)
-      #   ret[:fetched] ||= Date.today.to_s
-      # end
+      def keyword_hash_to_bib(ret)
+        ret[:keyword] = RelatonBib.array(ret[:keyword]).map do |keyword|
+          localizedstring keyword
+        end
+      end
 
       def extent_hash_to_bib(ret)
         return unless ret[:extent]
@@ -198,7 +201,8 @@ module RelatonBib
         ret[:contributor]&.each_with_index do |c, i|
           roles = RelatonBib.array(ret[:contributor][i][:role]).map do |r|
             if r.is_a? Hash
-              { type: r[:type], description: RelatonBib.array(r[:description]) }
+              desc = RelatonBib.array(r[:description]).map { |d| d.is_a?(String) ? d : d[:content] }
+              { type: r[:type], description: desc }
             # elsif r.is_a? Array
             #   { type: r[0], description: r.fetch(1) }
             else
@@ -238,18 +242,33 @@ module RelatonBib
         )
       end
 
-      def fullname_hash_to_bib(person) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+      def fullname_hash_to_bib(person) # rubocop:disable Metrics/AbcSize
         n = person[:name]
+        fname, inits = given_hash_to_bib n[:given] || n # `n` is for backward compatibility
         FullName.new(
-          forename: RelatonBib.array(n[:forename])&.map { |f| localname(f, person) },
-          initial: RelatonBib.array(n[:initial])&.map { |f| localname(f, person) },
-          addition: RelatonBib.array(n[:addition])&.map { |f| localname(f, person) },
-          prefix: RelatonBib.array(n[:prefix])&.map { |f| localname(f, person) },
-          surname: localname(n[:surname], person),
-          completename: localname(n[:completename], person),
+          forename: fname, initials: inits,
+          addition: RelatonBib.array(n[:addition])&.map { |f| localizedstring(f) },
+          prefix: RelatonBib.array(n[:prefix])&.map { |f| localizedstring(f) },
+          surname: localizedstring(n[:surname]),
+          completename: localizedstring(n[:completename])
         )
       end
 
+      def given_hash_to_bib(given)
+        return [[], nil] unless given
+
+        fname = RelatonBib.array(given[:forename])&.map { |f| forename_hash_to_bib(f) }
+        inits = localizedstring(given[:formatted_initials])
+        [fname, inits]
+      end
+
+      def forename_hash_to_bib(fname)
+        case fname
+        when Hash then Forename.new(**fname)
+        when String then Forename.new(content: fname)
+        end
+      end
+
       def person_identifiers_hash_to_bib(person)
         RelatonBib.array(person[:identifier])&.map do |a|
           PersonIdentifier.new(a[:type], a[:id])
@@ -275,7 +294,7 @@ module RelatonBib
         end
       end
 
-      def contacts_hash_to_bib(entity) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def contacts_hash_to_bib(entity) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/CyclomaticComplexity
         return [] unless entity[:contact]
 
         RelatonBib.array(entity[:contact]).map do |a|
@@ -473,28 +492,14 @@ module RelatonBib
         end
       end
 
-      # @param name [Hash, String, NilClass]
-      # @param person [Hash]
-      # @return [RelatonBib::LocalizedString]
-      def localname(name, person) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
-        return nil if name.nil?
-
-        lang = name[:language] if name.is_a?(Hash)
-        lang ||= person[:name][:language]
-        script = name[:script] if name.is_a?(Hash)
-        script ||= person[:name][:script]
-        n = name.is_a?(Hash) ? name[:content] : name
-        RelatonBib::LocalizedString.new(n, lang, script)
-      end
-
-      # @param lst [Hash, Array<RelatonBib::LocalizedString>]
+      # @param lst [Hash, Array<RelatonBib::LocalizedString>, String]
       # @return [RelatonBib::LocalizedString]
       def localizedstring(lst)
+        return unless lst
+
         if lst.is_a?(Hash)
-          RelatonBib::LocalizedString.new(lst[:content], lst[:language],
-                                          lst[:script])
-        else
-          RelatonBib::LocalizedString.new(lst)
+          LocalizedString.new(lst[:content], lst[:language], lst[:script])
+        else LocalizedString.new(lst)
         end
       end
 

data/lib/relaton_bib/localized_string.rb

@@ -37,12 +37,20 @@ module RelatonBib
                  end
     end
 
+    #
+    # String representation.
+    #
     # @return [String]
+    #
     def to_s
       content.is_a?(Array) ? content.first.to_s : content.to_s
     end
 
-    # @return [TrueClass, FalseClass]
+    #
+    # Returns true if content is empty.
+    #
+    # @return [Boolean]
+    #
     def empty?
       content.empty?
     end
@@ -124,10 +132,11 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-      if content.is_a? String
-        return content unless language || script
+      if content.nil? || content.is_a?(String)
+        # return content unless language || script
 
-        hash = { "content" => content }
+        hash = {}
+        hash["content"] = content unless content.nil? || content.empty?
         hash["language"] = single_element_array(language) if language&.any?
         hash["script"] = single_element_array(script) if script&.any?
         hash
@@ -140,7 +149,8 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1, has_attrs = false) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
       pref = prefix.empty? ? prefix : "#{prefix}."
-      if content.is_a? String
+      case content
+      when String
         unless language&.any? || script&.any? || has_attrs
           return "#{prefix}:: #{content}\n"
         end
@@ -150,8 +160,9 @@ module RelatonBib
         language&.each { |l| out += "#{pref}language:: #{l}\n" }
         script&.each { |s| out += "#{pref}script:: #{s}\n" }
         out
-      else
+      when Array
         content.map { |c| c.to_asciibib "#{pref}variant", content.size }.join
+      else count > 1 ? "#{prefix}::\n" : ""
       end
     end
   end

data/lib/relaton_bib/person.rb

@@ -1,104 +1,6 @@
 # frozen_string_literal: true
 
-require "relaton_bib/contributor"
-
 module RelatonBib
-  # Person's full name
-  class FullName
-    include RelatonBib
-
-    # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :forename
-
-    # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :initial
-
-    # @return [RelatonBib::LocalizedString, nil]
-    attr_accessor :surname, :completename
-
-    # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :addition
-
-    # @return [Array<RelatonBib::LocalizedString>]
-    attr_accessor :prefix
-
-    # @param surname [RelatonBib::LocalizedString, nil] surname or completename
-    #   should be present
-    # @param forename [Array<RelatonBib::LocalizedString>]
-    # @param initial [Array<RelatonBib::LocalizedString>]
-    # @param addition [Array<RelatonBib::LocalizedString>]
-    # @param prefix [Array<RelatonBib::LocalizedString>]
-    # @param completename [RelatonBib::LocalizedString, nil] completename or
-    #   surname should be present
-    def initialize(**args)
-      unless args[:surname] || args[:completename]
-        raise ArgumentError, "Should be given :surname or :completename"
-      end
-
-      @surname      = args[:surname]
-      @forename     = args.fetch :forename, []
-      @initial      = args.fetch :initial, []
-      @addition     = args.fetch :addition, []
-      @prefix       = args.fetch :prefix, []
-      @completename = args[:completename]
-    end
-
-    # @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
-          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 }
-          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,Metrics/PerceivedComplexity
-      hash = {}
-      hash["forename"] = single_element_array(forename) if forename&.any?
-      hash["initial"] = single_element_array(initial) if initial&.any?
-      hash["surname"] = surname.to_hash if surname
-      hash["addition"] = single_element_array(addition) if addition&.any?
-      hash["prefix"] = single_element_array(prefix) if prefix&.any?
-      hash["completename"] = completename.to_hash if completename
-      hash
-    end
-
-    # @param pref [String]
-    # @return [String]
-    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|
-        fn.to_asciibib "#{prf}forename", forename.size
-      end.join
-      initial.each { |i| out += i.to_asciibib "#{prf}initial", initial.size }
-      out += surname.to_asciibib "#{prf}surname" if surname
-      addition.each do |ad|
-        out += ad.to_asciibib "#{prf}addition", addition.size
-      end
-      prefix.each { |pr| out += pr.to_asciibib "#{prf}prefix", prefix.size }
-      out += completename.to_asciibib "#{prf}completename" if completename
-      out
-    end
-  end
-
   # Person identifier type.
   module PersonIdentifierType
     ISNI  = "isni"

data/lib/relaton_bib/typed_title_string.rb

@@ -158,13 +158,14 @@ module RelatonBib
       th = title.to_hash
       return th unless type
 
-      hash = { "type" => type }
-      if th.is_a? String
-        hash["content"] = th
-      else
-        hash.merge! th
-      end
-      hash
+      # hash = { "type" => type }
+      # if th.is_a? String
+      #   hash["content"] = th
+      # else
+      #   hash.merge! th
+      # end
+      # hash
+      th.merge "type" => type
     end
 
     # @param prefix [String]

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.12.7".freeze
+  VERSION = "1.13.2".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -305,8 +305,8 @@ module RelatonBib
 
         name = FullName.new(
           completename: cname, surname: sname,
-          initial: name_part(person, "initial"),
-          forename: name_part(person, "forename"),
+          initials: parse_initials(person),
+          forename: parse_forename(person),
           addition: name_part(person, "addition"),
           prefix: name_part(person, "prefix")
         )
@@ -336,6 +336,21 @@ module RelatonBib
         end
       end
 
+      def parse_initials(person)
+        inits = person.at "./name/formatted-initials"
+        return unless inits
+
+        LocalizedString.new(inits.text, inits[:language], inits[:script])
+      end
+
+      def parse_forename(person)
+        person.xpath("./name/forename").map do |np|
+          args = np.attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v.to_s }
+          args[:content] = np.text
+          Forename.new(**args)
+        end
+      end
+
       def name_part(person, part)
         person.xpath("./name/#{part}").map do |np|
           LocalizedString.new np.text, np[:language], np[:script]

data/lib/relaton_bib.rb

@@ -4,6 +4,9 @@ require "htmlentities"
 require "relaton_bib/version"
 require "relaton_bib/deep_dup"
 require "relaton_bib/localized_string"
+require "relaton_bib/forename"
+require "relaton_bib/full_name"
+require "relaton_bib/contributor"
 require "relaton_bib/bibliographic_item"
 require "relaton_bib/hit_collection"
 require "relaton_bib/hit"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.12.7
+  version: 1.13.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -214,6 +214,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"
@@ -251,8 +252,10 @@ files:
 - lib/relaton_bib/document_status.rb
 - lib/relaton_bib/edition.rb
 - lib/relaton_bib/editorial_group.rb
+- lib/relaton_bib/forename.rb
 - lib/relaton_bib/formatted_ref.rb
 - lib/relaton_bib/formatted_string.rb
+- lib/relaton_bib/full_name.rb
 - lib/relaton_bib/hash_converter.rb
 - lib/relaton_bib/hit.rb
 - lib/relaton_bib/hit_collection.rb