relaton-cli 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8049656d1afb46e4ba336f812b0eb6261525e64b6d127b313c03a8c5ce4c72e
-  data.tar.gz: bcfa7ebc31360fd27f2ccb2f21f1e864fc283433bdba045ff6c8e7393aabc25b
+  metadata.gz: 8a02348a5d77b33a2e249bc4aa1a22ed07d8fff2cfdb5323799abc9cc0d0a445
+  data.tar.gz: e4ba64c5d0d8e5db5ad4e7b3a7be42a13e7bfc22c2beb81336391decb96853b0
 SHA512:
-  metadata.gz: 8a49edaeb34c75d64fcdb63ac642a3882086c0d994f169a0691f9f86fe27b7a1be4680f2295bbf80301b6089d76154bdfa734364ecbb2909ee0d630dd4cc616a
-  data.tar.gz: 2ead71208ec783d66af83bfcc89901d3d9da70e441d9464cb6f5f6b57838c5e5cde8bec940d4856804abe0260e60c6e30cfda9c7becec50c60a0b31fc66edf63
+  metadata.gz: ee47c92805a92f72e5a23b554cc8a5737f38392b33a64f9a3d36f6732b61958052ae493a9e2bd0cbb02b2854bf9b453e6b68b82182c4907c9d90e64af7867331
+  data.tar.gz: 6bac8c0e2f42e093ca23592d7ac908f86389907125d9f39400c6a8c562b322809ca06f9134ffbdacc5b7cb50313438c447d0f7b142c4de400b498a1b07c1937a

data/.gitignore

@@ -13,3 +13,4 @@
 .vscode/
 .byebug_history
 Gemfile.lock
+.DS_Store

data/lib/relaton/bibcollection.rb

@@ -41,7 +41,7 @@ module Relaton
       )
 
       items = find_xpath("./relaton-collection/relation", source)&.map do |item|
-        bibdata = find("./bibdata", item)
+        bibdata = find("./bibdata|./bibitem", item)
         klass = bibdata ? Bibdata : Bibcollection
         klass.from_xml(bibdata || item)
       end

data/lib/relaton/bibdata.rb

@@ -10,18 +10,6 @@ module Relaton
       @bibitem = bibitem
     end
 
-    # def method_missing(method, *args)
-    #   %r{(?<m>\w+)=$} =~ method
-    #   return unless m && %w[xml pdf doc html rxl txt].include?(m)
-
-    #   uri = @bibitem.link.detect { |u| u.type == m }
-    #   if uri
-    #     uri.content = args[0]
-    #   else
-    #     @bibitem.link << RelatonBib::TypedUri.new(type: m, content: args[0])
-    #   end
-    # end
-
     def docidentifier
       @bibitem.docidentifier.first&.id
     end
@@ -57,15 +45,10 @@ module Relaton
         opts.select { |k, _v| k.is_a? Symbol },
       )
       @bibitem.to_xml nil, **options
-
-      # #datetype = stage&.casecmp("published") == 0 ? "published" : "circulated"
-
-      # ret = ref ? "<bibitem id= '#{ref}' type='#{doctype}'>\n" : "<bibdata type='#{doctype}'>\n"
-      # ret += "<fetched>#{Date.today.to_s}</fetched>\n"
     end
 
     def to_h
-      URL_TYPES.reduce({ items: [] }.merge(@bibitem.to_hash)) do |h, t|
+      URL_TYPES.reduce(@bibitem.to_hash) do |h, t|
         value = send t
         h[t.to_s] = value
         h
@@ -76,6 +59,9 @@ module Relaton
       to_h.to_yaml
     end
 
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity, Style/MissingRespondToMissing
+
     def method_missing(meth, *args)
       if @bibitem.respond_to?(meth)
         @bibitem.send meth, *args
@@ -98,5 +84,7 @@ module Relaton
         super
       end
     end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity, Style/MissingRespondToMissing
   end
 end

data/lib/relaton/cli.rb

@@ -34,20 +34,22 @@ module Relaton
     # @param content [Nokogiri::XML::Document]
     # @return [RelatonBib::BibliographicItem, RelatonIsoBib::IsoBibliongraphicItem]
     def self.parse_xml(doc)
-      if (processor = Relaton::Registry.instance.by_type(Relaton::Cli.doctype(doc)))
-        processor.from_xml(doc.to_s)
+      if (proc = Cli.processor(doc))
+        proc.from_xml(doc.to_s)
       else
         RelatonBib::XMLParser.from_xml(doc.to_s)
       end
     end
 
-    # @param content [Nokogiri::XML::Document] Document
+    # @param doc [Nokogiri::XML::Element]
     # @return [String] Type prefix
-    def self.doctype(doc)
+    def self.processor(doc)
       docid = doc.at "docidentifier"
-      return docid[:type] if docid && docid[:type]
-
-      docid&.text&.match(/^\w+/)&.to_s
+      if docid && docid[:type]
+        proc = Relaton::Registry.instance.by_type(docid[:type])
+        return proc if proc
+      end
+      Relaton::Registry.instance.by_type(docid&.text&.match(/^\w+/)&.to_s)
     end
   end
 end

data/lib/relaton/cli/command.rb

@@ -28,7 +28,7 @@ module Relaton
       option :title, aliases: :t,  desc: "Title of resulting Relaton collection"
       option :organization, aliases: :g, desc: "Organization owner of Relaton collection"
       option :new, aliases: :n, type: :boolean, desc: "Use the new Relaton YAML format"
-      option :extension, aliases: :x, default: "rxl", desc: "File extension of destination Relaton file, defaults to 'rxl'"
+      option :extension, aliases: :x, desc: "File extension of destination Relaton file, defaults to 'rxl'"
 
       def concatenate(source_dir, outfile)
         Relaton::Cli::RelatonFile.concatenate(source_dir, outfile, options)

data/lib/relaton/cli/relaton_file.rb

@@ -118,7 +118,6 @@ module Relaton
             bib = nokogiri_document(bib.to_xml)
           elsif (rfc = xml.at("//rfc"))
             require "relaton_ietf/scrapper"
-            #ietf = RelatonIetf::Scrapper.bib_item rfc, "rfc"
             ietf = RelatonIetf::Scrapper.fetch_rfc rfc
             bib = nokogiri_document ietf.to_xml(bibdata: true)
           else
@@ -142,18 +141,16 @@ module Relaton
 
         xml_files.flatten.reduce([]) do |mem, xml|
           doc = nokogiri_document(xml[:content])
-          if (refs = doc.xpath("//rfc//reference")).any?
+          if (rfc = doc.at("/rfc"))
             require "relaton_ietf/scrapper"
-            mem + refs.map do |rfc|
-              ietf = RelatonIetf::Scrapper.fetch_rfc rfc
-              d = nokogiri_document ietf.to_xml(bibdata: true)
-              bibdata_instance(d, xml[:file])
-            end
-          elsif doc&.root&.name == "bibdata"
+            ietf = RelatonIetf::Scrapper.fetch_rfc rfc
+            d = nokogiri_document ietf.to_xml(bibdata: true)
+            mem << bibdata_instance(d, xml[:file])
+          elsif %w[bibitem bibdata].include? doc&.root&.name
             mem << bibdata_instance(doc, xml[:file])
           else mem
           end
-        end.compact
+        end.uniq &:id
       end
 
       def concatenate_and_write_to_files
@@ -170,21 +167,23 @@ module Relaton
         end
       end
 
-      def find_available_bibrxl_file(name, ouputdir, content)
+      def find_available_bibrxl_file(name, _ouputdir, content)
         if options[:extension] == "yaml" || options[:extension] == "yml"
           bib_rxl = Pathname.new([outdir, name].join("/")).sub_ext(".rxl")
           content.bib_rxl = bib_rxl.to_s if File.file?(bib_rxl)
         end
       end
 
-      def output_type(ext=options[:extension])
+      def output_type(ext = options[:extension])
+        ext ||= File.extname(outfile)[1..-1] if outfile
         case ext
         when "rxl", "xml"
           :to_xml
         when "yml", "yaml"
           :to_yaml
         else
-          puts "[relaton-cli] the given extension of '#{ext}' is not supported."
+          puts "[relaton-cli] the given extension of '#{ext}' is "\
+          "not supported. Use 'rxl'."
           :to_xml
         end
       end
@@ -270,7 +269,7 @@ module Relaton
 
       def replace_bad_characters(string)
         bad_chars = ["/", "\\", "?", "%", "*", ":", "|", '"', "<", ">", ".", " "]
-        bad_chars.inject(string.downcase) { |res, char| res.gsub(char, "-") }
+        bad_chars.reduce(string.downcase) { |res, char| res.gsub(char, "-") }
       end
     end
   end

data/lib/relaton/cli/version.rb

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

data/lib/relaton/cli/xml_convertor.rb

@@ -34,18 +34,8 @@ module Relaton
       def convert_content(content)
         if %w[bibitem bibdata].include? content.root.name
           Bibdata.from_xml(content)
-          # Relaton::Cli.parse_xml(content).to_hash
         else
           Bibcollection.from_xml(content)
-          # title = content.at("relaton-collection/title").text
-          # author = content.at("relaton-collection/contributor/organization/name").text
-          # collection = { "root" => { "title" => title, "author" => author } }
-
-          # collection["root"]["items"] = content.xpath("//bibdata").map do |bib|
-          #   Relaton::Cli.parse_xml(bib).to_hash
-          # end
-
-          # collection
         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

data/relaton-cli.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 2.4.0"
 
-  spec.add_development_dependency "byebug", "~> 10.0"
+  spec.add_development_dependency "byebug", "~> 11.0"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry"
@@ -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.1.0"
+  spec.add_runtime_dependency "relaton", "~> 1.2.0"
   spec.add_runtime_dependency "thor"
   # spec.add_runtime_dependency 'byebug'
 end

data/templates/_document.liquid

@@ -54,7 +54,7 @@
 
   <div class="doc-bib">
     <div class="doc-bib-relaton">
-      <a href="{{ document.relaton }}">Relaton XML</a>
+      <a href="{{ document.rxl }}">Relaton XML</a>
     </div>
   </div>
 

metadata

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