relaton-itu 0.9.0 → 1.0.0

data/grammars/itu.rng

@@ -5,50 +5,10 @@
     we cannot have a new default namespace: we will end up with a grammar with two different
     namespaces, one for isostandard and one for csand additions. And we do not want that.
   -->
-  <include href="isostandard.rng">
+  <include href="isodoc.rng">
     <start>
       <ref name="itu"/>
     </start>
-    <define name="figure">
-      <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <choice>
-          <ref name="image"/>
-          <ref name="pre"/>
-          <oneOrMore>
-            <ref name="subfigure"/>
-          </oneOrMore>
-        </choice>
-        <zeroOrMore>
-          <ref name="fn"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="dl"/>
-        </optional>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </element>
-    </define>
-    <define name="subfigure">
-      <element name="figure">
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-        <optional>
-          <ref name="tname"/>
-        </optional>
-        <choice>
-          <ref name="image"/>
-          <ref name="pre"/>
-        </choice>
-      </element>
-    </define>
     <define name="ol">
       <element name="ol">
         <attribute name="id">
@@ -97,11 +57,6 @@
         </optional>
       </element>
     </define>
-    <define name="workgroup">
-      <element name="workgroup">
-        <ref name="ItuGroup"/>
-      </element>
-    </define>
     <define name="structuredidentifier">
       <element name="structuredidentifier">
         <ref name="bureau"/>
@@ -147,13 +102,13 @@
         </oneOrMore>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <choice>
-        <ref name="add"/>
-        <ref name="del"/>
-      </choice>
-    </define>
   </include>
+  <define name="TextElement" combine="choice">
+    <choice>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
   <define name="add">
     <element name="add">
       <choice>
@@ -282,6 +237,11 @@
       <data type="gYear"/>
     </element>
   </define>
+  <define name="workgroup">
+    <element name="workgroup">
+      <ref name="ItuGroup"/>
+    </element>
+  </define>
   <define name="itu">
     <element name="itu-standard">
       <ref name="bibdata"/>

data/lib/relaton_itu/itu_bibliography.rb

@@ -66,12 +66,12 @@ module RelatonItu
         nil
       end
 
-      def fetch_pages(s, n)
-        workers = RelatonBib::WorkersPool.new n
+      def fetch_pages(hits, threads)
+        workers = RelatonBib::WorkersPool.new threads
         workers.worker { |w| { i: w[:i], hit: w[:hit].fetch } }
-        s.each_with_index { |hit, i| workers << { i: i, hit: hit } }
+        hits.each_with_index { |hit, i| workers << { i: i, hit: hit } }
         workers.end
-        workers.result.sort { |x, y| x[:i] <=> y[:i] }.map { |x| x[:hit] }
+        workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
       end
 
       def search_filter(code)

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "0.9.0".freeze
+  VERSION = "1.0.0".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-iso-bib", "~> 0.9.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
 description: 'RelatonItu: retrieve ITU Standards for bibliographic use using the BibliographicItem
   model'
 email: