relaton-cli 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8049656d1afb46e4ba336f812b0eb6261525e64b6d127b313c03a8c5ce4c72e
-  data.tar.gz: bcfa7ebc31360fd27f2ccb2f21f1e864fc283433bdba045ff6c8e7393aabc25b
+  metadata.gz: 189c177f77c4ebd844d4df2dbe9deb987d90443e3e91ff50d8ebf1a7ce8d3685
+  data.tar.gz: 73a886c43a4b0262a6f96725143a5714dae88440715122a36360e343d753ea56
 SHA512:
-  metadata.gz: 8a49edaeb34c75d64fcdb63ac642a3882086c0d994f169a0691f9f86fe27b7a1be4680f2295bbf80301b6089d76154bdfa734364ecbb2909ee0d630dd4cc616a
-  data.tar.gz: 2ead71208ec783d66af83bfcc89901d3d9da70e441d9464cb6f5f6b57838c5e5cde8bec940d4856804abe0260e60c6e30cfda9c7becec50c60a0b31fc66edf63
+  metadata.gz: 7d7e76cfa44de6d91dc4ce1f631c68b845fa152de4ecbfa76a5deebb59e706784c0f0a5c1dea302336e153d751217e612f42c324498336390ce67891f4f773fa
+  data.tar.gz: ea44768cba9f5a88b46f03c588237d0de5fe91d0fb4952b5761236fafcabe1ec5992b921ecbd87052e3082e0f45c24ee074409825c0f32f934055ffac7eb2b93

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,11 +45,6 @@ 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
@@ -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/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,7 +167,7 @@ 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)
@@ -270,7 +267,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.1.2".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/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.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug