relaton-ietf 1.0.3 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfc51d85c3388e1f2d4f1b4bd530ee4c36b10f60906b742eec812f313d9ec1cf
-  data.tar.gz: 961323b40d233d6dd662f2f9fb98590bb39f649067d7efaf6de642a2ec3ae204
+  metadata.gz: 3006ceb252c3088fecd5336bf823174607e924b833e16a6d2fe4576ea2c7bd96
+  data.tar.gz: 168f027b083c485350ceb59337702f99559da99408b4ea62f19306ac29400368
 SHA512:
-  metadata.gz: c96ccb8c67e97d5023823b6b45d6ecc2323ffc599de7f3306948d1f92e1e4840c7c9d4dbf6161248d5cf5f0c23adcefa13afb7e7065e2077e4df6573bacb09e5
-  data.tar.gz: 34759601e2ac3d273815cf87f54674daff30f9b1136b091e4b7af326f0a569b11370af17f9ead8f128c22b51ff070f9f9904b77fca5f16ec917c1d32a5566a32
+  metadata.gz: 64fc796033522eb10b764b741fba523ba11fcb5fd4c9806df0cb2156bbe76bff150dec088c6e031d2ff318c87bb16560ebb09479998bc92d8d4205ae5f6ba12d
+  data.tar.gz: 14d06c4354e3b2a61ae946ca819bbbe56aa7f5cfabba7ffe4d57dbf68e9112ef3828dc0d755969bba0460a38cd7e0c90356a74c1dfa289b8cfed0621580b3fa5

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/grammars/biblio.rng

@@ -88,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -98,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -136,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>
@@ -641,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1001,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/grammars/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -902,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">

data/grammars/isostandard.rng

@@ -91,6 +91,12 @@
     </define>
     <define name="sections">
       <element name="sections">
+        <zeroOrMore>
+          <choice>
+            <ref name="note"/>
+            <ref name="admonition"/>
+          </choice>
+        </zeroOrMore>
         <ref name="clause"/>
         <optional>
           <choice>
@@ -263,6 +269,8 @@
         <value>publicly-available-specification</value>
         <value>international-workshop-agreement</value>
         <value>guide</value>
+        <value>amendment</value>
+        <value>technical-corrigendum</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -510,7 +518,7 @@
         </attribute>
       </optional>
       <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
+        <ref name="BasicBlock"/>
       </oneOrMore>
     </element>
   </define>

data/lib/relaton_ietf/scrapper.rb

@@ -192,7 +192,8 @@ module RelatonIetf
 
       # @return [Array<Hash{Symbol=>RelatonBib::Person,Symbol=>Array<String>}>]
       def persons(reference)
-        reference.xpath("./front/author").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)],
@@ -205,10 +206,15 @@ module RelatonIetf
       # @return [Array<Hash{Symbol=>RelatonBib::Organization,Symbol=>Array<String>}>]
       def organizations(reference)
         publisher = { entity: new_org, role: [type: "publisher"] }
-        reference.xpath("./seriesinfo").reduce([publisher]) do |mem, si|
+        orgs = reference.xpath("./seriesinfo").reduce([publisher]) do |mem, si|
           next mem unless si[:stream]
 
-          mem << { entity: new_org(si[:stream]), role: [type: "author"] }
+          mem << { entity: new_org(si[:stream], nil), role: [type: "author"] }
+        end
+        orgs + reference.xpath(
+          "front/author[not(@surname)][not(@fullname)]/organization",
+        ).map do |org|
+          { entity: new_org(org.text, nil), role: [type: "author"] }
         end
       end
 
@@ -216,17 +222,21 @@ module RelatonIetf
       # @param ref [Nokogiri::XML::Document]
       # @return [RelatonBib::FullName]
       def full_name(author, ref)
+        lang = language ref
         RelatonBib::FullName.new(
-          completename: localized_string(author[:fullname], ref),
-          initial: [localized_string(author[:initials], ref)],
-          surname: [localized_string(author[:surname], ref)],
+          completename: localized_string(author[:fullname], lang),
+          initial: [localized_string(author[:initials], lang)].compact,
+          surname: localized_string(author[:surname], lang),
         )
       end
 
       # @param content [String]
+      # @param lang [String]
       # @return [RelatonBib::LocalizedString]
-      def localized_string(content, ref)
-        RelatonBib::LocalizedString.new(content, language(ref))
+      def localized_string(content, lang)
+        return unless content
+
+        RelatonBib::LocalizedString.new(content, lang)
       end
 
       # @param postal [Nokogiri::XML::Document]
@@ -275,6 +285,9 @@ module RelatonIetf
         RelatonBib::Affiliation.new organization: org
       end
 
+      # @param name [String]
+      # @param abbr [String]
+      # @return [RelatonBib::Organization]
       def new_org(name = "Internet Engineering Task Force", abbr = "IETF")
         RelatonBib::Organization.new name: name, abbreviation: abbr
       end
@@ -306,6 +319,8 @@ module RelatonIetf
         [RelatonBib::BibliographicDate.new(type: "published", on: date)]
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       #
       # Extract document identifiers from reference
       #
@@ -315,7 +330,8 @@ module RelatonIetf
       # @return [Array<RelatonBib::DocumentIdentifier>]
       #
       def docids(reference, ver)
-        id = (reference[:anchor] || reference[:docName]).sub(/^(RFC)/, "\\1 ")
+        id = (reference[:anchor] || reference[:docName] || reference[:number]).
+          sub(/^(RFC)/, "\\1 ")
         ret = []
         ret << RelatonBib::DocumentIdentifier.new(type: "IETF", id: id)
         if (id = reference[:anchor])
@@ -329,6 +345,7 @@ module RelatonIetf
           RelatonBib::DocumentIdentifier.new(id: id, type: si[:name])
         end.compact
       end
+      # enable Metrics/MethodLength, Metrics/AbcSize
 
       #
       # Extract series form reference

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.0.3".freeze
+  VERSION = "1.1.3".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.0.3"
+  spec.add_dependency "relaton-bib", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -154,16 +154,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email:
@@ -184,6 +184,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
 - grammars/biblio.rng