relaton-bib 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf0aacc339840ecc4607d6b87e625eaef60ba12ab0fbeffba5876898518f138
-  data.tar.gz: e41a599b99baaa6d1002cd3ad13803bcffeaa6949840a8cd757db3689716f06b
+  metadata.gz: 1f046b9f9c341d92cec95e89a817afea83133a322255f259c34c869aafcea60c
+  data.tar.gz: e9535bc5707436472ef9986faa9e429d2c451c94bc9b46f0ed10b21b8304dc41
 SHA512:
-  metadata.gz: 4f8e1bfe3c6ca8d2ec19733f7ea0f018bae2a102ad92d05bb0983ddf9b7e8715c86c56980ffa106500c2a6971a625143cb6bec2ae9b9a2dd0190fc8b605539c1
-  data.tar.gz: 721ba6235c7cabc380825ce184f0b2874f1ba519b2f6b9dc44fea52ae061b3bdd18ab56c5db94698535b8db10fe365a88aaf23bcd32a25fa5ce7de96bb8a93b6
+  metadata.gz: 85b19d11a3eef57448df18fee645c53539fc485cf90f6b07b303311bf0d7dd2f4666c1bacfeae3f15aafc372cc93a60bfbcb3993783cba3103dd018633607633
+  data.tar.gz: 6a91bcba71ca9d070eb906a827ee8b5be314b888691e1f4849081163efc1c9e2b2218ac3d03e791569852cfa49ec9c2d1af7e8e16a45ff2facbf2af9b1c32824

data/lib/relaton_bib.rb

@@ -13,7 +13,8 @@ module RelatonBib
     # @param date [String]
     # @return [Date, NilClass]
     def parse_date(sdate)
-      if /(?<date>\w+\s\d{4})/ =~ sdate # February 2012
+      if sdate.is_a?(Date) then sdate
+      elsif /(?<date>\w+\s\d{4})/ =~ sdate # February 2012
         Date.strptime(date, "%B %Y")
       elsif /(?<date>\w+\s\d{1,2},\s\d{4})/ =~ sdate # February 11, 2012
         Date.strptime(date, "%B %d, %Y")
@@ -21,8 +22,7 @@ module RelatonBib
         Date.parse(date)
       elsif /(?<date>\d{4}-\d{2})/ =~ sdate # 2012-02
         Date.strptime date, "%Y-%m"
-      elsif /(?<date>\d{4})/ =~ sdate # 2012
-        Date.strptime date, "%Y"
+      elsif /(?<date>\d{4})/ =~ sdate then Date.strptime date, "%Y" # 2012
       end
     end
   end

data/lib/relaton_bib/bibliographic_item.rb

@@ -83,7 +83,7 @@ module RelatonBib
     # @return [RelatonBib::DocumentStatus, NilClass]
     attr_reader :status
 
-    # @return [RelatonBib::CopyrightAssociation, NilClass]
+    # @return [Array<RelatonBib::CopyrightAssociation>]
     attr_reader :copyright
 
     # @return [RelatonBib::DocRelationCollection]
@@ -141,10 +141,11 @@ module RelatonBib
     # @param fetched [Date, NilClass] default nil
     # @param keyword [Array<String>]
     #
-    # @param copyright [Hash, RelatonBib::CopyrightAssociation, NilClass]
-    # @option copyright [Hash, RelatonBib::ContributionInfo] :owner
-    # @option copyright [String] :form
+    # @param copyright [Array<Hash, RelatonBib::CopyrightAssociation>]
+    # @option copyright [Array<Hash, RelatonBib::ContributionInfo>] :owner
+    # @option copyright [String] :from
     # @option copyright [String, NilClass] :to
+    # @option copyright [String, NilClass] :scope
     #
     # @param date [Array<Hash>]
     # @option date [String] :type
@@ -202,11 +203,8 @@ module RelatonBib
         a.is_a?(Hash) ? FormattedString.new(a) : a
       end
 
-      if args[:copyright]
-        @copyright = if args[:copyright].is_a?(Hash)
-                       CopyrightAssociation.new args[:copyright]
-                     else args[:copyright]
-                     end
+      @copyright = args.fetch(:copyright, []).map do |c|
+        c.is_a?(Hash) ? CopyrightAssociation.new(c) : c
       end
 
       @docidentifier  = args[:docid] || []
@@ -308,7 +306,7 @@ module RelatonBib
       hash["formattedref"] = formattedref.to_hash if formattedref
       hash["abstract"] = single_element_array(abstract) if abstract&.any?
       hash["docstatus"] = status.to_hash if status
-      hash["copyright"] = copyright.to_hash if copyright
+      hash["copyright"] = single_element_array(copyright) if copyright&.any?
       hash["relation"] = single_element_array(relation) if relation&.any?
       hash["series"] = single_element_array(series) if series&.any?
       hash["medium"] = medium.to_hash if medium
@@ -530,7 +528,7 @@ module RelatonBib
         script.each { |s| builder.script s }
         abstract.each { |a| builder.abstract { a.to_xml(builder) } }
         status&.to_xml builder
-        copyright&.to_xml builder
+        copyright&.each { |c| c.to_xml builder }
         relation.each { |r| r.to_xml builder, **opts }
         series.each { |s| s.to_xml builder }
         medium&.to_xml builder

data/lib/relaton_bib/bibtex_parser.rb

@@ -147,17 +147,16 @@ module RelatonBib
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::BiblioNote>]
       def fetch_note(bibtex)
-        note = []
-        note << BiblioNote.new(type: "annote", content: bibtex.annote.to_s) if bibtex["annote"]
-
-        if bibtex["howpublished"]
-          note << BiblioNote.new(type: "howpublished", content: bibtex.howpublished.to_s)
+        bibtex.select do |k, _v|
+          %i[annote howpublished comment note content].include? k
+        end.reduce([]) do |mem, note|
+          type = case note[0]
+                 when :note then nil
+                 when :content then "tableOfContents"
+                 else note[0].to_s
+                 end
+          mem << BiblioNote.new(type: type, content: note[1].to_s)
         end
-
-        note << BiblioNote.new(type: "comment", content: bibtex.comment.to_s) if bibtex["comment"]
-        note << BiblioNote.new(content: bibtex.note.to_s) if bibtex["note"]
-        note << BiblioNote.new(type: "tableOfContents", content: bibtex["content"]) if bibtex["content"]
-        note
       end
 
       # @param bibtex [BibTeX::Entry]
@@ -172,16 +171,19 @@ module RelatonBib
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::BibItemLocality>]
       def fetch_extent(bibtex)
-        extent = []
-        extent << BibItemLocality.new("chapter", bibtex.chapter.to_s) if bibtex["chapter"]
-
-        if bibtex["pages"]
-          from, to = bibtex.pages.to_s.split "-"
-          extent << BibItemLocality.new("page", from, to)
+        bibtex.select do |k, _v|
+          %i[chapter pages volume].include? k
+        end.reduce([]) do |mem, loc|
+          if loc[0] == :pages
+            type = "page"
+            from, to = loc[1].to_s.split "-"
+          else
+            type = loc[0].to_s
+            from = loc[1].to_s
+            to = nil
+          end
+          mem << BibItemLocality.new(type, from, to)
         end
-
-        extent << BibItemLocality.new("volume", bibtex.volume.to_s) if bibtex["volume"]
-        extent
       end
 
       # @param bibtex [BibTeX::Entry]
@@ -192,7 +194,7 @@ module RelatonBib
           series << Series.new(
             type: "journal",
             title: TypedTitleString.new(content: bibtex.journal.to_s),
-            number: bibtex["number"]&.to_s
+            number: bibtex["number"]&.to_s,
           )
         end
 

data/lib/relaton_bib/copyright_association.rb

@@ -1,29 +1,41 @@
 module RelatonBib
   # Copyright association.
   class CopyrightAssociation
+    include RelatonBib
+
     # @return [Date]
     attr_reader :from
 
     # @return [Date, NilClass]
     attr_reader :to
 
-    # @return [RelatonBib::ContributionInfo]
+    # @return [String, NilClass]
+    attr_reader :scope
+
+    # @return [Array<RelatonBib::ContributionInfo>]
     attr_reader :owner
 
-    # @param owner [Hash, RelatonBib::ContributionInfo] contributor
+    # rubocop:disable Metrics/AbcSize
+
+    # @param owner [Array<Hash, RelatonBib::ContributionInfo>] contributor
     # @option owner [String] :name
     # @option owner [String] :abbreviation
     # @option owner [String] :url
     # @param from [String] date
     # @param to [String, NilClass] date
-    def initialize(owner:, from:, to: nil)
-      @owner = if owner.is_a?(Hash)
-                 ContributionInfo.new entity: Organization.new(owner)
-               else owner
-               end
+    # @param scope [String, NilClass]
+    def initialize(owner:, from:, to: nil, scope: nil)
+      unless owner.any?
+        raise ArgumentError, "at least one owner should exist."
+      end
+
+      @owner = owner.map do |o|
+        o.is_a?(Hash) ? ContributionInfo.new(entity: Organization.new(o)) : o
+      end
 
       @from  = Date.strptime(from.to_s, "%Y") if from.to_s =~ /\d{4}/
       @to    = Date.strptime(to.to_s, "%Y") unless to.to_s.empty?
+      @scope = scope
     end
 
     # @param builder [Nokogiri::XML::Builder]
@@ -31,14 +43,21 @@ module RelatonBib
       builder.copyright do
         builder.from from ? from.year : "unknown"
         builder.to to.year if to
-        builder.owner { owner.to_xml builder }
+        owner.each { |o| builder.owner { o.to_xml builder } }
+        builder.scope scope if scope
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # @return [Hash]
     def to_hash
-      hash = { "owner" => owner.to_hash["organization"], "from" => from.year.to_s }
+      owners = single_element_array(owner.map { |o| o.to_hash["organization"] })
+      hash = {
+        "owner" => owners,
+        "from" => from.year.to_s,
+      }
       hash["to"] = to.year.to_s if to
+      hash["scope"] = scope if scope
       hash
     end
   end

data/lib/relaton_bib/document_relation.rb

@@ -1,24 +1,27 @@
 module RelatonBib
-  # module DocumentRelationType
-  #   PARENT        = 'parent'
-  #   CHILD         = 'child'
-  #   OBSOLETES     = 'obsoletes'
-  #   UPDATES       = 'updates'
-  #   COMPLEMENTS   = 'complements'
-  #   DERIVED_FORM  = 'derivedForm'
-  #   ADOPTED_FORM  = 'adoptedForm'
-  #   EQUIVALENT    = 'equivalent'
-  #   IDENTICAL     = 'identical'
-  #   NONEQUIVALENT = 'nonequivalent'
-  # end
-
   # Documett relation
   class DocumentRelation
     include RelatonBib
 
+    TYPES = %w[
+      includes includedIn hasPart partOf merges mergedInto splits splitInto
+      instance hasInstance exemplarOf hasExemplar manifestationOf
+      hasManifestation reproductionOf hasReproduction reprintOf hasReprint
+      expressionOf hasExpression translatedFrom hasTranslation arrangementOf
+      hasArrangement abridgementOf hasAbridgement annotationOf hasAnnotation
+      draftOf hasDraft editionOf hasEdition updates updatedBy derivedFrom
+      derives describes describedBy catalogues cataloguedBy hasSuccessor
+      successorOf adaptedFrom hasAdaptation adoptedFrom adoptedAs reviewOf
+      hasReview commentaryOf hasCommentary related complements complementOf
+      obsoletes obsoletedBy cited isCitedIn
+    ].freeze
+
     # @return [String]
     attr_reader :type
 
+    # @return [RelatonBib::FormattedString, NilClass]
+    attr_reader :description
+
     # @return [String]
     # attr_reader :identifier, :url
 
@@ -28,35 +31,49 @@ module RelatonBib
     # @return [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
     attr_reader :locality
 
-    # @return [Array<RelatonBib::SourceLocality, RelatonBib::SourceLocalityStack>]
+    # @return [Array<RelatonBib::SourceLocality,
+    #   RelatonBib::SourceLocalityStack>]
     attr_reader :source_locality
 
     # @param type [String]
-    # @param bibitem [RelatonBib::BibliographicItem, RelatonIso::IsoBibliographicItem]
+    # @parma description [RelatonBib::FormattedString, NilClass]
+    # @param bibitem [RelatonBib::BibliographicItem,
+    #   RelatonIso::IsoBibliographicItem]
     # @param locality [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
-    # @param source_locality [Array<RelatonBib::SourceLocality, RelatonBib::SourceLocalityStack>]
-    def initialize(type:, bibitem:, locality: [], source_locality: [])
-      type             = "obsoletes" if type == "Now withdrawn"
+    # @param source_locality [Array<RelatonBib::SourceLocality,
+    #   RelatonBib::SourceLocalityStack>]
+    def initialize(type:, description: nil, bibitem:, locality: [],
+                   source_locality: [])
+      type = "obsoletes" if type == "Now withdrawn"
+      unless TYPES.include? type
+        warn "[relaton-bib] WARNING: invalid relation type: #{type}"
+      end
       @type            = type
+      @description     = description
       @locality        = locality
       @source_locality = source_locality
       @bibitem         = bibitem
     end
 
+    # rubocop:disable Metrics/AbcSize
+
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder, **opts)
       opts.delete :bibdata
       opts.delete :note
       builder.relation(type: type) do
+        builder.description { description.to_xml builder } if description
         bibitem.to_xml(builder, **opts.merge(embedded: true))
         locality.each { |l| l.to_xml builder }
         source_locality.each { |l| l.to_xml builder }
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # @return [Hash]
     def to_hash
       hash = { "type" => type, "bibitem" => bibitem.to_hash }
+      hash["description"] = description.to_hash if description
       hash["locality"] = single_element_array(locality) if locality&.any?
       if source_locality&.any?
         hash["source_locality"] = single_element_array(source_locality)

data/lib/relaton_bib/document_relation_collection.rb

@@ -23,9 +23,12 @@ module RelatonBib
       @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
+    #   method or delete it.
+    #
     # @return [RelatonBib::DocRelationCollection]
     def replaces
-      DocRelationCollection.new @array.select { |r| r.type == "replace" }
+      DocRelationCollection.new(@array.select { |r| r.type == "replace" })
     end
   end
 end

data/lib/relaton_bib/document_status.rb

@@ -5,21 +5,21 @@ require "relaton_bib/localized_string"
 module RelatonBib
   # Document status.
   class DocumentStatus
-    # @return [String]
+    # @return [RelatonBib::DocumentStatus::Stage]
     attr_reader :stage
 
-    # @return [String, NilClass]
+    # @return [RelatonBib::DocumentStatus::Stage, NilClass]
     attr_reader :substage
 
     # @return [String, NilClass]
     attr_reader :iteration
 
-    # @param stage [String]
-    # @param substage [String, NilClass]
+    # @param stage [String, Hash, RelatonBib::DocumentStatus::Stage]
+    # @param substage [String, Hash, NilClass, RelatonBib::DocumentStatus::Stage]
     # @param iteration [String, NilClass]
     def initialize(stage:, substage: nil, iteration: nil)
-      @stage = stage
-      @substage = substage
+      @stage = stage_new stage
+      @substage = stage_new substage
       @iteration = iteration
     end
 
@@ -27,18 +27,57 @@ module RelatonBib
     def to_xml(builder)
       builder.status do
         # FormattedString.instance_method(:to_xml).bind(status).call builder
-        builder.stage stage
-        builder.substage substage if substage
+        builder.stage { |b| stage.to_xml b }
+        builder.substage { |b| substage.to_xml b } if substage
         builder.iteration iteration unless iteration.to_s.empty?
       end
     end
 
     # @return [Hash]
     def to_hash
-      hash = { "stage" => stage }
-      hash["substage"] = substage if substage
+      hash = { "stage" => stage.to_hash }
+      hash["substage"] = substage.to_hash if substage
       hash["iteration"] = iteration if iteration
       hash
     end
+
+    private
+
+    # @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)
+      end
+    end
+
+    class Stage
+      # @return [String]
+      attr_reader :value
+
+      # @return [String, NilClass]
+      attr_reader :abbreviation
+
+      # @parma value [String]
+      # @param abbreviation [String, NilClass]
+      def initialize(value:, abbreviation: nil)
+        @value = value
+        @abbreviation = abbreviation
+      end
+
+      # @param [Nokogiri::XML::Builder]
+      def to_xml(builder)
+        builder.parent[:abbreviation] = abbreviation if abbreviation
+        builder.text value
+      end
+
+      # @return [Hash]
+      def to_hash
+        hash = { "value" => value }
+        hash["abbreviation"] = abbreviation if abbreviation
+        hash
+      end
+    end
   end
 end

data/lib/relaton_bib/formatted_string.rb

@@ -12,7 +12,7 @@ module RelatonBib
     # @return [String]
     attr_reader :format
 
-    # @param content [String]
+    # @param content [String, Array<RelatonBib::LocalizedString>]
     # @param language [String, NilClass] language code Iso639
     # @param script [String, NilClass] script code Iso15924
     # @param format [String] the content type
@@ -36,8 +36,8 @@ module RelatonBib
       hash = super
       return hash unless format
 
-      hash = { "content" => hash } if hash.is_a? String
-      hash["format"] = format if format
+      hash = { "content" => hash } unless hash.is_a? Hash
+      hash["format"] = format
       hash
     end
   end

data/lib/relaton_bib/hash_converter.rb

@@ -1,6 +1,11 @@
 module RelatonBib
   class HashConverter
     class << self
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
+      # @param args [Hash]
+      # @param neated [TrueClas, FalseClass] default true
+      # @return [Hash]
       def hash_to_bib(args, nested = false)
         return nil unless args.is_a?(Hash)
 
@@ -18,6 +23,7 @@ module RelatonBib
         formattedref_hash_to_bib(ret)
         docstatus_hash_to_bib(ret)
         contributors_hash_to_bib(ret)
+        copyright_hash_to_bib(ret)
         relations_hash_to_bib(ret)
         series_hash_to_bib(ret)
         medium_hash_to_bib(ret)
@@ -30,6 +36,7 @@ module RelatonBib
         ret[:license] = array(ret[:license])
         ret
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       def timestamp_hash(ret)
         ret[:fetched] ||= Date.today.to_s
@@ -52,7 +59,8 @@ module RelatonBib
         ret[:title] = ret[:title].map do |t|
           if t.is_a?(Hash) then t
           else
-            { content: t, language: "en", script: "Latn", format: "text/plain", type: "main" }
+            { content: t, language: "en", script: "Latn", format: "text/plain",
+              type: "main" }
           end
         end
       end
@@ -151,12 +159,21 @@ module RelatonBib
 
       def docstatus_hash_to_bib(ret)
         ret[:docstatus] && ret[:docstatus] = DocumentStatus.new(
-          stage: ret[:docstatus][:stage],
-          substage: ret[:docstatus][:substage],
+          stage: stage(ret[:docstatus][:stage]),
+          substage: stage(ret[:docstatus][:substage]),
           iteration: ret[:docstatus][:iteration],
         )
       end
 
+      # @param stg [Hash]
+      # @return [RelatonBib::DocumentStatus::Stage]
+      def stage(stg)
+        return unless stg
+
+        args = stg.is_a?(String) ? { value: stg } : stg
+        DocumentStatus::Stage.new(**args)
+      end
+
       def contributors_hash_to_bib(ret)
         return unless ret[:contributor]
 
@@ -252,12 +269,25 @@ module RelatonBib
         end
       end
 
+      # @param ret [Hash]
+      def copyright_hash_to_bib(ret)
+        return unless ret[:copyright]
+
+        ret[:copyright] = array(ret[:copyright]).map do |c|
+          c[:owner] = array(c[:owner])
+          c
+        end
+      end
+
       # @param ret [Hash]
       def relations_hash_to_bib(ret)
         return unless ret[:relation]
 
         ret[:relation] = array(ret[:relation])
         ret[:relation]&.each do |r|
+          if r[:description]
+            r[:description] = FormattedString.new r[:description]
+          end
           relation_bibitem_hash_to_bib(r)
           relation_locality_hash_to_bib(r)
           relation_source_locality_hash_to_bib(r)
@@ -312,7 +342,7 @@ module RelatonBib
         ret[:series] = array(ret[:series])&.map do |s|
           s[:formattedref] && s[:formattedref] = formattedref(s[:formattedref])
           if s[:title]
-            s[:title] = { content: s[:title] } unless s.is_a?(Hash)
+            s[:title] = { content: s[:title] } unless s[:title].is_a?(Hash)
             s[:title] = typed_title_strig(s[:title])
           end
           s[:abbreviation] && s[:abbreviation] = localizedstring(s[:abbreviation])
@@ -343,9 +373,9 @@ module RelatonBib
       def validity_hash_to_bib(ret)
         return unless ret[:validity]
 
-        ret[:validity][:begins] && b = Time.parse(ret[:validity][:begins])
-        ret[:validity][:ends] && e = Time.parse(ret[:validity][:ends])
-        ret[:validity][:revision] && r = Time.parse(ret[:validity][:revision])
+        ret[:validity][:begins] && b = Time.parse(ret[:validity][:begins].to_s)
+        ret[:validity][:ends] && e = Time.parse(ret[:validity][:ends].to_s)
+        ret[:validity][:revision] && r = Time.parse(ret[:validity][:revision].to_s)
         ret[:validity] = Validity.new(begins: b, ends: e, revision: r)
       end
 

data/lib/relaton_bib/localized_string.rb

@@ -11,21 +11,35 @@ module RelatonBib
     # @return [Array<String>] script Iso15924 code
     attr_reader :script
 
-    # @return [String]
+    # @return [String, Array<RelatonBib::LocalizedString>]
     attr_accessor :content
 
-    # @param content [String]
+    # @param content [String, Array<RelatonBib::LocalizedString>]
     # @param language [String] language code Iso639
     # @param script [String] script code Iso15924
     def initialize(content, language = nil, script = nil)
+      unless content.is_a?(String) || content.is_a?(Array) &&
+          (inv = content.reject { |c| c.is_a?(LocalizedString) || c.is_a?(Hash) }).
+              none? && content.any?
+        klass = content.is_a?(Array) ? inv.first.class : content.class
+        raise ArgumentError, "invalid LocalizedString content type: #{klass}"
+      end
       @language = language.is_a?(String) ? [language] : language
       @script = script.is_a?(String) ? [script] : script
-      @content = content
+      @content = if content.is_a?(Array)
+                   content.map do |c|
+                     if c.is_a?(Hash)
+                       LocalizedString.new c[:content], c[:language], c[:script]
+                     else c
+                     end
+                   end
+                 else content
+                 end
     end
 
     # @return [String]
     def to_s
-      content
+      content.is_a?(String) ? content : content.first.to_s
     end
 
     # @return [TrueClass, FalseClass]
@@ -37,19 +51,26 @@ module RelatonBib
     def to_xml(builder)
       return unless content
 
-      builder.parent["language"] = language.join(",") if language&.any?
-      builder.parent["script"]   = script.join(",") if script&.any?
-      builder.text content.encode(xml: :text)
+      if content.is_a?(Array)
+        content.each { |c| builder.variant { c.to_xml builder } }
+      else
+        builder.parent["language"] = language.join(",") if language&.any?
+        builder.parent["script"]   = script.join(",") if script&.any?
+        builder.text content.encode(xml: :text)
+      end
     end
 
     # @return [Hash]
     def to_hash
-      return content unless language || script
+      if content.is_a? String
+        return content unless language || script
 
-      hash = { "content" => content }
-      hash["language"] = single_element_array(language) if language&.any?
-      hash["script"] = single_element_array(script) if script&.any?
-      hash
+        hash = { "content" => content }
+        hash["language"] = single_element_array(language) if language&.any?
+        hash["script"] = single_element_array(script) if script&.any?
+        hash
+      else content.map &:to_hash
+      end
     end
   end
 end

data/lib/relaton_bib/typed_title_string.rb

@@ -1,14 +1,12 @@
 module RelatonBib
   class TypedTitleString
-    # TITLE_TYPES = %w[alternative original unofficial subtitle main].freeze
-
     # @return [String]
     attr_reader :type
 
     # @return [RelatonBib::FormattedString]
     attr_reader :title
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/MethodLength
 
     # @param type [String]
     # @param title [RelatonBib::FormattedString, Hash]
@@ -16,10 +14,6 @@ module RelatonBib
     # @param language [String]
     # @param script [String]
     def initialize(**args)
-      # if args[:type] && !TITLE_TYPES.include?(args[:type])
-      #   warn %{[relaton-bib] title type "#{args[:type]}" is invalid.}
-      # end
-
       unless args[:title] || args[:content]
         raise ArgumentError, %{Keyword "title" or "content" should be passed.}
       end
@@ -30,12 +24,12 @@ module RelatonBib
         @title = args[:title]
       else
         fsargs = args.select do |k, _v|
-          %i[content language script format].include? k 
+          %i[content language script format].include? k
         end
         @title = FormattedString.new(fsargs)
       end
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:enable Metrics/MethodLength
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -91,12 +91,16 @@ module RelatonBib
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
       def fetch_series(item)
-        item.xpath("./series").map do |sr|
+        item.xpath("./series").reduce([]) do |mem, sr|
           abbr = sr.at "abbreviation"
           abbreviation = abbr ? LocalizedString.new(abbr.text, abbr[:language], abbr[:script]) : nil
-          Series.new(
-            type: sr[:type], formattedref: fref(sr),
-            title: ttitle(sr.at("title")), place: sr.at("place")&.text,
+          formattedref = fref(sr)
+          title = ttitle(sr.at("title"))
+          next mem unless formattedref || title
+
+          mem << Series.new(
+            type: sr[:type], formattedref: formattedref,
+            title: title, place: sr.at("place")&.text,
             organization: sr.at("organization")&.text,
             abbreviation: abbreviation, from: sr.at("from")&.text,
             to: sr.at("to")&.text, number: sr.at("number")&.text,
@@ -155,8 +159,12 @@ module RelatonBib
       def ttitle(title)
         return unless title
 
+        variants = title.xpath("variant").map do |v|
+          LocalizedString.new v.text, v[:language], v[:script]
+        end
+        content = variants.any? ? variants : title.text
         TypedTitleString.new(
-          type: title[:type], content: title.text, language: title[:language],
+          type: title[:type], content: content, language: title[:language],
           script: title[:script], format: title[:format]
         )
       end
@@ -165,14 +173,22 @@ module RelatonBib
         status = item.at("./status")
         return unless status
 
-        stage = status.at "stage"
+        stg = status.at "stage"
         DocumentStatus.new(
-          stage: stage ? stage.text : status.text,
-          substage: status.at("substage")&.text,
+          stage: stg ? stage(stg) : status.text,
+          substage: stage(status.at("substage")),
           iteration: status.at("iteration")&.text,
         )
       end
 
+      # @param node [Nokogiri::XML::Elemen]
+      # @return [RelatonBib::DocumentStatus::Stage]
+      def stage(elm)
+        return unless elm
+
+        DocumentStatus::Stage.new value: elm.text, abbreviation: elm[:abbreviation]
+      end
+
       def fetch_dates(item)
         item.xpath("./date").reduce([]) do |a, d|
           type = d[:type].to_s.empty? ? "published" : d[:type]
@@ -228,14 +244,9 @@ module RelatonBib
         end
 
         cn = person.at "./name/completename"
-        cname = if cn
-                  LocalizedString.new(cn.text, cn[:language], cn[:script])
-                else
-                  nil
-                end
-
+        cname = cn && LocalizedString.new(cn.text, cn[:language], cn[:script])
         sn = person.at "./name/surname"
-        sname = sn ? LocalizedString.new(sn.text, sn[:language], sn[:script]) : nil
+        sname = sn && LocalizedString.new(sn.text, sn[:language], sn[:script])
 
         name = FullName.new(
           completename: cname, surname: sname,
@@ -275,25 +286,24 @@ module RelatonBib
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(item)
         item.xpath("./abstract").map do |a|
-          FormattedString.new(
-            content: a.text, language: a[:language], script: a[:script], format: a[:format]
-          )
+          FormattedString.new(content: a.text, language: a[:language],
+                              script: a[:script], format: a[:format])
         end
       end
 
       # @param item [Nokogiri::XML::Element]
-      # @return [RelatonBib::CopyrightAssociation]
+      # @return [Array<RelatonBib::CopyrightAssociation>]
       def fetch_copyright(item)
-        cp     = item.at("./copyright") || return
-        org    = cp&.at("owner/organization")
-        name   = org&.at("name")&.text
-        abbr   = org&.at("abbreviation")&.text
-        url    = org&.at("uri")&.text
-        entity = Organization.new(name: name, abbreviation: abbr, url: url)
-        from   = cp.at("from")&.text
-        to     = cp.at("to")&.text
-        owner  = ContributionInfo.new entity: entity
-        CopyrightAssociation.new(owner: owner, from: from, to: to)
+        item.xpath("./copyright").map do |cp|
+          owner = cp.xpath("owner").map do |o|
+            ContributionInfo.new entity: get_org(o.at("organization"))
+          end
+          from = cp.at("from")&.text
+          to   = cp.at("to")&.text
+          scope = cp.at("scope")&.text
+          CopyrightAssociation.new(owner: owner, from: from, to: to,
+                                   scope: scope)
+        end
       end
 
       # @param item [Nokogiri::XML::Element]
@@ -310,6 +320,7 @@ module RelatonBib
         item.xpath("./relation").map do |rel|
           DocumentRelation.new(
             type: rel[:type]&.empty? ? nil : rel[:type],
+            description: relation_description(rel),
             bibitem: bib_item(item_data(rel.at("./bibitem"))),
             locality: localities(rel),
             source_locality: source_localities(rel),
@@ -317,6 +328,16 @@ module RelatonBib
         end
       end
 
+      # @param rel [Nokogiri::XML::Element]
+      # @return [RelatonBib::FormattedString, NilClass]
+      def relation_description(rel)
+        d = rel.at "./description"
+        return unless d
+
+        FormattedString.new(content: d.text, language: d[:language],
+                            script: d[:script], format: d[:format])
+      end
+
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)

data/relaton-bib.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "relaton_bib/version"
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -30,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "byebug"
 
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement