relaton-ietf 1.0.4 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7c3cbbf83e978418b1b8ce37ccd498651b029af23c8917fc7dc76e7249424d3
-  data.tar.gz: cadfca1c00571049297c95c5ab826f27d31408db332b9d8784f97debfc56dba4
+  metadata.gz: 9b4c5d8312868629129478bdcae9e7974ed1e32052a4bb674f8e2e93f43448ab
+  data.tar.gz: 6fd9cc41e53b2a0333faafaa692a6c6a5c0f60b36a1a93d3520a31e420c48cc3
 SHA512:
-  metadata.gz: cab4dd39ba1aa43f6791e1a89e4fa373effb43dc9826af80e6e7d2ae701c6d270ea31effa7a2679a53d1240a7537a0c8c1419a809e55e950ab8de8838b0cbb32
-  data.tar.gz: 176c22ed17078a84e4ee7548cefc172c6924fa2470900fc8386af3736a8b5f133b991baaf709f3427eb13c9cc29094f235ca16b56b8046e186221fa677ad9b82
+  metadata.gz: 721d3953bb74e0ca0b7a63a8870ce845491c458fe9b1f33d1f9219cf2d40d853da68c2c413296480aad01c546caa79ed89820408f391a5f62c35e178a1ef0354
+  data.tar.gz: 4c6ea63c04af0190e09e0bc42b807be9e4e7e2f0548022b8de6fc640829e46a887b83f2cf3ed8e07b9acbb0497c62cea0951db9e9b96c99d6944b69bcdabb0bf

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/ietf_bibliographic_item.rb

@@ -10,7 +10,6 @@ module RelatonIetf
     # @param keyword [Array<String>]
     def initialize(**args)
       @doctype = args.delete :doctype
-      # @keyword = args.delete(:keyword) || []
       super
     end
 
@@ -20,10 +19,9 @@ module RelatonIetf
     def to_xml(builder = nil, **opts)
       opts[:date_format] ||= :short
       super builder, **opts do |b|
-        if opts[:bibdata]
+        if opts[:bibdata] && doctype
           b.ext do
             b.doctype doctype if doctype
-            # keyword.each { |k| b.keyword k }
           end
         end
       end

data/lib/relaton_ietf/scrapper.rb

@@ -206,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
 
@@ -314,6 +319,8 @@ module RelatonIetf
         [RelatonBib::BibliographicDate.new(type: "published", on: date)]
       end
 
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+
       #
       # Extract document identifiers from reference
       #
@@ -323,9 +330,13 @@ 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])
         ret = []
-        ret << RelatonBib::DocumentIdentifier.new(type: "IETF", id: id)
+        if id
+          ret << RelatonBib::DocumentIdentifier.new(
+            type: "IETF", id: id.sub(/^(RFC)/, "\\1 "),
+          )
+        end
         if (id = reference[:anchor])
           ret << RelatonBib::DocumentIdentifier.new(type: "rfc-anchor", id: id)
         end
@@ -337,6 +348,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.4".freeze
+  VERSION = "1.1.4".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.4"
+  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.4
+  version: 1.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2020-06-18 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.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        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