relaton-ietf 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce626d7ff0f79fd229a0c88fc6a714f2e93534a65ab9c4c3bf3307e31c983b98
-  data.tar.gz: be63f78277099f2073a880b012ed54774594922b3e6f71eb0417b8e023f72484
+  metadata.gz: 47bbfd5981028ba4af2af87312b808def1f0735f04cee90694779a4a9f358083
+  data.tar.gz: 0cb202851646c8b524a6fc87ef694a68e25b519968c0b6485c8dc40e7d94f638
 SHA512:
-  metadata.gz: 5f4fff5fc1eb31ad0af0ccaf719642642dcb65e58cd0c5f87ebfff16914c1a60f8c734cd2e2bb25954ce5bac29aa9846abf3b67607cc92d99806b38a1bf74897
-  data.tar.gz: dfd8ce3e812cec5cae6dc7805e13bafc26dcaaa5528db07a9086ec38b474f6d709a9248e1d0c8d139ef7bec7ee65d7eacf65c9b750d2fac83af939c2138228c3
+  metadata.gz: e9aa8ad8c6894263665952bb19f620c693882d10bb76c53d7ba18ccd345bc2830d47d51fc94c2101681b5fec82f5b454076425908feefc16bf62a3f89d02535d
+  data.tar.gz: 601e5e1c75f47cc31d0356e042c26349adc5d4d5166a5fd12eea5332ec0147c99801f4efe103d279d2bfee6727b88847ea70f2ec33c894f8d6a12de69df5fe28

data/.github/workflows/macos.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: macos
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-macos:
     name: Test on Ruby ${{ matrix.ruby }} macOS
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          sudo gem install bundler -v "~> 2" --force
+          sudo gem install bundler --force
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/ubuntu.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: ubuntu
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-linux:
     name: Test on Ruby ${{ matrix.ruby }} Ubuntu
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -20,7 +25,7 @@ jobs:
           architecture: 'x64'
       - name: Update gems
         run: |
-          gem install bundler -v "~> 2"
+          gem install bundler
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/windows.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
 
 jobs:
   test-windows:
     name: Test on Ruby ${{ matrix.ruby }} Windows
     runs-on: windows-latest
     strategy:
+      fail-fast: false
       matrix:
         ruby: [ '2.6', '2.5', '2.4' ]
     steps:
@@ -21,7 +26,7 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2.0.2"
+          gem install bundler
           bundle config --local path vendor/bundle
           bundle update
           bundle install --jobs 4 --retry 3

data/lib/relaton_ietf/ietf_bibliographic_item.rb

@@ -10,7 +10,7 @@ module RelatonIetf
     # @param keyword [Array<String>]
     def initialize(**args)
       @doctype = args.delete :doctype
-      @keyword = args.delete(:keyword) || []
+      # @keyword = args.delete(:keyword) || []
       super
     end
 
@@ -23,7 +23,7 @@ module RelatonIetf
         if opts[:bibdata]
           b.ext do
             b.doctype doctype if doctype
-            keyword.each { |k| b.keyword k }
+            # keyword.each { |k| b.keyword k }
           end
         end
       end
@@ -33,7 +33,7 @@ module RelatonIetf
     def to_hash
       hash = super
       hash["doctype"] = doctype if doctype
-      hash["keyword"] = single_element_array(keyword) if keyword&.any?
+      # hash["keyword"] = single_element_array(keyword) if keyword&.any?
       hash
     end
   end

data/lib/relaton_ietf/scrapper.rb

@@ -45,18 +45,19 @@ module RelatonIetf
       # @param reference [String]
       # @param is_relation [TrueClass, FalseClass]
       # @param url [String, NilClass]
+      # @param ver [String, NilClass] Internet Draft version
       # @return [RelatonIetf::IetfBibliographicItem]
-      def fetch_rfc(reference, is_relation = false, url = nil)
+      def fetch_rfc(reference, is_relation = false, url = nil, ver = nil)
         return unless reference
 
         ietf_item(
           is_relation: is_relation,
           id: reference[:anchor],
           type: "standard",
-          docid: docids(reference),
+          docid: docids(reference, ver),
           status: status(reference),
           language: [language(reference)],
-          link: link(reference, url),
+          link: link(reference, url, ver),
           title: titles(reference),
           abstract: abstracts(reference),
           contributor: contributors(reference),
@@ -77,10 +78,20 @@ module RelatonIetf
         anchor =~ /I-D/ ? "internet-draft" : "rfc"
       end
 
-      def link(reference, url)
+      # @param reference [Nokogiri::XML::Element]
+      # @param url [String]
+      # @param ver [String, NilClass] Internet Draft version
+      # @return [Array<Hash>]
+      def link(reference, url, ver)
         l = []
         l << { type: "xml", content: url } if url
         l << { type: "src", content: reference[:target] } if reference[:target]
+        if reference[:anchor] =~ /^I-D/
+          reference.xpath("format").each do |f|
+            c = ver ? f[:target].sub(/(?<=-)\d{2}(?=\.)/, ver) : f[:target]
+            l << { type: f[:type], content: c }
+          end
+        end
         l
       end
 
@@ -99,10 +110,13 @@ module RelatonIetf
         uri = nil
         error = nil
         uri_nums.each do |n|
+          /(?<=-)(?<ver>\d{2})$/ =~ ref
+          ref.sub! /-\d{2}/, "" if ver && n == "3"
+
           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
+            resp = fetch_rfc doc.at("//reference"), is_relation, uri, ver
             return resp if resp
           rescue RelatonBib::RequestError => e
             error = e
@@ -289,9 +303,12 @@ module RelatonIetf
       #
       # Extract document identifiers from reference
       #
+      # @param reference [Nokogiri::XML::Element]
+      # @param ver [String, NilClass] Internet Draft version
+      #
       # @return [Array<RelatonBib::DocumentIdentifier>]
       #
-      def docids(reference)
+      def docids(reference, ver)
         id = (reference[:anchor] || reference[:docName]).sub(/^(RFC)/, "\\1 ")
         ret = []
         ret << RelatonBib::DocumentIdentifier.new(type: "IETF", id: id)
@@ -299,9 +316,11 @@ module RelatonIetf
           ret << RelatonBib::DocumentIdentifier.new(type: "rfc-anchor", id: id)
         end
         ret + reference.xpath("./seriesInfo").map do |si|
-          next unless si[:name] == "DOI"
+          next unless ["DOI", "Internet-Draft"].include? si[:name]
 
-          RelatonBib::DocumentIdentifier.new(id: si[:value], type: si[:name])
+          id = si[:value]
+          id.sub! /(?<=-)\d{2}$/, ver if ver && si[:name] == "Internet-Draft"
+          RelatonBib::DocumentIdentifier.new(id: id, type: si[:name])
         end.compact
       end
 

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "0.8.0".freeze
+  VERSION = "0.9.0".freeze
 end

data/relaton_ietf.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "ruby-jing"
 
-  spec.add_dependency "relaton-bib", "~> 0.5.0"
+  spec.add_dependency "relaton-bib", "~> 0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: