relaton-cli 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8db31870f272c13e8704dfb09b08a7e56ea703478db5683d72fccb3c92981a
-  data.tar.gz: 15fa2d2786a1c0d0f50054da7e7b0eb8a87a06b64cef492693938243534d9b75
+  metadata.gz: 4eec2ad64bffc0852186a6c9554f4afd5ed82af1c601859d9cb23074c9d8519a
+  data.tar.gz: cc584c653dcfba62a34c37c1b3a61036f250e2ed93b74fbf8ec0837c18b39d19
 SHA512:
-  metadata.gz: 3ab548b6a6ffd205c9f549bea24e9620a13a8faa3dc9928b88368b085c2b7147add716e59c1efe8aa8137809a79c040ef305d6eb0529b9dfb131a419f24d76d3
-  data.tar.gz: fbb82682d1f7917d10148404ffa046adaed0048bbb330c840cad22a9f0c08fc80cc9c508febedb5355fe51c34656e24d28af6bf587a6d6a8f7585caa3695b06a
+  metadata.gz: ac2cf3134f6b27ecdb5f17d895b2b25d61b568b7fc041aa0ac90cb3012612a54f7009ae87e1874b975094603c3ad8fb312cb68de7d0e950192bbddba5bc75c96
+  data.tar.gz: dda1a006e2987834f670173c2c5cfb8c78f5673308b68a8644f4e6acfc212b74e1724aedc56310de83d86977f18657ab42d16d776b39922d33015c66e58535a8

data/docs/README.adoc

@@ -43,12 +43,13 @@ suports an additional `-x` or `--extension` options to use different extension.
 
 [source,console]
 ----
-$ relaton fetch CODE -t TYPE -y YEAR
+$ relaton fetch CODE -t TYPE -f FORMAT -y YEAR
 ----
 
 Fetch the Relaton XML entry corresponding to the document identifier `CODE`.
 
 * `YEAR` is optional, and specifies the year of publication of the standard.
+* `FORMAT` is optional, and specifies the output format; the recognised values for `FORMAT` are `xml` (default), `bibtex`.
 * `TYPE` specifies the standards class library to be used, that the identifier is part of; the recognised
 values for `TYPE` are `isobib`, `ietfbib`, `iecbib`, `gbbib`.
 

data/lib/relaton/cli/relaton_file.rb

@@ -137,15 +137,19 @@ module Relaton
       def concatenate_files
         xml_files = [convert_rxl_to_xml, convert_yamls_to_xml, convert_xml_to_xml]
 
-        xml_files.flatten.map do |xml|
+        xml_files.flatten.reduce([]) do |mem, xml|
           doc = nokogiri_document(xml[:content])
-          if (rfc = doc.at("//rfc"))
+          if (refs = doc.xpath("//rfc//reference")).any?
             require "relaton_ietf/scrapper"
-            #ietf = RelatonIetf::Scrapper.bib_item rfc, "rfc"
-            ietf = RelatonIetf::Scrapper.fetch_rfc rfc
-            doc = nokogiri_document ietf.to_xml(bibdata: true)
+            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"
+            mem << bibdata_instance(doc, xml[:file])
+          else mem
           end
-          bibdata_instance(doc, xml[:file]) if doc&.root&.name == "bibdata"
         end.compact
       end
 

data/lib/relaton/cli/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Cli
-    VERSION = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug