relaton-bib 1.7.5 → 1.9.0

data/grammars/reqt.rng

@@ -30,15 +30,34 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -48,9 +67,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -135,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_bib/bib_item_locality.rb

@@ -44,7 +44,7 @@ module RelatonBib
     # @param count [Integeg] number of localities
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{prefix}::\n" : ""
       out += "#{pref}type:: #{type}\n"
       out += "#{pref}reference_from:: #{reference_from}\n"

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_relation.rb

@@ -13,7 +13,7 @@ module RelatonBib
       derives describes describedBy catalogues cataloguedBy hasSuccessor
       successorOf adaptedFrom hasAdaptation adoptedFrom adoptedAs reviewOf
       hasReview commentaryOf hasCommentary related complements complementOf
-      obsoletes obsoletedBy cited isCitedIn
+      obsoletes obsoletedBy cites isCitedIn
     ].freeze
 
     # @return [String]

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

@@ -7,7 +7,7 @@ module RelatonBib
   class FormattedString < LocalizedString
     FORMATS = %w[text/plain text/html application/docbook+xml
                  application/tei+xml text/x-asciidoc text/markdown
-                 application/x-isodoc+xml].freeze
+                 application/x-metanorma+xml].freeze
 
     # @return [String]
     attr_reader :format

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