relaton-ieee 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaf06375726fbbc3787de633d801af3b3d0b9a5eb034db2bcfee5a73f82d9f9e
-  data.tar.gz: 941f57105265f5c195a031ba2514299ec50f09439f35f00a2801543e9e906691
+  metadata.gz: 446b15d222e45953544bb1c49b9811651c13246cfdac2c60c4bb8a761b86adcf
+  data.tar.gz: deadb07888412133d01574f35d17131f4fbebf8e53eae341e5384c85fce9afac
 SHA512:
-  metadata.gz: 2e00b76917329c4cfc1d2d5952cefc7776d5c33540087c84e20dddd7dec55ffb2e1ce48e2ab9289e1a0543ef3ad39db6a0ba399aeef93fc32536e4756906271b
-  data.tar.gz: 0acfdc0b3f0bab3a84605520761db7b21dc8167ea1b0c27255f4362f323593ccc82f95978ecbdb99b693050bab008aa0782c14e4f3203471451ac17e2fd93edc
+  metadata.gz: e685ed12ac545f7dc2da6f763e0bb49a5a933b1e853d79d433882e0d79e8bd9bb11317c7511743a9d0326c2c1c94ca4a289edef9eb50bef4f51077e0a59a2880
+  data.tar.gz: 6882a387ffed1d11ea5b3bb593691e1744a426365dde5548fe6e0aa15363cd6b112ee4b91e73dd50516ed0d7429ff3c9b5de55edfa08073fa613b17f12b6d4fc

data/.github/workflows/macos.yml

@@ -32,6 +32,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/relaton_ieee/hit_collection.rb

@@ -23,7 +23,7 @@ module RelatonIeee
       json = JSON.parse resp_json["message"]
       @array = json["response"]["searchResults"]["resultsMapList"]
         .reduce([]) do |s, hit|
-          /^(?:\w+\s)?(?<id>\d+)-(?<year>\d{4})/ =~ hit["record"]["recordTitle"]
+          /^(?:\w+\s)?(?<id>[^-\/]+)(-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
           next s unless id && code =~ %r{^#{id}}
 
           s << Hit.new(hit["record"].merge(code: id, year: year.to_i), self)

data/lib/relaton_ieee/ieee_bibliographic_item.rb

@@ -9,10 +9,13 @@ module RelatonIeee
       super
     end
 
-    # @param builder [Nokogiri::XML::Bilder]
-    # @parma bibdata [TrueClass, FalseClass, NilClass]
-    def to_xml(builder = nil, **opts)
-      super do |bldr|
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String] :lang language
+    # @return [String] XML
+    def to_xml(**opts)
+      super **opts do |bldr|
         if opts[:bibdata] && committee.any?
           bldr.ext do |b|
             committee.each { |c| c.to_xml b }

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.4.0".freeze
+  VERSION = "1.7.0".freeze
 end

data/relaton_ieee.gemspec

@@ -43,5 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.0.0"
-  spec.add_dependency "relaton-bib", "~> 1.4.0"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 description: 'RelatonIeee: retrieve IEEE Standards for bibliographic use using the
   IeeeBibliographicItem model'
 email: