relaton-bib 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9fc54368323400ffb7dce1f7a0705f2b9e9df0235fa5874af273328e47bd346
-  data.tar.gz: 57b99f8695612ae66cee16773a6844fa2b76b9d8caf480d8850a9b869e15b464
+  metadata.gz: 882b6680091bd4bf9ba97871af6aab74dede4be12e1e6981d5e7a9a274e65659
+  data.tar.gz: 5ecf64a911e0cad8ca924b3fe3626b54ef60295f89f58a8e59895c415390d502
 SHA512:
-  metadata.gz: e9e6b02e3131f7ae5d6b9e67f77bf435901aa1ea367b5498835c2fc18f84763e0fb3cd8b5741a72a3b0136b3af37e17a978c5bd26a806e3ce0a27c3796c47968
-  data.tar.gz: ecf5bbc9dbaa83ad376ce8478d0a55d81eff5f48dc5f6ab358c1e6655de77ce9d5ce05615d9b86b714078ad54db613f3a1d13ee7788438571a62f36fbb5fdbdb
+  metadata.gz: 31ebec09d58af3173fc687dcbf8cfddb34b859110d05a11bc32ed144aefe0b8b57da36395ee002aad57802c32c3804aac33098d2d7d322ee442941567add638b
+  data.tar.gz: 828fbafc60fb7a16b876ece52b1631870ef8fdda63dce780f6a35e30907fab3f76684e02b2991db1e0ba159a61081a5e7198d6d470f1bee529ee72c61ccab921

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/relaton_bib/bibxml_parser.rb

@@ -80,7 +80,7 @@ module RelatonBib
         /^(?<pref>I-D|3GPP|W3C|[A-Z]{2,})[._]?(?<num>.+)/ =~ id
         num.sub!(/^-?0+/, "") if %w[RFC BCP FYI STD].include?(pref)
         pid = pref ? "#{pref} #{num}" : id
-        ret << DocumentIdentifier.new(type: pubid_type(id), id: pid)
+        ret << DocumentIdentifier.new(type: pubid_type(id), id: pid, primary: true)
       end
       %w[anchor docName number].each do |atr|
         if reference[atr]

data/lib/relaton_bib/copyright_association.rb

@@ -33,7 +33,7 @@ module RelatonBib
         o.is_a?(Hash) ? ContributionInfo.new(entity: Organization.new(**o)) : o
       end
 
-      @from  = Date.strptime(from.to_s, "%Y") if from.to_s.match? /\d{4}/
+      @from  = Date.strptime(from.to_s, "%Y") if from.to_s.match?(/\d{4}/)
       @to    = Date.strptime(to.to_s, "%Y") unless to.to_s.empty?
       @scope = scope
     end
@@ -45,7 +45,7 @@ module RelatonBib
       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 **opts } }
+        owner.each { |o| builder.owner { o.to_xml(**opts) } }
         builder.scope scope if scope
       end
     end

data/lib/relaton_bib/document_identifier.rb

@@ -7,13 +7,18 @@ module RelatonBib
     # @return [String, NilClass]
     attr_reader :type, :scope
 
+    # @param type [Boolean, nil]
+    attr_reader :primary
+
     # @param id [String]
     # @param type [String, NilClass]
     # @param scope [String, NilClass]
-    def initialize(id:, type: nil, scope: nil)
+    # @param priority [Bolean]
+    def initialize(id:, type: nil, scope: nil, primary: false)
       @id    = id
       @type  = type
       @scope = scope
+      @primary = primary
     end
 
     # in docid manipulations, assume ISO as the default: id-part:year
@@ -56,6 +61,7 @@ module RelatonBib
       element = opts[:builder].docidentifier lid
       element[:type] = type if type
       element[:scope] = scope if scope
+      element[:primary] = primary if primary
     end
 
     # @return [Hash]
@@ -63,19 +69,21 @@ module RelatonBib
       hash = { "id" => id }
       hash["type"] = type if type
       hash["scope"] = scope if scope
+      hash["primary"] = primary if primary
       hash
     end
 
     # @param prefix [String]
     # @param count [Integer] number of docids
     # @return [String]
-    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/CyclomaticComplexity
+    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
       pref = prefix.empty? ? prefix : "#{prefix}."
       return "#{pref}docid:: #{id}\n" unless type || scope
 
       out = count > 1 ? "#{pref}docid::\n" : ""
       out += "#{pref}docid.type:: #{type}\n" if type
       out += "#{pref}docid.scope:: #{scope}\n" if scope
+      out += "#{pref}docid.primary:: #{primary}\n" if primary
       out + "#{pref}docid.id:: #{id}\n"
     end
 

data/lib/relaton_bib/hash_converter.rb

@@ -126,8 +126,9 @@ module RelatonBib
         ret[:docid] = array(ret[:docid])
         ret[:docid]&.each_with_index do |id, i|
           type = id[:type] || id[:id].match(/^\w+(?=\s)/)&.to_s
-          ret[:docid][i] = DocumentIdentifier.new(id: id[:id], type: type,
-                                                  scope: id[:scope])
+          ret[:docid][i] = DocumentIdentifier.new(
+            id: id[:id], type: type, scope: id[:scope], primary: id[:primary],
+          )
         end
       end
 

data/lib/relaton_bib/validity.rb

@@ -1,6 +1,6 @@
 module RelatonBib
   class Validity
-    FORMAT = "%Y-%m-%d %H:%M"
+    FORMAT = "%Y-%m-%d %H:%M".freeze
 
     # @return [Time, NilClass]
     attr_reader :begins
@@ -41,7 +41,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? "validity." : prefix + ".validity."
+      pref = prefix.empty? ? "validity." : "#{prefix}.validity."
       out = ""
       out += "#{pref}begins:: #{begins.strftime(FORMAT)}\n" if begins
       out += "#{pref}ends:: #{ends.strftime(FORMAT)}\n" if ends

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.10.0".freeze
+  VERSION = "1.10.1".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -161,8 +161,9 @@ module RelatonBib
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(item)
         item.xpath("./docidentifier").map do |did|
+          primary = true if did[:primary] == "true"
           DocumentIdentifier.new(id: did.text, type: did[:type],
-                                 scope: did[:scope])
+                                 scope: did[:scope], primary: primary)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug