relaton-bib 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf7f7fdcccb7d2f3eb0b90d3587b7cfd50dee1b053b0d9e8132fb6eb951a9791
-  data.tar.gz: 1624c2c3d7ccdd0d63055f4235e22fed6a7dd053a2d122d1010adb967d005a8b
+  metadata.gz: bedb89ee8f076ed4e8425c31c97f6649944de4e3402e4cfb6747688ad63a9889
+  data.tar.gz: aa1391e5af6e07da77b848dfa0fc71be21b95ecd77972952ed922bcdf7ce59db
 SHA512:
-  metadata.gz: d75fa292183abc36290aeaf09893b4f899fe597c91652a90643af78c53d3ef6ad6ef00fa034f5e79dbe73914c5c099a26116ea93534edbd1dc092cb7f6dddbb0
-  data.tar.gz: 9aec03e6ac2b3a338a326551c6a2fbc44aa2e74fe5b0d48d1b992fff828aa5de3fd2997972be2cbc5618053b2dd70df9c6fa3cf3b019af40e8f5da5f55002df0
+  metadata.gz: 27d51cee453b3449681b498fffb6067f2366e9ceeb1525bf13c80ff13c12f39dbfb2158da0cbee60111d4623d7054fb5a8e22ad89edc18ee582f04fe5c3ae35a
+  data.tar.gz: 56ee00e29060d7f7eaccdbb8ac16b3c0d9186916583b28f5e01eaaadf6a42bc54b5ac3e8695e1f4d17eac5e202b6be53b6e0ed7ea6bfea0b277e01a73fc8c1e4

data/lib/relaton_bib/document_relation.rb

@@ -4,11 +4,16 @@ module RelatonBib
     include RelatonBib
 
     TYPES = %w[
-      obsoletes obsoletedBy supersedes supersededBy updates updatedBy
-      complements derivedFrom translatedFrom hasTranslation adoptedFrom
-      equivalent identical nonequivalent includedIn includes instance
-      instanceOf partOf hasPart hasDraft draftOf merges splits amends amendedBy
-      corrects correctedBy revises revisedBy describes describedBy
+      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]

data/lib/relaton_bib/document_status.rb

@@ -14,12 +14,12 @@ module RelatonBib
     # @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,56 @@ 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]
+    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/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)
 
@@ -30,6 +35,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
@@ -151,12 +157,20 @@ 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
+
+        DocumentStatus::Stage.new(**stg)
+      end
+
       def contributors_hash_to_bib(ret)
         return unless ret[:contributor]
 

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.0.2".freeze
+  VERSION = "1.0.3".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -169,14 +169,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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase