relaton-bib 1.8.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b46017a3b30ea11d3ea0f97581e4b4e8a95afb15463f47ac536995286be26c09
-  data.tar.gz: cb8b1d871705c2f795c21977ecfbeb33e4bb13c66249eefbdf66dee12335bd88
+  metadata.gz: 34028dd6a06df2ea4fb4280dc523e142d603dcb5e3c9b32c500823b6d6d4be4e
+  data.tar.gz: 6a43437d26b84c0049a0292896116a705a5c0595ee5f292794ffc780e7c720c8
 SHA512:
-  metadata.gz: 558039f1f7e632461bf785ab09c99585aad636b3e828a57bb2e710f0fa77d76b21b44ce186f2798e57e2da425085e79fe747a033db62f3edfe086e08aad06b1a
-  data.tar.gz: febdc2fb65bfb3948b690c92e94da829fd8a1b9d945a2586b348d774546881fe034a8a3f39ea9751a6d9945029fbc1379b908423ab925b2e499a85c38590970d
+  metadata.gz: 3af6adfc91e4a4dd6da9401b991949f2ea15230abe59e46aff4d43d88e7c0feae7a3fc818280cbb36f39ebce85013f7f61865c85988c2f72c261f2fdbb9e9f35
+  data.tar.gz: e5476c5071889ffec592312c5d2fe0534c2ab72c006f03d7429c9504981a32c93dd4274cdf305914089193943b0b2bdcea6b85e4973e815e2a3ed996a1b0816e

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 Rails:
   Enabled: false

data/grammars/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/grammars/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -199,6 +204,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -543,6 +560,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -890,6 +910,14 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -939,7 +967,34 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -965,6 +1020,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1191,13 +1249,17 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1459,26 +1521,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/lib/relaton_bib/bibliographic_date.rb

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

data/lib/relaton_bib/bibliographic_item.rb

@@ -42,7 +42,7 @@ module RelatonBib
     attr_accessor :all_parts
 
     # @return [String, NilClass]
-    attr_reader :id, :type, :docnumber, :edition, :doctype
+    attr_reader :id, :type, :docnumber, :edition, :doctype, :subdoctype
 
     # @!attribute [r] title
     # @return [RelatonBib::TypedTitleStringCollection]
@@ -148,6 +148,7 @@ module RelatonBib
     # @param fetched [Date, NilClass] default nil
     # @param keyword [Array<String>]
     # @param doctype [String]
+    # @param subdoctype [String]
     # @param editorialgroup [RelatonBib::EditorialGroup, nil]
     # @param ics [Array<RelatonBib::ICS>]
     # @param structuredidentifier [RelatonBib::StructuredIdentifierCollection]
@@ -229,8 +230,9 @@ module RelatonBib
       @status         = args[:docstatus]
       @relation       = DocRelationCollection.new(args[:relation] || [])
       @link           = args.fetch(:link, []).map do |s|
-        if s.is_a?(Hash) then TypedUri.new(**s)
-        elsif s.is_a?(String) then TypedUri.new(content: s)
+        case s
+        when Hash then TypedUri.new(**s)
+        when String then TypedUri.new(content: s)
         else s
         end
       end
@@ -250,6 +252,7 @@ module RelatonBib
       end
       @license        = args.fetch :license, []
       @doctype        = args[:doctype]
+      @subdoctype     = args[:subdoctype]
       @editorialgroup = args[:editorialgroup]
       @ics            = args.fetch :ics, []
       @structuredidentifier = args[:structuredidentifier]
@@ -260,8 +263,8 @@ module RelatonBib
     # @param hash [Hash]
     # @return [RelatonBipm::BipmBibliographicItem]
     def self.from_hash(hash)
-      item_hash = ::RelatonBib::HashConverter.hash_to_bib(hash)
-      new **item_hash
+      item_hash = Object.const_get(name.split("::")[0])::HashConverter.hash_to_bib(hash)
+      new(**item_hash)
     end
 
     # @param lang [String] language code Iso639
@@ -286,7 +289,7 @@ module RelatonBib
       # contribs = publishers.map { |p| p&.entity&.abbreviation }.join '/'
       # idstr = "#{contribs}#{delim}#{id.project_number}"
       # idstr = id.project_number.to_s
-      idstr = id.id.gsub(/:/, "-").gsub /\s/, ""
+      idstr = id.id.gsub(/:/, "-").gsub(/\s/, "")
       # if id.part_number&.size&.positive? then idstr += "-#{id.part_number}"
       idstr.strip
     end
@@ -299,7 +302,7 @@ module RelatonBib
     def shortref(identifier, **opts) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
       pubdate = date.select { |d| d.type == "published" }
       year = if opts[:no_year] || pubdate.empty? then ""
-             else ":" + pubdate&.first&.on(:year).to_s
+             else ":#{pubdate&.first&.on(:year)}"
              end
       year += ": All Parts" if opts[:all_parts] || @all_parts
 
@@ -314,7 +317,7 @@ module RelatonBib
     # @return [String] XML
     def to_xml(**opts, &block)
       if opts[:builder]
-        render_xml **opts, &block
+        render_xml(**opts, &block)
       else
         Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
           render_xml builder: xml, **opts, &block
@@ -361,6 +364,7 @@ module RelatonBib
       hash["keyword"] = single_element_array(keyword) if keyword&.any?
       hash["license"] = single_element_array(license) if license&.any?
       hash["doctype"] = doctype if doctype
+      hash["subdoctype"] = subdoctype if subdoctype
       if editorialgroup&.presence?
         hash["editorialgroup"] = editorialgroup.to_hash
       end
@@ -460,7 +464,7 @@ module RelatonBib
       me.date = []
       me.docidentifier.each &:remove_date
       me.structuredidentifier&.remove_date
-      me.id&.sub! /-[12]\d\d\d/, ""
+      me.id&.sub!(/-[12]\d\d\d/, "")
       me
     end
 
@@ -477,7 +481,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = prefix.empty? ? "[%bibitem]\n== {blank}\n" : ""
       out += "#{pref}id:: #{id}\n" if id
       out += "#{pref}fetched:: #{fetched}\n" if fetched
@@ -513,6 +517,7 @@ module RelatonBib
       out += relation.to_asciibib prefix if relation
       series.each { |s| out += s.to_asciibib prefix, series.size }
       out += "#{pref}doctype:: #{doctype}\n" if doctype
+      out += "#{pref}subdoctype:: #{subdoctype}\n" if subdoctype
       out += "#{pref}formattedref:: #{formattedref}\n" if formattedref
       keyword.each { |kw| out += kw.to_asciibib "#{pref}keyword", keyword.size }
       out += editorialgroup.to_asciibib prefix if editorialgroup
@@ -682,21 +687,21 @@ module RelatonBib
       root = opts[:bibdata] ? :bibdata : :bibitem
       xml = opts[:builder].send(root) do |builder|
         builder.fetched fetched if fetched
-        title.to_xml **opts
+        title.to_xml(**opts)
         formattedref&.to_xml builder
         link.each { |s| s.to_xml builder }
-        docidentifier.each { |di| di.to_xml **opts }
+        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 **opts }
-            c.to_xml **opts
+            c.role.each { |r| r.to_xml(**opts) }
+            c.to_xml(**opts)
           end
         end
         builder.edition edition if edition
         version&.to_xml builder
-        biblionote.to_xml **opts
+        biblionote.to_xml(**opts)
         opts[:note]&.each do |n|
           builder.note(n[:text], format: "text/plain", type: n[:type])
         end
@@ -706,7 +711,7 @@ module RelatonBib
         abstr = abstract unless abstr.any?
         abstr.each { |a| builder.abstract { a.to_xml(builder) } }
         status&.to_xml builder
-        copyright&.each { |c| c.to_xml **opts }
+        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
@@ -724,6 +729,7 @@ module RelatonBib
                                  structuredidentifier&.presence?)
           builder.ext do |b|
             b.doctype doctype if doctype
+            b.subdoctype subdoctype if subdoctype
             editorialgroup&.to_xml b
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b

data/lib/relaton_bib/document_status.rb

@@ -42,7 +42,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = "#{pref}docstatus.stage:: #{stage.value}\n"
       out += "#{pref}docstatus.substage:: #{substage.value}\n" if substage
       out += "#{pref}docstatus.iteration:: #{iteration}\n" if iteration
@@ -54,9 +54,10 @@ module RelatonBib
     # @param stg [RelatonBib::DocumentStatus::Stage, Hash, String, NilClass]
     # @return [RelatonBib::DocumentStatus::Stage]
     def stage_new(stg)
-      if stg.is_a?(Stage) then stg
-      elsif stg.is_a?(Hash) then Stage.new(**stg)
-      elsif stg.is_a?(String) then Stage.new(value: stg)
+      case stg
+      when Stage then stg
+      when Hash then Stage.new(**stg)
+      when String then Stage.new(value: stg)
       end
     end
 

data/lib/relaton_bib/editorial_group.rb

@@ -27,7 +27,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? "editorialgroup" : prefix + ".editorialgroup"
+      pref = prefix.empty? ? "editorialgroup" : "#{prefix}.editorialgroup"
       technical_committee.map do |tc|
         tc.to_asciibib pref, technical_committee.size
       end.join

data/lib/relaton_bib/formatted_ref.rb

@@ -10,7 +10,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? "formattedref" : prefix + ".formattedref"
+      pref = prefix.empty? ? "formattedref" : "#{prefix}.formattedref"
       super pref
     end
   end

data/lib/relaton_bib/hash_converter.rb

@@ -107,7 +107,7 @@ module RelatonBib
         ret[:accesslocation] = array(ret[:accesslocation])
       end
 
-      def dates_hash_to_bib(ret)
+      def dates_hash_to_bib(ret) # rubocop:disable Metrics/AbcSize
         return unless ret[:date]
 
         ret[:date] = array(ret[:date])
@@ -160,7 +160,7 @@ module RelatonBib
         ret[:docstatus] && ret[:docstatus] = DocumentStatus.new(
           stage: stage(ret[:docstatus][:stage]),
           substage: stage(ret[:docstatus][:substage]),
-          iteration: ret[:docstatus][:iteration]
+          iteration: ret[:docstatus][:iteration],
         )
       end
 
@@ -215,7 +215,7 @@ module RelatonBib
           name: fullname_hash_to_bib(person),
           affiliation: affiliation_hash_to_bib(person),
           contact: contacts_hash_to_bib(person),
-          identifier: person_identifiers_hash_to_bib(person)
+          identifier: person_identifiers_hash_to_bib(person),
         )
       end
 
@@ -227,7 +227,7 @@ module RelatonBib
           addition: array(n[:addition])&.map { |f| localname(f, person) },
           prefix: array(n[:prefix])&.map { |f| localname(f, person) },
           surname: localname(n[:surname], person),
-          completename: localname(n[:completename], person)
+          completename: localname(n[:completename], person),
         )
       end
 
@@ -247,11 +247,11 @@ module RelatonBib
                       script: d[:script], format: d[:format] }
                   else { content: d }
                   end
-            FormattedString.new **cnt
+            FormattedString.new(**cnt)
           end
           Affiliation.new(
             organization: Organization.new(**org_hash_to_bib(a[:organization])),
-            description: a[:description]
+            description: a[:description],
           )
         end
       end
@@ -288,7 +288,7 @@ module RelatonBib
         ret[:relation] = array(ret[:relation])
         ret[:relation]&.each do |r|
           if r[:description]
-            r[:description] = FormattedString.new **r[:description]
+            r[:description] = FormattedString.new(**r[:description])
           end
           relation_bibitem_hash_to_bib(r)
           relation_locality_hash_to_bib(r)
@@ -309,7 +309,7 @@ module RelatonBib
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        BibliographicItem.new **item_hash
+        BibliographicItem.new(**item_hash)
       end
 
       # @param rel [Hash] relation
@@ -363,7 +363,7 @@ module RelatonBib
       # @param title [Hash]
       # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        TypedTitleString.new **title
+        TypedTitleString.new(**title)
       end
 
       # @param ret [Hash]
@@ -375,7 +375,7 @@ module RelatonBib
       def classification_hash_to_bib(ret)
         if ret[:classification]
           ret[:classification] = array(ret[:classification]).map do |cls|
-            Classification.new **cls
+            Classification.new(**cls)
           end
         end
       end
@@ -418,7 +418,7 @@ module RelatonBib
       def ics_hash_to_bib(ret)
         return unless ret[:ics]
 
-        ret[:ics] = array(ret[:ics]).map { |ics| ICS.new **ics }
+        ret[:ics] = array(ret[:ics]).map { |ics| ICS.new(**ics) }
       end
 
       # @param ret [Hash]
@@ -427,7 +427,7 @@ module RelatonBib
 
         sids = array(ret[:structuredidentifier]).map do |si|
           si[:agency] = array si[:agency]
-          StructuredIdentifier.new **si
+          StructuredIdentifier.new(**si)
         end
         ret[:structuredidentifier] = StructuredIdentifierCollection.new sids
       end
@@ -435,15 +435,14 @@ module RelatonBib
       # @param ogj [Hash, Array, String]
       # @return [Hash, Array, String]
       def symbolize(obj)
-        if obj.is_a? Hash
+        case obj
+        when Hash
           obj.reduce({}) do |memo, (k, v)|
             memo[k.to_sym] = symbolize(v)
             memo
           end
-        elsif obj.is_a? Array
-          obj.reduce([]) { |memo, v| memo << symbolize(v) }
-        else
-          obj
+        when Array then obj.reduce([]) { |memo, v| memo << symbolize(v) }
+        else obj
         end
       end
 
@@ -459,7 +458,7 @@ module RelatonBib
       # @param name [Hash, String, NilClass]
       # @param person [Hash]
       # @return [RelatonBib::LocalizedString]
-      def localname(name, person) # rubocop:disable Metrics/CyclomaticComplexity
+      def localname(name, person) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize
         return nil if name.nil?
 
         lang = name[:language] if name.is_a?(Hash)

data/lib/relaton_bib/hit.rb

@@ -21,10 +21,10 @@ module RelatonBib
     # @return [String]
     def inspect
       "<#{self.class}:#{format('%<id>#.14x', id: object_id << 1)} "\
-      "@text=\"#{@hit_collection&.text}\" "\
-      "@fetched=\"#{!@fetch.nil?}\" "\
-      "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
-      "@title=\"#{@hit[:code]}\">"
+                              "@text=\"#{@hit_collection&.text}\" "\
+                                    "@fetched=\"#{!@fetch.nil?}\" "\
+                    "@fullIdentifier=\"#{@fetch&.shortref(nil)}\" "\
+                    "@title=\"#{@hit[:code]}\">"
     end
 
     def fetch
@@ -38,10 +38,10 @@ module RelatonBib
     # @return [String] XML
     def to_xml(**opts)
       if opts[:builder]
-        fetch.to_xml **opts
+        fetch.to_xml(**opts)
       else
         builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
-          fetch.to_xml **opts.merge(builder: xml)
+          fetch.to_xml(**opts.merge(builder: xml))
         end
         builder.doc.root.to_xml
       end

data/lib/relaton_bib/localized_string.rb

@@ -18,12 +18,8 @@ module RelatonBib
     # @param language [String] language code Iso639
     # @param script [String] script code Iso15924
     def initialize(content, language = nil, script = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-      if content.is_a? Array
-        inv = content.reject { |c| c.is_a?(LocalizedString) || c.is_a?(Hash) }
-      end
-      unless content.is_a?(String) || inv&.none? && content.any?
-        klass = content.is_a?(Array) ? inv.first.class : content.class
-        raise ArgumentError, "invalid LocalizedString content type: #{klass}"
+      if content.is_a?(Array) && content.none?
+        raise ArgumentError, "LocalizedString content is empty"
       end
       @language = language.is_a?(String) ? [language] : language
       @script = script.is_a?(String) ? [script] : script
@@ -31,6 +27,8 @@ module RelatonBib
                    content.map do |c|
                      if c.is_a?(Hash)
                        LocalizedString.new c[:content], c[:language], c[:script]
+                     elsif c.is_a?(String)
+                       LocalizedString.new c
                      else c
                      end
                    end

data/lib/relaton_bib/organization.rb

@@ -40,7 +40,7 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : prefix + "."
-      out = count > 1 ? "#{pref}identifier::\m" : ""
+      out = count > 1 ? "#{pref}identifier::\n" : ""
       out += "#{pref}identifier.type:: #{type}\n"
       out += "#{pref}identifier.value:: #{value}\n"
       out
@@ -119,7 +119,7 @@ module RelatonBib
     # @return [String]
     def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
       pref = prefix.sub /\*$/, "organization"
-      out = count > 1 ? "#{pref}::\m" : ""
+      out = count > 1 ? "#{pref}::\n" : ""
       name.each { |n| out += n.to_asciibib "#{pref}.name", name.size }
       out += abbreviation.to_asciibib "#{pref}.abbreviation" if abbreviation
       subdivision.each do |sd|

data/lib/relaton_bib/typed_uri.rb

@@ -10,7 +10,7 @@ module RelatonBib
 
     # @param type [String, NilClass] src/obp/rss
     # @param content [String]
-    def initialize(type: nil, content:)
+    def initialize(content:, type: nil)
       @type    = type
       @content = Addressable::URI.parse content if content
     end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.8.0".freeze
+  VERSION = "1.9.1".freeze
 end

data/lib/relaton_bib/workgroup.rb

@@ -1,45 +1,57 @@
 module RelatonBib
   class WorkGroup
     # @return [String]
-    attr_reader :content
+    attr_reader :name
 
     # @return [Integer, nil]
     attr_reader :number
 
     # @return [String, nil]
-    attr_reader :type
+    attr_reader :identifier, :prefix, :type
 
-    # @param content [String]
+    # @param name [String]
+    # @param identifier [String, nil]
+    # @param prefix [String, nil]
     # @param number [Integer, nil]
     # @param type [String, nil]
-    def initialize(content:, number: nil, type: nil)
-      @content = content
+    def initialize(name:, identifier: nil, prefix: nil, number: nil, type: nil)
+      @identifier = identifier
+      @prefix = prefix
+      @name = name
       @number = number
       @type = type
     end
 
     # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.text content
+    def to_xml(builder) # rubocop:disable Metrics/AbcSize
+      builder.text name
       builder.parent[:number] = number if number
       builder.parent[:type] = type if type
+      builder.parent[:identifier] = identifier if identifier
+      builder.parent[:prefix] = prefix if prefix
     end
 
     # @return [Hash]
     def to_hash
-      hash = { "content" => content }
+      hash = { "name" => name }
       hash["number"] = number if number
       hash["type"] = type if type
+      hash["identifier"] = identifier if identifier
+      hash["prefix"] = prefix if prefix
       hash
     end
 
-    # @param prefix [String]
+    # @param prfx [String]
+    # @param count [Integer]
     # @return [String]
-    def to_asciibib(prefix = "")
-      pref = prefix.empty? ? prefix : prefix + "."
-      out = "#{pref}content:: #{content}\n"
+    def to_asciibib(prfx = "", count = 1) # rubocop:disable Metrics/CyclomaticComplexity
+      pref = prfx.empty? ? prfx : "#{prfx}."
+      out = count > 1 ? "#{pref}::\n" : ""
+      out += "#{pref}name:: #{name}\n"
       out += "#{pref}number:: #{number}\n" if number
       out += "#{pref}type:: #{type}\n" if type
+      out += "#{pref}identifier:: #{identifier}\n" if identifier
+      out += "#{pref}prefix:: #{prefix}\n" if prefix
       out
     end
   end

data/lib/relaton_bib/xml_parser.rb

@@ -52,6 +52,7 @@ module RelatonBib
           license: bibitem.xpath("license").map(&:text),
           validity: fetch_validity(bibitem),
           doctype: ext&.at("doctype")&.text,
+          subdoctype: ext&.at("subdoctype")&.text,
           editorialgroup: fetch_editorialgroup(ext),
           ics: fetch_ics(ext),
           structuredidentifier: fetch_structuredidentifier(ext),
@@ -81,7 +82,7 @@ module RelatonBib
             type: n[:type],
             format: n[:format],
             language: n[:language],
-            script: n[:script]
+            script: n[:script],
           )
         end
         BiblioNoteCollection.new bnotes
@@ -201,7 +202,7 @@ module RelatonBib
         DocumentStatus.new(
           stage: stg ? stage(stg) : status.text,
           substage: stage(status.at("substage")),
-          iteration: status.at("iteration")&.text
+          iteration: status.at("iteration")&.text,
         )
       end
 
@@ -262,7 +263,7 @@ module RelatonBib
               city: c.at("./city")&.text,
               state: c.at("./state")&.text,
               country: c.at("./country")&.text,
-              postcode: c.at("./postcode")&.text
+              postcode: c.at("./postcode")&.text,
             )
           else
             Contact.new(type: c.name, value: c.text)
@@ -290,13 +291,13 @@ module RelatonBib
           name: name,
           affiliation: affiliations,
           contact: contact,
-          identifier: identifier
+          identifier: identifier,
         )
       end
 
       def name_part(person, part)
         person.xpath("./name/#{part}").map do |np|
-          LocalizedString.new np.text, np[:language]
+          LocalizedString.new np.text, np[:language], np[:script]
         end
       end
 
@@ -358,7 +359,7 @@ module RelatonBib
             description: relation_description(rel),
             bibitem: bib_item(item_data(rel.at("./bibitem"))),
             locality: localities(rel),
-            source_locality: source_localities(rel)
+            source_locality: source_localities(rel),
           )
         end
       end
@@ -376,7 +377,7 @@ module RelatonBib
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        BibliographicItem.new **item_hash
+        BibliographicItem.new(**item_hash)
       end
 
       # @param rel [Nokogiri::XML::Element]
@@ -398,7 +399,7 @@ module RelatonBib
         klass.new(
           loc[:type],
           LocalizedString.new(loc.at("./referenceFrom").text),
-          ref_to
+          ref_to,
         )
       end
 
@@ -436,8 +437,10 @@ module RelatonBib
         return unless ext && (eg = ext.at "editorialgroup")
 
         eg = eg.xpath("technical-committee").map do |tc|
-          wg = WorkGroup.new(content: tc.text, number: tc[:number]&.to_i,
-                             type: tc[:type])
+          wg = WorkGroup.new(
+            name: tc.text, number: tc[:number]&.to_i, type: tc[:type],
+            identifier: tc[:identifier], prefix: tc[:prefix]
+          )
           TechnicalCommittee.new wg
         end
         EditorialGroup.new eg if eg.any?
@@ -468,7 +471,7 @@ module RelatonBib
             supplementtype: si.at("supplementtype")&.text,
             supplementnumber: si.at("supplementnumber")&.text,
             language: si.at("language")&.text,
-            year: si.at("year")&.text
+            year: si.at("year")&.text,
           )
         end
         StructuredIdentifierCollection.new sids

data/lib/relaton_bib.rb

@@ -39,11 +39,11 @@ module RelatonBib
 
   # @param array [Array]
   # @return [Array<String>, String]
-  def single_element_array(array) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+  def single_element_array(array)
     if array.size > 1
       array.map { |e| e.is_a?(String) ? e : e.to_hash }
     else
-      array.first&.is_a?(String) ? array[0] : array.first&.to_hash
+      array.first.is_a?(String) ? array[0] : array.first&.to_hash
     end
   end
 end

data/relaton-bib.gemspec

@@ -21,14 +21,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_development_dependency "byebug"
-  # ec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -226,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="