relaton-ietf 1.5.pre → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825a59e8e6fda564fe22820f18caffb3ea73875f460f1a27485b87916292dcdf
-  data.tar.gz: 5e226dcdf18b845ee918d93da5d1985a65682ff1ce5f1205bcd476c71cac096c
+  metadata.gz: 90f95ffe25f46c8cd5ae35332277f6b39bd787c7840a30c9315b4ca393076033
+  data.tar.gz: 0e591717abcf1ae0ff27feb518469ca5703103c9d8184fea7286b3eb43b3764c
 SHA512:
-  metadata.gz: 453047515b0b04cb3de58ec2738c21f670e1ee3b0816afa78e58c9dd4c91cb8c0869d4f25e871829be30b4f43d6415b291a2b08a76b63a15fc19ec5549595b5e
-  data.tar.gz: 3777394b195714e7cddcd34f2d47202ff5c1b5c1015b1050451934d3c28c09e0e035e453c1bb67f0985aa92b22521b959fe50f8e21e39aef0e93e5498ca8a1f2
+  metadata.gz: 4d4cee3c808eedf011dbf3ee0199b6baa70c4e390821a88a685e34dd486a53ba330cda666597521c70f26670c9063cb20c98c867139bee710efe857f0623d734
+  data.tar.gz: 1e9297ebf9b3897ce346a0b1fdedf04779220c7f0210a10fa667a67df923382293029cc3126c0edf6a40857712e9bbf3a72d7fb2f4d94fc90a40f896b8e5dbc2

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/grammars/ietf.rng

@@ -868,6 +868,13 @@
   </define>
   <define name="ietf-standard">
     <element name="ietf-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/relaton_ietf.rb

@@ -6,11 +6,6 @@ require "relaton_ietf/ietf_bibliographic_item"
 require "relaton_ietf/xml_parser"
 require "relaton_ietf/hash_converter"
 
-# if defined? Relaton
-#   require_relative "relaton_ietf/processor"
-#   Relaton::Registry.instance.register(RelatonIetf::Processor)
-# end
-
 require "relaton/provider_ietf"
 
 module RelatonIetf
@@ -22,4 +17,4 @@ module RelatonIetf
     grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
     Digest::MD5.hexdigest grammars
   end
-end
+end

data/lib/relaton_ietf/hash_converter.rb

@@ -1,23 +1,14 @@
 module RelatonIetf
   class HashConverter < RelatonBib::HashConverter
     class << self
-      # @override RelatonBib::HashConverter.hash_to_bib
-      # @param args [Hash]
-      # @param nested [TrueClass, FalseClass]
-      # @return [Hash]
-      # def hash_to_bib(args, nested = false)
-      #   ret = super
-      #   return if ret.nil?
-
-      #   doctype_hash_to_bib(ret)
-      #   ret
-      # end
-
-      # private
-
-      # def doctype_hash_to_bib(ret)
-      #   ret
-      # end
+      #
+      # Ovverides superclass's method
+      #
+      # @param item [Hash]
+      # @retirn [RelatonIec::IecBibliographicItem]
+      def bib_item(item)
+        IecBibliographicItem.new(item)
+      end
     end
   end
 end

data/lib/relaton_ietf/scrapper.rb

@@ -10,6 +10,7 @@ module RelatonIetf
 
   # Scrapper module
   module Scrapper
+    GH_URL = "https://raw.githubusercontent.com/relaton/relaton-data-ietf/master/data/reference."
     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"
@@ -23,18 +24,8 @@ module RelatonIetf
       def scrape_page(text, is_relation = false)
         # Remove initial "IETF " string if specified
         ref = text.gsub(/^IETF /, "")
-
-        case ref
-        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"
+        if ref.match? /^BCP/ then bcp_item BCP_URI_PATTERN.dup, ref
+        else rfc_item ref, is_relation
         end
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
@@ -42,12 +33,12 @@ module RelatonIetf
         raise RelatonBib::RequestError, "No document found for #{ref} reference."
       end
 
-      # @param reference [String]
+      # @param reference [Nokogiri::XML::Element, nil]
       # @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, ver = nil)
+      def fetch_rfc(reference, is_relation = false, url = nil, ver = nil) # rubocop:disable Metrics/AbcSize
         return unless reference
 
         ietf_item(
@@ -65,7 +56,7 @@ module RelatonIetf
           series: series(reference),
           place: ["Fremont, CA"],
           keyword: reference.xpath("front/keyword").map(&:text),
-          doctype: doctype(reference[:anchor]),
+          doctype: doctype(reference[:anchor])
         )
       end
       # rubocop:enable Metrics/MethodLength
@@ -75,7 +66,7 @@ module RelatonIetf
       # @param anchor [String]
       # @return [String]
       def doctype(anchor)
-        anchor =~ /I-D/ ? "internet-draft" : "rfc"
+        anchor&.include?("I-D") ? "internet-draft" : "rfc"
       end
 
       # @param reference [Nokogiri::XML::Element]
@@ -86,7 +77,7 @@ module RelatonIetf
         l = []
         l << { type: "xml", content: url } if url
         l << { type: "src", content: reference[:target] } if reference[:target]
-        if reference[:anchor] =~ /^I-D/
+        if /^I-D/.match? reference[:anchor]
           reference.xpath("format").each do |f|
             c = ver ? f[:target].sub(/(?<=-)\d{2}(?=\.)/, ver) : f[:target]
             l << { type: f[:type], content: c }
@@ -103,35 +94,24 @@ module RelatonIetf
         RelatonIetf::IetfBibliographicItem.new **attrs
       end
 
-      # @param uri_nums [Array<String>]
       # @param ref [String]
       # @return [RelatonIetf::IetfBibliographicItem]
-      def rfc_item(uri_nums, ref, is_relation)
-        uri = nil
-        error = nil
-        uri_nums.each do |n|
-          /(?<=-)(?<ver>\d{2})$/ =~ ref
-          if n == "3"
-            ref.sub! /-\d{2}/, "" if ver
-            ref.sub! /(?<=I-D\.)draft-/, ""
-          end
-
-          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, ver
-            return resp if resp
-          rescue RelatonBib::RequestError => e
-            error = e
-          end
+      def rfc_item(ref, is_relation)
+        /(?<=-)(?<ver>\d{2})$/ =~ ref
+        if /^I-D/.match? ref
+          ref.sub! /-\d{2}/, "" if ver
+          ref.sub! /(?<=I-D\.)draft-/, ""
         end
-        raise error
+
+        uri = "#{GH_URL}#{ref.sub(/\s|\u00a0/, '.')}.xml"
+        doc = Nokogiri::XML get_page(uri)
+        fetch_rfc doc.at("//reference"), is_relation, uri, ver
       end
 
       # @param uri_template [String]
       # @param reference [String]
       # @return [RelatonIetf::IetfBibliographicItem]
-      def bcp_item(uri_template, reference)
+      def bcp_item(uri_template, reference) # rubocop:disable Metrics/MethodLength
         uri = uri_template.sub "CODE", reference.sub(" ", "").downcase
         doc = Nokogiri::HTML get_page(uri)
         ietf_item(
@@ -141,7 +121,7 @@ module RelatonIetf
           language: ["en"],
           link: [{ type: "src", content: uri }],
           relation: fetch_relations(doc),
-          doctype: "rfc",
+          doctype: "rfc"
         )
       end
 
@@ -149,7 +129,7 @@ module RelatonIetf
         doc.xpath("//table/tr/td/a[contains(., 'RFC')]").map do |r|
           RelatonBib::DocumentRelation.new(
             type: "merges",
-            bibitem: scrape_page(r.text, true),
+            bibitem: scrape_page(r.text, true)
           )
         end
       end
@@ -163,10 +143,6 @@ module RelatonIetf
         res.body
       end
 
-      # def make_uri(uri_template, reference)
-      #   uri_template.gsub("CODE", reference)
-      # end
-
       # @return [String]
       def language(reference)
         reference[:lang] || "en"
@@ -195,12 +171,12 @@ module RelatonIetf
 
       # @return [Array<Hash{Symbol=>RelatonBib::Person,Symbol=>Array<String>}>]
       def persons(reference)
-        reference.xpath("./front/author[@surname]|./front/author[@fullname]").
-          map do |author|
+        reference.xpath("./front/author[@surname]|./front/author[@fullname]")
+          .map do |author|
           entity = RelatonBib::Person.new(
             name: full_name(author, reference),
             affiliation: [affiliation(author)],
-            contact: contacts(author.at("./address")),
+            contact: contacts(author.at("./address"))
           )
           { entity: entity, role: [contributor_role(author)] }
         end
@@ -215,7 +191,7 @@ module RelatonIetf
           mem << { entity: new_org(si[:stream], nil), role: [type: "author"] }
         end
         orgs + reference.xpath(
-          "front/author[not(@surname)][not(@fullname)]/organization",
+          "front/author[not(@surname)][not(@fullname)]/organization"
         ).map do |org|
           { entity: new_org(org.text, nil), role: [type: "author"] }
         end
@@ -229,7 +205,7 @@ module RelatonIetf
         RelatonBib::FullName.new(
           completename: localized_string(author[:fullname], lang),
           initial: [localized_string(author[:initials], lang)].compact,
-          surname: localized_string(author[:surname], lang),
+          surname: localized_string(author[:surname], lang)
         )
       end
 
@@ -258,13 +234,13 @@ module RelatonIetf
 
       # @param postal [Nokogiri::XML::Document]
       # @rerurn [RelatonBib::Address]
-      def address(postal)
+      def address(postal) # rubocop:disable Metrics/CyclomaticComplexity
         RelatonBib::Address.new(
           street: [(postal.at("./postalLine") || postal.at("./street"))&.text],
           city: postal.at("./city")&.text,
           postcode: postal.at("./code")&.text,
           country: postal.at("./country")&.text,
-          state: postal.at("./region")&.text,
+          state: postal.at("./region")&.text
         )
       end
 
@@ -303,7 +279,7 @@ module RelatonIetf
 
       def month(mon)
         return 1 if !mon || mon.empty?
-        return mon if /^\d+$/ =~ mon
+        return mon if /^\d+$/.match? mon
 
         Date::MONTHNAMES.index(mon)
       end
@@ -332,12 +308,12 @@ module RelatonIetf
       #
       # @return [Array<RelatonBib::DocumentIdentifier>]
       #
-      def docids(reference, ver)
+      def docids(reference, ver) # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         id = (reference[:anchor] || reference[:docName] || reference[:number])
         ret = []
         if id
           ret << RelatonBib::DocumentIdentifier.new(
-            type: "IETF", id: id.sub(/^(RFC)/, "\\1 "),
+            type: "IETF", id: id.sub(/^(RFC)/, "\\1 ")
           )
         end
         if (id = reference[:anchor])
@@ -365,10 +341,10 @@ module RelatonIetf
 
           RelatonBib::Series.new(
             title: RelatonBib::TypedTitleString.new(
-              content: si[:name], language: language(reference), script: "Latn",
+              content: si[:name], language: language(reference), script: "Latn"
             ),
             number: si[:value],
-            type: "main",
+            type: "main"
           )
         end.compact
       end
@@ -383,9 +359,7 @@ module RelatonIetf
         st = reference.at("./seriesinfo[@status]")
         return unless st
 
-        RelatonBib::DocumentStatus.new(
-          stage: st[:status],
-        )
+        RelatonBib::DocumentStatus.new(stage: st[:status])
       end
     end
   end

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.5.pre".freeze
+  VERSION = "1.7.1".freeze
 end

data/relaton_ietf.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.5.pre"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.5.pre
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email:
@@ -216,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: