relaton-ietf 1.7.3 → 1.9.0

data/grammars/reqt.rng

@@ -30,15 +30,34 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
     <optional>
       <attribute name="filename"/>
     </optional>
+    <optional>
+      <attribute name="model"/>
+    </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -48,9 +67,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="reqinherit"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -135,6 +154,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_ietf/hash_converter.rb

@@ -5,7 +5,7 @@ module RelatonIetf
       # Ovverides superclass's method
       #
       # @param item [Hash]
-      # @retirn [RelatonIec::IecBibliographicItem]
+      # @retirn [RelatonIetf::IetfBibliographicItem]
       def bib_item(item)
         IetfBibliographicItem.new(**item)
       end

data/lib/relaton_ietf/ietf_bibliographic_item.rb

@@ -17,6 +17,13 @@ module RelatonIetf
       super
     end
 
+    # @param hash [Hash]
+    # @return [RelatonIetf::IetfBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonIetf::HashConverter.hash_to_bib(hash)
+      new **item_hash
+    end
+
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [Boolean] :bibdata

data/lib/relaton_ietf/ietf_bibliography.rb

@@ -20,7 +20,11 @@ module RelatonIetf
       def get(code, _year = nil, _opts = {})
         warn "[relaton-ietf] (\"#{code}\") fetching..."
         result = search code
-        warn "[relaton-ietf] (\"#{code}\") found #{result.docidentifier.first.id}"
+        if result
+          warn "[relaton-ietf] (\"#{code}\") found #{result.docidentifier.first.id}"
+        else
+          warn "[relaton-ietf] (\"#{code}\") not found"
+        end
         result
       end
     end

data/lib/relaton_ietf/processor.rb

@@ -27,8 +27,7 @@ module RelatonIetf
     # @param hash [Hash]
     # @return [RelatonIetf::IetfBibliographicItem]
     def hash_to_bib(hash)
-      item_hash = ::RelatonIetf::HashConverter.hash_to_bib(hash)
-      ::RelatonIetf::IetfBibliographicItem.new item_hash
+      ::RelatonIetf::IetfBibliographicItem.from_hash hash
     end
 
     # Returns hash of XML grammar

data/lib/relaton_ietf/scrapper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "net/http"
-require "nokogiri"
 require "relaton_bib"
 require "relaton_ietf/ietf_bibliographic_item"
 
@@ -17,16 +16,16 @@ module RelatonIetf
       # @param text [String]
       # @param is_relation [TrueClass, FalseClass]
       # @return [RelatonIetf::IetfBibliographicItem]
-      def scrape_page(text, is_relation = false)
+      def scrape_page(text, is_relation: false)
         # Remove initial "IETF " string if specified
         ref = text.gsub(/^IETF /, "")
-        /^(RFC|BCP|FYI|STD)\s(?<num>\d+)/ =~ ref
+        /^(?:RFC|BCP|FYI|STD)\s(?<num>\d+)/ =~ ref
         ref.sub! /(?<=^(?:RFC|BCP|FYI|STD)\s)(\d+)/, num.rjust(4, "0") if num
         rfc_item ref, is_relation
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
              Net::ProtocolError, SocketError
-        raise RelatonBib::RequestError, "No document found for #{ref} reference."
+        raise RelatonBib::RequestError, "No document found for #{ref} reference"
       end
 
       # @param reference [Nokogiri::XML::Element, nil]
@@ -34,7 +33,7 @@ module RelatonIetf
       # @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) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      def fetch_rfc(reference, is_relation: false, url: nil, ver: nil) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         return unless reference
 
         ietf_item(
@@ -54,7 +53,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
 
@@ -92,6 +91,7 @@ module RelatonIetf
       end
 
       # @param ref [String]
+      # @param is_relation [Boolen, nil]
       # @return [RelatonIetf::IetfBibliographicItem]
       def rfc_item(ref, is_relation)
         /(?<=-)(?<ver>\d{2})$/ =~ ref
@@ -102,14 +102,15 @@ module RelatonIetf
 
         uri = "#{GH_URL}#{ref.sub(/\s|\u00a0/, '.')}.xml"
         doc = Nokogiri::XML get_page(uri)
-        fetch_rfc doc.at("/referencegroup", "/reference"), is_relation, uri, ver
+        r = doc.at("/referencegroup", "/reference")
+        fetch_rfc r, is_relation: is_relation, url: uri, ver: ver
       end
 
       # @param reference [Nokogiri::XML::Element]
       # @return [Hash]
       def relations(reference)
         reference.xpath("reference").map do |ref|
-          { type: "includes", bibitem: fetch_rfc(ref, true) }
+          { type: "includes", bibitem: fetch_rfc(ref, is_relation: true) }
         end
       end
 
@@ -117,9 +118,10 @@ module RelatonIetf
       # @return [String] HTTP response body
       def get_page(uri)
         res = Net::HTTP.get_response(URI(uri))
-        if res.code != "200"
-          raise RelatonBib::RequestError, "No document found at #{uri}"
-        end
+        return unless res.code == "200"
+
+        #   raise RelatonBib::RequestError, "No document found at #{uri}"
+        # end
 
         res.body
       end
@@ -144,7 +146,11 @@ module RelatonIetf
         return if reference.at "./fornt/title"
 
         cont = (reference[:anchor] || reference[:docName] || reference[:number])
-        RelatonBib::FormattedRef.new content: cont, language: language(reference), script: "Latn" if cont
+        if cont
+          RelatonBib::FormattedRef.new(
+            content: cont, language: language(reference), script: "Latn",
+          )
+        end
       end
 
       # @param reference [Nokogiri::XML::Element]
@@ -172,14 +178,15 @@ module RelatonIetf
           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
       end
 
       # @param reference [Nokogiri::XML::Element]
-      # @return [Array<Hash{Symbol=>RelatonBib::Organization,Symbol=>Array<String>}>]
+      # @return [Array<Hash{Symbol=>RelatonBib::Organization,
+      #   Symbol=>Array<String>}>]
       def organizations(reference)
         publisher = { entity: new_org, role: [type: "publisher"] }
         orgs = reference.xpath("./seriesinfo").reduce([publisher]) do |mem, si|
@@ -188,7 +195,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
@@ -202,7 +209,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
 
@@ -237,7 +244,7 @@ module RelatonIetf
           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
 
@@ -309,7 +316,7 @@ module RelatonIetf
         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])
@@ -336,10 +343,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

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.7.3".freeze
+  VERSION = "1.9.0".freeze
 end

data/relaton_ietf.gemspec

@@ -27,18 +27,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.7.0"
+  spec.add_dependency "relaton-bib", "~> 1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email:
@@ -183,14 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonIetf: retrieve IETF Standards for bibliographic use using the BibliographicItem