relaton-ietf 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c466ba7bce25f026ebb9b4d0b3bff3834eb19bb3
-  data.tar.gz: e010c6fd8b813b5f2a5a1f69d20c2a61f58aefbc
+SHA256:
+  metadata.gz: 306fed5a14cbe156879bc5a48d8eb068d73cc1253ed5ea2d397c3a31561b1f8d
+  data.tar.gz: 93be8c725f4ae84d6e7c665da73daf42bc58f127e12de6dfb30cdef44655a994
 SHA512:
-  metadata.gz: 1cff20bb38d967bef880108fea4e92b9f5fb47a2de68b224da1d05dc0663bf7f184834270343e51bab822b8a6d957bc3abd62ada4a60340eb96c15abaa697f85
-  data.tar.gz: 204ed7490cb37921bfa2e5bb0b2cd7673c81845a064a54018d5858fa8b7f7a29e357961e27118116b2deb2b54ec3f8fb71bb6a422c780edcb4107ba5dbb9d1ea
+  metadata.gz: ed500f627c2b017a384c144460a863fa502a8e45c185f7993684a39c0f566e4d6dba9bca537756308e90252062032507c5091d9744acf838db95570f1e76f9ed
+  data.tar.gz: 97c4fc936d9111e13e131a44a2283f972c9018644f28f52771db5a6fa02dfba6580d6964c11972e1366b6ecd29710a596ac14a0601d45739ddfb0712247082e8

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
 - 2.4
 - ruby-head
 before_install: 
-- gem install bundler -v 2.0.1
+- gem install bundler -v "~> 2"
 - bundle update
 matrix:
   allow_failures:

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
     coderay (1.1.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    debase (0.2.2)
+    debase (0.2.3)
       debase-ruby_core_source (>= 0.10.2)
     debase-ruby_core_source (0.10.5)
     diff-lcs (1.3)
@@ -35,7 +35,7 @@ GEM
       pry (~> 0.10)
     public_suffix (3.1.1)
     rake (10.5.0)
-    relaton-bib (0.2.3)
+    relaton-bib (0.2.4)
       addressable
       nokogiri (~> 1.8.4)
     relaton-iso-bib (0.2.3)
@@ -47,7 +47,7 @@ GEM
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
     rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -60,7 +60,7 @@ GEM
       rake (>= 0.8.1)
     ruby_deep_clone (0.8.0)
     safe_yaml (1.0.5)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/appveyor.yml

@@ -22,6 +22,7 @@ install:
 build_script:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
   - set GIT_TERMINAL_PROMPT=0
+  - gem install bundler -v "~> 2"
   - bundle config --local path vendor/bundle
   - bundle update
   - bundle install

data/lib/relaton/provider_ietf.rb

@@ -7,7 +7,7 @@ module Relaton
         def from_rfcxml(xml)
           doc = Nokogiri::XML xml
           reference = doc.at "/rfc"
-          RelatonIetf::Scrapper.bib_item reference, "rfc"
+          RelatonIetf::Scrapper.fetch_rfc reference
         end
       end
     end

data/lib/relaton_ietf/scrapper.rb

@@ -12,62 +12,48 @@ module RelatonIetf
   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"
+    BCP_URI_PATTERN = "https://www.rfc-editor.org/info/CODE"
 
     class << self
+      # rubocop:disable Metrics/MethodLength
+
       # @param text [String]
+      # @param is_relation [TrueClass, FalseClass]
       # @return [RelatonIetf::IetfBibliographicItem]
-      def scrape_page(text)
+      def scrape_page(text, is_relation = false)
         # Remove initial "IETF " string if specified
-        ref = text.
-          gsub(/^IETF /, "").
-          sub(" ", ".") + ".xml"
+        ref = text.gsub(/^IETF /, "")
 
         case ref
-        when /^RFC/
-          uri = RFC_URI_PATTERN.dup
-          doctype = "rfc"
-        when /^I-D/
-          uri = ID_URI_PATTERN.dup
-          doctype = "internet-draft"
+        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 /^BCP/ then bcp_item BCP_URI_PATTERN.dup, ref
         else
           raise RelatonBib::RequestError, "#{ref}: not recognised for RFC"
         end
-
-        uri = uri.gsub("CODE", ref)
-        res = Net::HTTP.get_response(URI(uri))
-        if res.code != "200"
-          raise RelatonBib::RequestError, "No document found at #{uri}"
-        end
-
-        doc = Nokogiri::HTML Net::HTTP.get(URI(uri))
-        reference = doc.at("//reference")
-        return unless reference
-
-        bib_item reference, doctype
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
              Net::ProtocolError, SocketError
-        raise RelatonBib::RequestError, "No document found at #{uri}"
+        raise RelatonBib::RequestError, "No document found for #{ref} reference."
       end
 
-      # rubocop:disable Metrics/MethodLength
-
+      # @param reference [String]
       # @return [RelatonIetf::IetfBibliographicItem]
-      def bib_item(reference, doctype)
-        RelatonIetf::IetfBibliographicItem.new(
-          fetched: Date.today.to_s,
+      def fetch_rfc(reference, is_relation = false)
+        return unless reference
+
+        ietf_item(
+          is_relation: is_relation,
           id: reference[:anchor],
           docid: docids(reference),
           status: status(reference),
           language: [language(reference)],
-          script: ["Latn"],
           link: [{ type: "src", content: reference[:target] }],
           titles: titles(reference),
           abstract: abstracts(reference),
           contributors: contributors(reference),
           dates: dates(reference),
           series: series(reference),
-          doctype: doctype,
           keywords: reference.xpath("front/keyword").map(&:text),
         )
       end
@@ -75,6 +61,67 @@ module RelatonIetf
 
       private
 
+      # @param attrs [Hash]
+      # @return [RelatonIetf::IetfBibliographicItem]
+      def ietf_item(**attrs)
+        attrs[:fetched] = Date.today.to_s unless attrs.delete(:is_relation)
+        attrs[:script] = ["Latn"]
+        attrs[:doctype] = "standard"
+        RelatonIetf::IetfBibliographicItem.new **attrs
+      end
+
+      # @param uri_template [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
+      end
+
+      # @param uri_template [String]
+      # @param reference [String]
+      # @return [RelatonIetf::IetfBibliographicItem]
+      def bcp_item(uri_template, reference)
+        uri = uri_template.sub "CODE", reference.sub(" ", "").downcase
+        doc = Nokogiri::HTML get_page(uri)
+        ietf_item(
+          id: reference,
+          docid: [RelatonBib::DocumentIdentifier.new(type: "IETF", id: reference)],
+          language: ["en"],
+          link: [{ type: "src", content: uri }],
+          relations: fetch_relations(doc),
+          # titles: titles(reference),
+          # abstract: abstracts(reference),
+          # contributors: contributors(reference),
+          # dates: dates(reference),
+          # series: series(reference),
+          # keywords: reference.xpath("front/keyword").map(&:text),
+        )
+      end
+
+      def fetch_relations(doc)
+        doc.xpath("//table/tr/td/a[contains(., 'RFC')]").map do |r|
+          RelatonBib::DocumentRelation.new(
+            type: "merges",
+            bibitem: scrape_page(r.text, true),
+          )
+        end
+      end
+
+      def get_page(uri)
+        res = Net::HTTP.get_response(URI(uri))
+        if res.code != "200"
+          raise RelatonBib::RequestError, "No document found at #{uri}"
+        end
+
+        res.body
+      end
+
+      def make_uri(uri_template, reference)
+        uri_template.gsub("CODE", reference)
+      end
+
       # @return [String]
       def language(reference)
         reference[:lang] || "en"
@@ -86,6 +133,7 @@ module RelatonIetf
         [{ content: title.text, language: language(reference), script: "Latn" }]
       end
 
+      # @return [Array<RelatonBib::FormattedString>]
       def abstracts(ref)
         ref.xpath("./front/abstract").map do |a|
           RelatonBib::FormattedString.new(
@@ -232,7 +280,7 @@ module RelatonIetf
       # @return [Array<RelatonBib::Series>]
       #
       def series(reference)
-        reference.xpath("./seriesinfo").map do |si|
+        reference.xpath("./seriesInfo").map do |si|
           next if si[:name] == "DOI" || si[:stream] || si[:status]
 
           RelatonBib::Series.new(

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "0.5.3".freeze
+  VERSION = "0.5.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'RelatonIetf: retrieve IETF Standards for bibliographic use using the BibliographicItem