relaton-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c65fdfca202de14e05173d9c20a7fac23b11f33a45bb496adcfd5a67eb51c5d4
-  data.tar.gz: 790a6d8d9af1e2b72d59a430db1e7a37ab3f3cf67b6083abbac1b87713f30104
+SHA1:
+  metadata.gz: 8d4d41d778eecd0614bc7d9f086db2362d594725
+  data.tar.gz: 5a66a9da159d1c903c35764727e0755e52511919
 SHA512:
-  metadata.gz: f59e8cc8d04a9251a4e2dda174d0cbcbd371439d2d292f3ef7e83ba0ba007d4cd2c9294d381fe7b81b7124a5f39cb1d0a1f492db0b230c962c3b2c8753be8bdc
-  data.tar.gz: 2c8c6a3515dd92143a4b824aeaeb4bf7aac3f48ee95ec94b5916966bb3d0f08c8f8c4f9ccc21b8d426c467a77aed9aab97efceeb998815b24d1231b4b2d9dd6c
+  metadata.gz: 429b613fd45f18bf24a5af73b01c4091dcfbb93e820af393af1b58c338e99a69f34a22adc6ac2a282e250ccf54827eb2fdb02ba5b759be34cc7a2c18fc4f2f21
+  data.tar.gz: affff06b90bfcd54bc299aedacf129cbf1e12181146fedda6300d6890b12fc7b05ee31492a8b68475da8de09410d55e43b413a8e0c0b46a82469b33bd834a447

data/.gitignore

@@ -11,3 +11,5 @@
 /.rubocop-https*
 
 .rspec_status
+.vscode/
+.byebug_history

data/lib/relaton/bibdata.rb

@@ -14,6 +14,7 @@ module Relaton
       html
       uri
       rxl
+      txt
       revdate
       abstract
       technical_committee

data/lib/relaton/cli/command.rb

@@ -85,6 +85,8 @@ module Relaton
           doc = Cli.relaton.fetch(code, options[:year])
           doc ? doc.to_xml : "No matching bibliographic entry found"
         end
+      rescue RelatonBib::RequestError => e
+        e.message
       end
 
       def supported_type_message

data/lib/relaton/cli/relaton_file.rb

@@ -112,9 +112,16 @@ module Relaton
           xml = nokogiri_document(nil, file)
           xml.remove_namespaces!
 
-          bib = xml.at("//bibdata") || next
+          if (bib = xml.at("//bibdata"))
+            bib = nokogiri_document(bib.to_xml)
+          elsif (rfc = xml.at("//rfc"))
+            require "relaton_ietf/scrapper"
+            ietf = RelatonIetf::Scrapper.bib_item rfc, "rfc"
+            bib = nokogiri_document ietf.to_xml(bibdata: true)
+          else
+            next
+          end
 
-          bib = nokogiri_document(bib.to_xml)
           bib.remove_namespaces!
           bib.root.add_namespace(nil, "xmlns")
 
@@ -126,10 +133,15 @@ module Relaton
       end
 
       def concatenate_files
-        xml_files = [convert_rxl_to_xml, convert_yamls_to_xml]
+        xml_files = [convert_rxl_to_xml, convert_yamls_to_xml, convert_xml_to_xml]
 
         xml_files.flatten.map do |xml|
           doc = nokogiri_document(xml[:content])
+          if (rfc = doc.at("//rfc"))
+            require "relaton_ietf/scrapper"
+            ietf = RelatonIetf::Scrapper.bib_item rfc, "rfc"
+            doc = nokogiri_document ietf.to_xml(bibdata: true)
+          end
           bibdata_instance(doc, xml[:file]) if doc.root.name == "bibdata"
         end.compact
       end
@@ -165,7 +177,7 @@ module Relaton
       end
 
       def build_bibdata_relaton(bibdata, file)
-        ["xml", "pdf", "doc", "html", "rxl"].each do |type|
+        ["xml", "pdf", "doc", "html", "rxl", "txt"].each do |type|
           file = Pathname.new(file).sub_ext(".#{type}")
           bibdata.send("#{type}=", file) if File.file?(file)
         end
@@ -194,6 +206,12 @@ module Relaton
         end
       end
 
+      def convert_xml_to_xml
+        select_files_with("{xml}").map do |file|
+          { file: file, content: File.read(file, encoding: "utf-8") }
+        end
+      end
+
       def select_files_with(extension)
         files = File.join(source, "**", "*.#{extension}")
         Dir[files].reject { |file| File.directory?(file) }

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/lib/relaton/xml_document.rb

@@ -77,7 +77,12 @@ module Relaton
       value = find_text("./on", revdate) || find_text("./form", revdate)
 
       if revdate && value
-        { datetype: revdate["type"], revdate: Date.parse(value.strip).to_s }
+        date = if value.size > 7
+                 Date.parse(value.strip)
+               else
+                 Date.strptime(value.strip, "%Y-%m")
+               end
+        { datetype: revdate["type"], revdate: date.to_s }
       end
     rescue
       warn "[relaton] parsing published date '#{revdate.text}' failed."

data/relaton-cli.gemspec

@@ -30,6 +30,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rspec-core", "~> 3.4"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "ruby-debug-ide"
+  spec.add_development_dependency "debase"
 
   spec.add_runtime_dependency "relaton", "~> 0.4"
   spec.add_runtime_dependency "thor"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug-ide
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debase
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: relaton
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Relaton Command-line Interface