relaton-ietf 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 434453b0dde2f07fcfb578e3ef63a7bdd1295ffd7ef69030e361920ccf97c60f
-  data.tar.gz: 5eb7911905fc0ecd2edf822029580b0545b5a2a223cc914815ca6c5b28a6630b
+  metadata.gz: 9de9d3ef1c6d59485dca8cfa75913897da8e19bf44ffe51e41679a48cf198770
+  data.tar.gz: 6bd02dd1323881880830c24ddcd56c7afa9b02c831188fce64d2bec753f074bb
 SHA512:
-  metadata.gz: a4c73b06add12b2d2db70da5d5fe0c45f9a93efba60465b9ed4ae397bf0338c02e93afdff83c926e08aed10793b7b5ae37fd49caa1abe653f45b98bbac221815
-  data.tar.gz: 6f87bc69748909c8e93453de5c2a89cae15e7f35946f584158bcbcded4dbb0ae6bce999ac3c6122fd599617c2f77dea640fb200c46272479b48138a069c75908
+  metadata.gz: 5a1ada2025ca307a974a7ec20b0ff9c09b36dbe5c3e6a5c3839026b665350a7a79f9eaf9b9076ec5dd0a8dfce0234a045d33b2962be90f781626da279a872311
+  data.tar.gz: 7b3acb128dcd0470cffbeff4cd5aadc02a943268beab9c323b40b2626c04628d3d55aecbb4aa9ac3e2fcea7a323df435146c8bfcc358ba476659108495576039

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-ietf (0.6.9)
+    relaton-ietf (0.6.10)
       relaton-bib (~> 0.3.0)
 
 GEM

data/lib/relaton_ietf/scrapper.rb

@@ -10,8 +10,8 @@ module RelatonIetf
 
   # Scrapper module
   module Scrapper
-    RFC_URI_PATTERN = "https://xml2rfc.tools.ietf.org/public/rfc/bibxml/reference.CODE"
-    ID_URI_PATTERN = "https://xml2rfc.tools.ietf.org/public/rfc/bibxml-ids/reference.CODE"
+    RFC_URI_PATTERN = "https://xml2rfc.tools.ietf.org/public/rfc/bibxml"
+    # ID_URI_PATTERN = "https://xml2rfc.tools.ietf.org/public/rfc/bibxml-ids/reference.CODE"
     BCP_URI_PATTERN = "https://www.rfc-editor.org/info/CODE"
 
     class << self
@@ -25,15 +25,20 @@ module RelatonIetf
         ref = text.gsub(/^IETF /, "")
 
         case ref
-        when /^RFC/ then rfc_item RFC_URI_PATTERN.dup, ref, is_relation
-        when /^I-D/ then rfc_item ID_URI_PATTERN.dup, ref, is_relation
+        when /^RFC/ then rfc_item [""], ref, is_relation
+        when /^I-D/ then rfc_item ["3"], ref, is_relation
+        when /^W3C/ then rfc_item ["4", "2"], ref, is_relation
+        when /^(ANSI|CCITT|FIPS|IANA|ISO|ITU|NIST|OASIS|PKCS)/
+          rfc_item ["2"], ref, is_relation
+        when /^(3GPP|SDO-3GPP)/ then rfc_item ["5"], ref, is_relation
+        when /^IEEE/ then rfc_item ["6", "2"], ref, is_relation
         when /^BCP/ then bcp_item BCP_URI_PATTERN.dup, ref
         else
           raise RelatonBib::RequestError, "#{ref}: not recognised for RFC"
         end
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError, SocketError, OpenSSL::SSL::SSLError
+             Net::ProtocolError, SocketError
         raise RelatonBib::RequestError, "No document found for #{ref} reference."
       end
 
@@ -79,13 +84,23 @@ module RelatonIetf
         RelatonIetf::IetfBibliographicItem.new **attrs
       end
 
-      # @param uri_template [String]
+      # @param uri_nums [Array<String>]
       # @param ref [String]
       # @return [RelatonIetf::IetfBibliographicItem]
-      def rfc_item(uri_template, ref, is_relation)
-        uri = uri_template.sub "CODE", ref.sub(/\s|\u00a0/, ".") + ".xml"
-        doc = Nokogiri::XML get_page(uri)
-        fetch_rfc doc.at("//reference"), is_relation, uri
+      def rfc_item(uri_nums, ref, is_relation)
+        uri = nil
+        error = nil
+        uri_nums.each do |n|
+          uri = "#{RFC_URI_PATTERN}#{n}/reference.#{ref.sub(/\s|\u00a0/, ".")}.xml"
+          begin
+            doc = Nokogiri::XML get_page(uri)
+            resp = fetch_rfc doc.at("//reference"), is_relation, uri
+            return resp if resp
+          rescue RelatonBib::RequestError => e
+            error = e
+          end
+        end
+        raise error
       end
 
       # @param uri_template [String]
@@ -255,7 +270,7 @@ module RelatonIetf
       def dates(reference)
         return unless (date = reference.at "./front/date")
 
-        d = [date[:year], month(date[:month]),
+        d = [date[:year], month(date[:month]) || "01",
              (date[:day] || "01")].compact.join "-"
         date = Time.parse(d).strftime "%Y-%m-%d"
         [RelatonBib::BibliographicDate.new(type: "published", on: date)]

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "0.6.9".freeze
+  VERSION = "0.6.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler