relaton-cli 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a02348a5d77b33a2e249bc4aa1a22ed07d8fff2cfdb5323799abc9cc0d0a445
-  data.tar.gz: e4ba64c5d0d8e5db5ad4e7b3a7be42a13e7bfc22c2beb81336391decb96853b0
+  metadata.gz: 7283d682da8a6ace042d4184849ff7007784a240498c11164a235bf6cf38e20f
+  data.tar.gz: 17c8c09ebd535f8851c487843d709077aac4a63b11cf145f97e71cccb41ea1f1
 SHA512:
-  metadata.gz: ee47c92805a92f72e5a23b554cc8a5737f38392b33a64f9a3d36f6732b61958052ae493a9e2bd0cbb02b2854bf9b453e6b68b82182c4907c9d90e64af7867331
-  data.tar.gz: 6bac8c0e2f42e093ca23592d7ac908f86389907125d9f39400c6a8c562b322809ca06f9134ffbdacc5b7cb50313438c447d0f7b142c4de400b498a1b07c1937a
+  metadata.gz: 29d79e044e21d3c8392fc8d28231e9b8646b227de12bb09669cf9d737d82cc6972c97cce1a0e9c291f132925805c00c3d43eb2a467e93ffbcd99185af7229504
+  data.tar.gz: 37952a6bb4ba3feb6cf88ce60a3899428e6da7686c719a6030e4fb6e851609e8c4a2279cfc333d60dae5e094cde8859f8c4f248606f2daa032b052949a6a6f35

data/docs/README.adoc

@@ -209,3 +209,11 @@ $ relaton yaml2html YAML [<stylesheet>] [<liquid-template-dir>]
 
 Render a Relaton YAML file (`filename.yaml`) as an HTML file. The `stylesheet` and `liquid-template-dir` directories are as for <<relaton-xml2html,relaton xml2html>>.
 
+=== relaton convert
+
+[source,conxole]
+----
+$ relaton convert XML -f FORMAT -o OUTPUT-FILE
+----
+
+Convert a Relaton XML document into YAML, AsciiBib, or BibTex format. Allowed -f or --format options are yaml, asciibib, bibtex. If the option -o or --output is omitted then a new file will be created in the folder where the original file is, with the same name but another appropriated extension.

data/exe/relaton

@@ -18,4 +18,3 @@ end
 require "relaton/cli"
 
 Relaton::Cli.start(ARGV)
-

data/lib/relaton/bibdata.rb

@@ -42,7 +42,7 @@ module Relaton
 
     def to_xml(opts = {})
       options = { bibdata: true, date_format: :full }.merge(
-        opts.select { |k, _v| k.is_a? Symbol },
+        opts.select { |k, _v| k.is_a? Symbol }
       )
       @bibitem.to_xml nil, **options
     end

data/lib/relaton/cli/base_convertor.rb

@@ -39,7 +39,7 @@ module Relaton
           file,
           style: style || File.join(File.dirname(__FILE__), "../../../templates/index-style.css"),
           template: template || File.join(File.dirname(__FILE__), "../../../templates/"),
-          extension: "html",
+          extension: "html"
         ).to_html
       end
 
@@ -91,13 +91,6 @@ module Relaton
       end
 
       def write_to_file_collection(content, format)
-        # if outdir && (content.is_a?(Relaton::Bibcollection))
-        #   FileUtils.mkdir_p(outdir)
-        #   content.items_flattened.each do |item|
-        #     collection = collection_filename(item.docidentifier_code)
-        #     write_to_a_file(item_output(item, format), collection)
-        #   end
-        # end
         if outdir && content.is_a?(Relaton::Bibcollection)
           FileUtils.mkdir_p(outdir)
           content.items_flattened.each do |item|

data/lib/relaton/cli/command.rb

@@ -45,7 +45,7 @@ module Relaton
       desc "yaml2xml YAML", "Convert Relaton YAML into Relaton Collection XML or separate files"
       option :extension, aliases: :x, default: "rxl", desc: "File extension of Relaton XML files, defaults to 'rxl'"
       option :prefix, aliases: :p, desc: "Filename prefix of individual Relaton XML files, defaults to empty"
-      option :outdir, aliases: :o,  desc: "Output to the specified directory with individual Relaton Bibdata XML files"
+      option :outdir, aliases: :o, desc: "Output to the specified directory with individual Relaton Bibdata XML files"
       option :require, aliases: :r, type: :array, desc: "Require LIBRARY prior to execution"
       option :overwrite, aliases: :f, type: :boolean, default: false, desc: "Overwrite the existing file"
 
@@ -53,7 +53,7 @@ module Relaton
         Relaton::Cli::YAMLConvertor.to_xml(filename, options)
       end
 
-      desc "xml2yamlnew XML", "Convert Relaton XML into Relaton Bibdata / Bibcollection YAML (and separate files)"
+      desc "xml2yaml XML", "Convert Relaton XML into Relaton Bibdata / Bibcollection YAML (and separate files)"
       option :extension, aliases: :x, default: "yaml", desc: "File extension of Relaton YAML files, defaults to 'yaml'"
       option :prefix, aliases: :p, desc: "Filename prefix of Relaton XML files, defaults to empty"
       option :outdir, aliases: :o, desc: "Output to the specified directory with individual Relaton Bibdata YAML files"
@@ -82,6 +82,25 @@ module Relaton
         Relaton::Cli::YAMLConvertor.to_html(file, style, template)
       end
 
+      desc "convert XML", "Convert Relaton XML document"
+      option :format, aliases: :f, required: true, desc: "Output format (yaml, bibtex, asciibib)"
+      option :output, aliases: :o, desc: "Output to the specified file"
+
+      def convert(file)
+        item = Relaton::Cli.parse_xml Nokogiri::XML(File.read(file, encoding: "UTF-8"))
+        result = if /yaml|yml/.match?(options[:format])
+                   item.to_hash.to_yaml
+                 else item.send "to_#{options[:format]}"
+                 end
+        ext = case options[:format]
+              when "bibtex" then "bib"
+              when "asciibib" then "adoc"
+              else options[:format]
+              end
+        output = options[:output] || file.sub(/(?<=\.)[^\.]+$/, ext)
+        File.write output, result, encoding: "UTF-8"
+      end
+
       private
 
       # @param code [String]

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.2.1".freeze
+    VERSION = "1.3.0".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
@@ -33,7 +33,7 @@ module Relaton
         # @return [RelatonBib::BibliographicItem,
         #   RelatonIso::IsoBiblioraphicItem]
         def convert_single_file(content)
-          if (processor = Registry.instance.by_type(doctype(content['docid'])))
+          if (processor = Registry.instance.by_type(doctype(content["docid"])))
             processor.hash_to_bib content
           else
             RelatonBib::BibliographicItem.new(
@@ -50,14 +50,14 @@ module Relaton
           did = docid.is_a?(Array) ? docid.fetch(0) : docid
           return unless did
 
-          did['type'] || did.fetch('id')&.match(/^\w+/)&.to_s
+          did["type"] || did.fetch("id")&.match(/^\w+/)&.to_s
         end
       end
 
       private
 
       def default_ext
-        'rxl'
+        "rxl"
       end
 
       def file_content
@@ -78,12 +78,12 @@ module Relaton
       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)
             self.class.convert_single_file(i)
           end
-          Relaton::Bibcollection.new(content['root'])
+          Relaton::Bibcollection.new(content["root"])
         end
       end
 

data/relaton-cli.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency "liquid"
-  spec.add_runtime_dependency "relaton", "~> 1.2.0"
+  spec.add_runtime_dependency "relaton", "~> 1.3.0"
   spec.add_runtime_dependency "thor"
   # spec.add_runtime_dependency 'byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement