relaton-itu 1.5.pre → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4e82ea65493dad8d074bb5c7d9444874299fdfb6614b5ebb396ef70683fcc02
-  data.tar.gz: a6977116ce7dbc5b2fdcb1f8de23599fda3a86b85f10d1029643b361e6e28774
+  metadata.gz: 6abecc5b89b11a2e53d64fa08fec21a51861df0799a24ab46193f0563e53ca9e
+  data.tar.gz: 53f0d275a4bfab0d597f8ae91fcd505f70d5be44df743b5781a6a341a6fac23a
 SHA512:
-  metadata.gz: 6e70629e63e23a36bcae38127dcf01f4ad9deae6325dd90536979cc792795df8351dd866bce463fe5d25a73733eafe13cf82daa015bc2230277e0f1a35db8a79
-  data.tar.gz: e45b278fa0f962485ec881c6eb0f2e788b1e9c827dbb0ed48094288bfbe35c75608ce018278458de6c18943cee8a8563e654e6681843f56ea79b32b43b3f996e
+  metadata.gz: aa42bec1e3c06656671893b4e08dfa523171a58ef9734d2c551413350e5572d60173d0e276f31a2630f22b6cfc2f6d8a3bea11105057fc903835a98cdf666eac
+  data.tar.gz: 2f997f7732fa074aa30b03c490504a501361310973c8c1e9e8e9b16843033a34dc6393c51d635f321f1009a49ef55b261bc9edb6a423b29feea227b02c5cd75b

data/.github/workflows/macos.yml

@@ -26,6 +26,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/grammars/itu.rng

@@ -41,6 +41,7 @@
         <value>technical-report</value>
         <value>joint-itu-iso-iec</value>
         <value>resolution</value>
+        <value>service-publication</value>
       </choice>
     </define>
     <define name="editorialgroup">
@@ -68,6 +69,16 @@
             <text/>
           </element>
         </optional>
+        <optional>
+          <element name="amendment">
+            <data type="int"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="corrigendum">
+            <data type="int"/>
+          </element>
+        </optional>
       </element>
     </define>
     <define name="BibDataExtensionType">
@@ -84,6 +95,18 @@
       <optional>
         <ref name="ipnoticereceived"/>
       </optional>
+      <optional>
+        <ref name="meeting"/>
+      </optional>
+      <optional>
+        <ref name="meeting-date"/>
+      </optional>
+      <optional>
+        <ref name="intended-type"/>
+      </optional>
+      <optional>
+        <ref name="ext_source"/>
+      </optional>
       <optional>
         <ref name="structuredidentifier"/>
       </optional>
@@ -103,6 +126,44 @@
       </element>
     </define>
   </include>
+  <define name="meeting">
+    <element name="meeting">
+      <text/>
+    </element>
+  </define>
+  <define name="meeting-date">
+    <element name="meeting-date">
+      <choice>
+        <group>
+          <element name="from">
+            <ref name="ISO8601Date"/>
+          </element>
+          <optional>
+            <element name="to">
+              <ref name="ISO8601Date"/>
+            </element>
+          </optional>
+        </group>
+        <element name="on">
+          <ref name="ISO8601Date"/>
+        </element>
+      </choice>
+    </element>
+  </define>
+  <define name="intended-type">
+    <element name="intended-type">
+      <choice>
+        <value>R</value>
+        <value>C</value>
+        <value>TD</value>
+      </choice>
+    </element>
+  </define>
+  <define name="ext_source">
+    <element name="source">
+      <text/>
+    </element>
+  </define>
   <define name="TextElement" combine="choice">
     <choice>
       <ref name="add"/>
@@ -244,6 +305,13 @@
   </define>
   <define name="itu">
     <element name="itu-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/relaton_itu/hit_collection.rb

@@ -29,7 +29,7 @@ module RelatonItu
 
     # @return [String]
     def group
-      @group ||= if %r{(OB|Operational Bulletin) No} =~ text then "Publications"
+      @group ||= if %r{OB|Operational Bulletin}.match? text then "Publications"
                  else "Recommendations"
                  end
     end
@@ -54,7 +54,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Name",
-              "Target" => "/name_s",
+              "Target" => "\\/name_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -62,7 +62,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Short description",
-              "Target" => "/short_description_s",
+              "Target" => "\\/short_description_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -70,7 +70,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "File content",
-              "Target" => "/file",
+              "Target" => "\\/file",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -79,9 +79,8 @@ module RelatonItu
           "Selected" => false,
         }],
         "Topics" => "",
-        "ClientData" => { "ip" => "" },
+        "ClientData" => {},
         "Language" => "en",
-        "IP" => "",
         "SearchType" => "All",
       }
     end

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.5.pre".freeze
+  VERSION = "1.7.1".freeze
 end

data/relaton-itu.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr", "~> 5.0.0"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.5.pre"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.5.pre
+  version: 1.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.pre
+        version: 1.7.0
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email:
@@ -218,9 +218,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: