relaton-bib 1.7.1 → 1.8.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_item.rb

@@ -197,23 +197,23 @@ module RelatonBib
       @title = TypedTitleStringCollection.new(args[:title])
 
       @date = (args[:date] || []).map do |d|
-        d.is_a?(Hash) ? BibliographicDate.new(d) : d
+        d.is_a?(Hash) ? BibliographicDate.new(**d) : d
       end
 
       @contributor = (args[:contributor] || []).map do |c|
         if c.is_a? Hash
-          e = c[:entity].is_a?(Hash) ? Organization.new(c[:entity]) : c[:entity]
+          e = c[:entity].is_a?(Hash) ? Organization.new(**c[:entity]) : c[:entity]
           ContributionInfo.new(entity: e, role: c[:role])
         else c
         end
       end
 
       @abstract = (args[:abstract] || []).map do |a|
-        a.is_a?(Hash) ? FormattedString.new(a) : a
+        a.is_a?(Hash) ? FormattedString.new(**a) : a
       end
 
       @copyright = args.fetch(:copyright, []).map do |c|
-        c.is_a?(Hash) ? CopyrightAssociation.new(c) : c
+        c.is_a?(Hash) ? CopyrightAssociation.new(**c) : c
       end
 
       @docidentifier  = args[:docid] || []
@@ -229,7 +229,7 @@ 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)
+        if s.is_a?(Hash) then TypedUri.new(**s)
         elsif s.is_a?(String) then TypedUri.new(content: s)
         else s
         end
@@ -257,6 +257,13 @@ module RelatonBib
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
+    # @param hash [Hash]
+    # @return [RelatonBipm::BipmBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonBib::HashConverter.hash_to_bib(hash)
+      new **item_hash
+    end
+
     # @param lang [String] language code Iso639
     # @return [RelatonBib::FormattedString, Array<RelatonBib::FormattedString>]
     def abstract(lang: nil)

data/lib/relaton_bib/bibtex_parser.rb

@@ -101,14 +101,14 @@ module RelatonBib
         if bibtex["organization"]
           contributor << {
             entity: { name: bibtex.organization.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }]
+            role: [{ type: "distributor", description: ["sponsor"] }],
           }
         end
 
         if bibtex["school"]
           contributor << {
             entity: { name: bibtex.school.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }]
+            role: [{ type: "distributor", description: ["sponsor"] }],
           }
         end
         contributor

data/lib/relaton_bib/copyright_association.rb

@@ -30,7 +30,7 @@ module RelatonBib
       end
 
       @owner = owner.map do |o|
-        o.is_a?(Hash) ? ContributionInfo.new(entity: Organization.new(o)) : o
+        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}/

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

@@ -18,7 +18,7 @@ module RelatonBib
     #                   RelatonBib::SourceLocalityStack>] :source_locality
     # @option relation [RelatonBib::BibliographicItem, NillClass] :bibitem (nil)
     def initialize(relation)
-      @array = relation.map { |r| r.is_a?(Hash) ? DocumentRelation.new(r) : r }
+      @array = relation.map { |r| r.is_a?(Hash) ? DocumentRelation.new(**r) : r }
     end
 
     # @todo We don't have replace type anymore. Suppose we should update this

data/lib/relaton_bib/document_status.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module RelatonBib
   # Document status.
   class DocumentStatus
@@ -54,7 +55,7 @@ module RelatonBib
     # @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?(Hash) then Stage.new(**stg)
       elsif stg.is_a?(String) then Stage.new(value: stg)
       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

@@ -97,7 +97,7 @@ module RelatonBib
         return unless ret[:place]
 
         ret[:place] = array(ret[:place]).map do |pl|
-          pl.is_a?(String) ? Place.new(name: pl) : Place.new(pl)
+          pl.is_a?(String) ? Place.new(name: pl) : Place.new(**pl)
         end
       end
 
@@ -146,7 +146,7 @@ module RelatonBib
         ret[:biblionote] = array(ret[:biblionote])
           .reduce(BiblioNoteCollection.new([])) do |mem, n|
           mem << if n.is_a?(String) then BiblioNote.new content: n
-                 else BiblioNote.new(n)
+                 else BiblioNote.new(**n)
                  end
         end
       end
@@ -247,10 +247,10 @@ 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])),
+            organization: Organization.new(**org_hash_to_bib(a[:organization])),
             description: a[:description]
           )
         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
@@ -356,26 +356,26 @@ module RelatonBib
           end
           s[:abbreviation] &&
             s[:abbreviation] = localizedstring(s[:abbreviation])
-          Series.new(s)
+          Series.new(**s)
         end
       end
 
       # @param title [Hash]
       # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        TypedTitleString.new title
+        TypedTitleString.new **title
       end
 
       # @param ret [Hash]
       def medium_hash_to_bib(ret)
-        ret[:medium] = Medium.new(ret[:medium]) if ret[:medium]
+        ret[:medium] = Medium.new(**ret[:medium]) if ret[:medium]
       end
 
       # @param ret [Hash]
       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
@@ -409,7 +409,7 @@ module RelatonBib
         return unless ret[:editorialgroup]
 
         technical_committee = array(ret[:editorialgroup]).map do |wg|
-          TechnicalCommittee.new WorkGroup.new(wg)
+          TechnicalCommittee.new WorkGroup.new(**wg)
         end
         ret[:editorialgroup] = EditorialGroup.new technical_committee
       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
@@ -485,7 +485,7 @@ module RelatonBib
       # @return [RelatonBib::FormattedRef]
       def formattedref(frf)
         if frf.is_a?(Hash)
-          RelatonBib::FormattedRef.new(frf)
+          RelatonBib::FormattedRef.new(**frf)
         else
           RelatonBib::FormattedRef.new(content: frf)
         end

data/lib/relaton_bib/ics.rb

@@ -1,11 +1,14 @@
 module RelatonBib
   class ICS
     # @return [String]
-    attr_reader :code, :text
+    attr_reader :code
+
+    # @return [String, nil]
+    attr_reader :text
 
     # @param code [String]
-    # @param text [String]
-    def initialize(code:, text:)
+    # @param text [String, nil]
+    def initialize(code:, text: nil)
       @code = code
       @text = text
     end
@@ -14,23 +17,25 @@ module RelatonBib
     def to_xml(builder)
       builder.ics do |b|
         b.code code
-        b.text_ text
+        b.text_ text if text
       end
     end
 
     # @return [Hash]
     def to_hash
-      { "code" => code, "text" => text }
+      hash = { "code" => code }
+      hash["text"] = text if text
+      hash
     end
 
     # @param prefix [String]
     # @param count [Integer] number of ics
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? "ics" : prefix + ".ics"
+      pref = prefix.empty? ? "ics" : "#{prefix}.ics"
       out = count > 1 ? "#{pref}::\n" : ""
       out += "#{pref}.code:: #{code}\n"
-      out += "#{pref}.text:: #{text}\n"
+      out += "#{pref}.text:: #{text}\n" if text
       out
     end
   end

data/lib/relaton_bib/organization.rb

@@ -5,8 +5,8 @@ require "relaton_bib/contributor"
 module RelatonBib
   # Organization identifier.
   class OrgIdentifier
-    ORCID = "orcid"
-    URI   = "uri"
+    # ORCID = "orcid"
+    # URI   = "uri"
 
     # @return [String]
     attr_reader :type
@@ -14,12 +14,12 @@ module RelatonBib
     # @return [String]
     attr_reader :value
 
-    # @param type [String] "orcid" or "uri"
+    # @param type [String]
     # @param value [String]
     def initialize(type, value)
-      unless [ORCID, URI].include? type
-        raise ArgumentError, 'Invalid type. It should be "orsid" or "uri".'
-      end
+      # unless [ORCID, URI].include? type
+      #   raise ArgumentError, 'Invalid type. It should be "orsid" or "uri".'
+      # end
 
       @type  = type
       @value = value
@@ -82,7 +82,7 @@ module RelatonBib
       @subdivision  = (args[:subdivision] || []).map do |sd|
         localized_string sd
       end
-      @identifier   = args.fetch(:identifier, [])
+      @identifier = args.fetch(:identifier, [])
     end
 
     # @param opts [Hash]

data/lib/relaton_bib/person.rb

@@ -102,15 +102,17 @@ module RelatonBib
 
   # Person identifier type.
   module PersonIdentifierType
-    ISNI = "isni"
-    URI  = "uri"
+    ISNI  = "isni"
+    ORCID = "orcid"
+    URI   = "uri"
 
     # Checks type.
     # @param type [String]
     # @raise [ArgumentError] if type isn't "isni" or "uri"
     def self.check(type)
-      unless [ISNI, URI].include? type
-        raise ArgumentError, 'Invalid type. It should be "isni" or "uri".'
+      unless [ISNI, ORCID, URI].include? type
+        raise ArgumentError, 'Invalid type. It should be "isni", "orcid", "\
+          "or "uri".'
       end
     end
   end
@@ -118,6 +120,7 @@ module RelatonBib
   # Person identifier.
   class PersonIdentifier
     # @return [RelatonBib::PersonIdentifierType::ISNI,
+    #   RelatonBib::PersonIdentifierType::ORCID,
     #   RelatonBib::PersonIdentifierType::URI]
     attr_accessor :type
 
@@ -125,6 +128,7 @@ module RelatonBib
     attr_accessor :value
 
     # @param type [RelatonBib::PersonIdentifierType::ISNI,
+    #   RelatonBib::PersonIdentifierType::ORCID,
     #   RelatonBib::PersonIdentifierType::URI]
     # @param value [String]
     def initialize(type, value)

data/lib/relaton_bib/series.rb

@@ -5,7 +5,7 @@ module RelatonBib
   # Series class.
   #
   class Series
-    TYPES = %w[main alt].freeze
+    # TYPES = %w[main alt].freeze
 
     # @return [String, NilClass] allowed values: "main" or "alt"
     attr_reader :type
@@ -56,9 +56,9 @@ module RelatonBib
         raise ArgumentError, "argument `title` or `formattedref` should present"
       end
 
-      if args[:type] && !TYPES.include?(args[:type])
-        warn "[relaton-bib] Series type is invalid: #{args[:type]}"
-      end
+      # if args[:type] && !TYPES.include?(args[:type])
+      #   warn "[relaton-bib] Series type is invalid: #{args[:type]}"
+      # end
 
       @type         = args[:type] # if %w[main alt].include? args[:type]
       @title        = args[:title]