relaton-iana 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f95a28c615d40f376060abeb732a2f27fb39433a976c39ddf5dc23286aa987
-  data.tar.gz: b421d5f96686ef8a65a2c0218d39f14f4acc8ae100b103453532a52825f8d226
+  metadata.gz: a36e2e323319b37fe02fbeed92da602d41c54f9e14571f0bf236b5593c5413ab
+  data.tar.gz: 2767420cef8e6a4dd1568a599236ff80aac4665465f51b345cc097e33c70736d
 SHA512:
-  metadata.gz: 717aa0c320987757c29bad0782a3cf85bf48a7782231fbc562c130ecde89a16b57e12c2bdfcc97e974de0c311b809ffeb1e1cbae9091d66f0ac333ed857cff61
-  data.tar.gz: 746e55e7aa9559cc21f18b69c5a1ed404c861ea94f4dee136660dbfaff3b37f65beb6d44b5423fe6a3555b262ebda9344b3ddde9342af2ddd91f81744968fc82
+  metadata.gz: 0a18eb38627a3329feb058a5635d8bbb0f046bbbe4454149e2502596c3b412973af16ea27e3c61d481391302665f67f976cff08e2e4df933b81e9988ed2edf85
+  data.tar.gz: 2dcd859ba3d3027a4ae6369f1aaa2359f891839491ade60d03d2c78cc3cf78829359aab2a0ae0a388b8a8ac80f24cb0525dd77b32c67d2ae2bc20a40cc41e5e0

data/grammars/biblio.rng

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_iana/data_fetcher.rb

@@ -34,6 +34,8 @@ module RelatonIana
     #
     # Parse documents
     #
+    # @param [Integer] page page number
+    #
     def fetch(page = 1) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       params = {
         q: "repo:ietf-ribose/iana-registries extension:xml",
@@ -61,6 +63,11 @@ module RelatonIana
       fetch(page + 1) if (json["total_count"] - (page * 100)).positive?
     end
 
+    #
+    # Fetch document
+    #
+    # @param [String] url url of document
+    #
     def fetch_doc(url) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       resp = Net::HTTP.get_response URI(url)
       if resp.code == "200"

data/lib/relaton_iana/parser.rb

@@ -73,7 +73,19 @@ module RelatonIana
     # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
     #
     def parse_docid
-      [RelatonBib::DocumentIdentifier.new(type: "IANA", id: pub_id, primary: true)]
+      [
+        RelatonBib::DocumentIdentifier.new(type: "IANA", id: pub_id, primary: true),
+        RelatonBib::DocumentIdentifier.new(type: "IETF", id: anchor, scope: "anchor"),
+      ]
+    end
+
+    #
+    # Create anchor
+    #
+    # @return [String] anchor
+    #
+    def anchor
+      docnumber.upcase.gsub("/", "__")
     end
 
     #
@@ -85,6 +97,11 @@ module RelatonIana
       "IANA #{docnumber}"
     end
 
+    #
+    # Create docnumber
+    #
+    # @return [String] docnumber
+    #
     def docnumber
       dn = ""
       dn += "#{@rootdoc.docnumber}/" if @rootdoc

data/lib/relaton_iana/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIana
-  VERSION = "1.10.1"
+  VERSION = "1.11.0"
 end

data/relaton_iana.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.8.0"
-  spec.add_dependency "relaton-bib", "~> 1.10.1"
+  spec.add_dependency "relaton-bib", "~> 1.11.0"
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iana
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 description: 'RelatonIana: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com