relaton-ietf 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0082697b1d652caba7ebe1bbc65cee01d5577ce3bee47495a812c29dc795a0ea'
-  data.tar.gz: 791a22989f337071fec4deb1fe54fe88ea1f0633ba23fdae22f995137ae5e040
+  metadata.gz: e3a2c7e75c90013ba322c307abb3ac5ee84072750addf1973e7dbcadb4db1cea
+  data.tar.gz: 4eacd7b746d3b9b9445a05149e9d17b7cbce03e20e002acbd7d12ae571c3249a
 SHA512:
-  metadata.gz: a876551c178f85e8c8f86c8a80adf75d3448fa25b14a138b914c88d584cc9a3c187fc277c0ed4ec3ddff40c77b41433c03a570c23a69364889f8a3545ca7f0a9
-  data.tar.gz: c8bbc988a93108be2218e6a7b29bb28ac72caf8b17e03ce7ac0886f0cb9433b93beb5725bf86495dea59d14910ece127252af0b509bec361d7a773630d484505
+  metadata.gz: f814beba0b17dd369bfd187f73c4d9fd7d43d8c6714f642273096933342906eaefbdc37ec6f010b25849bde46caf2a60580f630285161ff75eddb0f83a0b2de6
+  data.tar.gz: c125f98ac22b91247b529c2a33b7e44d85d0924fa87202b20fb32f66169b915c51d937e33e4c5735d1607b2dad0c6bba217a9764ff9c1b073a916a0794236e51

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)],
@@ -204,29 +205,38 @@ module RelatonIetf
 
       # @return [Array<Hash{Symbol=>RelatonBib::Organization,Symbol=>Array<String>}>]
       def organizations(reference)
-        reference.xpath("./seriesinfo").map do |si|
-          next unless si[:stream]
+        publisher = { entity: new_org, role: [type: "publisher"] }
+        orgs = reference.xpath("./seriesinfo").reduce([publisher]) do |mem, si|
+          next mem unless si[:stream]
 
-          entity = RelatonBib::Organization.new name: si[:stream]
-          { entity: entity, role: [type: "author"] }
-        end.compact
+          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
 
       # @param author [Nokogiri::XML::Document]
       # @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]
@@ -267,13 +277,21 @@ module RelatonIetf
       # @return [RelatonBib::Affiliation]
       def affiliation(author)
         organization = author.at("./organization")
-        org = RelatonBib::Organization.new(
-          name: organization.nil? || organization&.text&.empty? ? "IETF" : organization.text,
-          abbreviation: organization.nil? ? "IETF" : (organization[:abbrev] || "IETF"),
-        )
+        org = if organization.nil? || organization&.text&.empty?
+                new_org
+              else
+                new_org organization.text, organization[:abbrev]
+              end
         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
+
       # @param author [Nokogiri::XML::Document]
       # @return [Hash]
       def contributor_role(author)
@@ -301,6 +319,8 @@ module RelatonIetf
         [RelatonBib::BibliographicDate.new(type: "published", on: date)]
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       #
       # Extract document identifiers from reference
       #
@@ -324,6 +344,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.2".freeze
+  VERSION = "1.1.2".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.2
+  version: 1.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-06-09 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