relaton-cli 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 123355f5af7996292e76a60dc07f46fa5593737d18b1453686a5750201d8be05
-  data.tar.gz: 2b67ff870e9111433388706fad09c93b53d1c16799745879080aa4dddbadd5f5
+  metadata.gz: 8a02348a5d77b33a2e249bc4aa1a22ed07d8fff2cfdb5323799abc9cc0d0a445
+  data.tar.gz: e4ba64c5d0d8e5db5ad4e7b3a7be42a13e7bfc22c2beb81336391decb96853b0
 SHA512:
-  metadata.gz: dab4b72334270f2e6d89a1321aa8dda62704b2098d0f992baca667c70caa0d65c72cb35d90a23e697fd57476387fd76eb06a1740acd9376c84dbb49af032de44
-  data.tar.gz: 922783e332d69cccffce0f2dc17edfe40f3f3d27697589ac41b14d04108ecd4a9db92551e57c38f6d73384f8b286ed185d61e1fc04077821ba0b2eb542095b88
+  metadata.gz: ee47c92805a92f72e5a23b554cc8a5737f38392b33a64f9a3d36f6732b61958052ae493a9e2bd0cbb02b2854bf9b453e6b68b82182c4907c9d90e64af7867331
+  data.tar.gz: 6bac8c0e2f42e093ca23592d7ac908f86389907125d9f39400c6a8c562b322809ca06f9134ffbdacc5b7cb50313438c447d0f7b142c4de400b498a1b07c1937a

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.2.0".freeze
+    VERSION = "1.2.1".freeze
   end
 end

data/lib/relaton/cli/yaml_convertor.rb

@@ -1,6 +1,6 @@
-require "yaml"
-require "relaton/cli/base_convertor"
-require "relaton_bib"
+require 'yaml'
+require 'relaton/cli/base_convertor'
+require 'relaton_bib'
 
 module Relaton
   module Cli
@@ -9,29 +9,55 @@ module Relaton
         if writable
           convert_and_write(file_content, :to_xml)
         else
-          convert_content(file_content).to_xml(date_format: :full, bibdata: true)
+          convert_content(file_content).to_xml date_format: :full, bibdata: true
         end
       end
 
-      # Convert to XML
-      #
-      # This interface allow us to convert any YAML file to XML.
-      # It only require us to provide a valid YAML file and it can
-      # do converstion using default attributes, but it also allow
-      # us to provide custom options to customize this converstion
-      # process.
-      #
-      # @param file [File] The complete path to a YAML file
-      # @param options [Hash] Options as hash key, value pairs.
-      #
-      def self.to_xml(file, options = {})
-        new(file, options).to_xml
+      class << self
+        # Convert to XML
+        #
+        # This interface allow us to convert any YAML file to XML.
+        # It only require us to provide a valid YAML file and it can
+        # do converstion using default attributes, but it also allow
+        # us to provide custom options to customize this converstion
+        # process.
+        #
+        # @param file [File] The complete path to a YAML file
+        # @param options [Hash] Options as hash key, value pairs.
+        #
+        def to_xml(file, options = {})
+          new(file, options).to_xml
+        end
+
+        # @param content [Hash] document in YAML format
+        # @return [RelatonBib::BibliographicItem,
+        #   RelatonIso::IsoBiblioraphicItem]
+        def convert_single_file(content)
+          if (processor = Registry.instance.by_type(doctype(content['docid'])))
+            processor.hash_to_bib content
+          else
+            RelatonBib::BibliographicItem.new(
+              RelatonBib::HashConverter::hash_to_bib(content)
+            )
+          end
+        end
+
+        private
+
+        # @param content [Hash]
+        # @return [String]
+        def doctype(docid)
+          did = docid.is_a?(Array) ? docid.fetch(0) : docid
+          return unless did
+
+          did['type'] || did.fetch('id')&.match(/^\w+/)&.to_s
+        end
       end
 
       private
 
       def default_ext
-        "rxl"
+        'rxl'
       end
 
       def file_content
@@ -39,37 +65,25 @@ module Relaton
       end
 
       def date_to_string(obj)
-        obj.is_a? Hash and
-          return obj.inject({}){|memo,(k,v)| memo[k] = date_to_string(v); memo}
-        obj.is_a? Array and
-          return obj.inject([]){|memo,v    | memo      << date_to_string(v); memo}
-        return obj.is_a?(Date) ? obj.to_s : obj
-      end
-
-      def convert_single_file(content)
-        if (processor = Relaton::Registry.instance.by_type(doctype(content["docid"])))
-          processor.hash_to_bib content
+        if obj.is_a? Hash
+          obj.reduce({}) do |memo, (k, v)|
+            memo[k] = date_to_string(v)
+            memo
+          end
+        elsif obj.is_a? Array
+          obj.reduce([]) { |memo, v| memo << date_to_string(v) }
         else
-          RelatonBib::BibliographicItem.new(RelatonBib::HashConverter::hash_to_bib(content))
+          obj.is_a?(Date) ? obj.to_s : obj
         end
       end
 
-      # @param content [Hash]
-      # @return [String]
-      def doctype(docid)
-        did = docid.is_a?(Array) ? docid.fetch(0) : docid
-        return did["type"] if did && did["type"]
-
-        did&.fetch("id")&.match(/^\w+/)&.to_s
-      end
-
       def convert_collection(content)
-        if content.has_key?("root")
-          content["root"]["items"] = content["root"]["items"].map do |i|
+        if content.has_key?('root')
+          content['root']['items'] = content['root']['items'].map do |i|
             # RelatonBib::HashConverter::hash_to_bib(i)
-            convert_single_file(i)
+            self.class.convert_single_file(i)
           end
-          Relaton::Bibcollection.new(content["root"])
+          Relaton::Bibcollection.new(content['root'])
         end
       end
 
@@ -78,7 +92,7 @@ module Relaton
       end
 
       def convert_content(content)
-        convert_collection(content) || convert_single_file(content)
+        convert_collection(content) || self.class.convert_single_file(content)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug