relaton-ietf 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59e56b55555406ba369ed0595269ebd1e4aa73879ee601c230a0d139fb2352cc
-  data.tar.gz: 5e6656e85479c156df800ac01d7c58f85337eaaef0b11ae9fb8124b7c8968aa9
+  metadata.gz: ed5846b470eedb791848d99a33c6401dc9b4867d9222ea60270969a987040435
+  data.tar.gz: da3b3ca9820a4fd37fe4190211ca4bccf5e1ba77dd5d3fc255c12464f8584efb
 SHA512:
-  metadata.gz: bea826e6f3c4059306a334c1583c4124a98f42d84ce60181bb3d9938118df61ea0bd069cb86153d7b7bdbe889fcf91a6fe37269416c6fd4360da0f02b5537137
-  data.tar.gz: 66c5d9df2217ad09ad0f5568a8265bc80ee3dfdf7f5a044de5c3c414dd881dd346388aa742d76b9cd55c34acf2ce19dc5b73909056d31e8a27ef63b66bc6e9d0
+  metadata.gz: '0870cba19a84bb92de960ba5dd54e396d784cd7b00b207bfa80a2fb6c5b7baa4117d8ffff6200e4921b009c743f119584254750e964c827594e82ba3f1e3eae7'
+  data.tar.gz: bce648a595ee447883dc5c97aa24b57f35f30000e063798d1b287e36ea284e818de44eae9efcf7b7d3410096c3f357c02719a437760ed8b0e7b5d9ffa2b44462

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>
@@ -767,6 +787,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -999,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">
@@ -1019,38 +1051,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">

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>
@@ -129,6 +137,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +314,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>
@@ -899,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/organization[string-length(.) > 0]",
+        ).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.1".freeze
+  VERSION = "1.1.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.0.0"
+  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.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: