relaton-calconnect 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 486c9ddb0b7947e6fb10eadbdab19ca60996892fd23b3713f873c3f984a216cc
-  data.tar.gz: 9c4bb050a3699f4e26db0f6304acfac6950151523daced3328453058c9a6ffdf
+  metadata.gz: 75f9c141dad7c987f632c31349e4b303cc5c20b1e3b71a70e81699d87be9cdb0
+  data.tar.gz: 6344ca6ea01264f7534324137a48831a92c95c79b563147cc216e132ee26e4ac
 SHA512:
-  metadata.gz: 1877bf1ff5813dfebd85bdb578c4ab018fa8ae839826b02aa2c8395d5392f27ba6e178f5e40f46a283497d0fac67dafbac1d8c88385fbf7775d1314cf61d83e7
-  data.tar.gz: 4702ce07e3f316ae2ffaa21b42c5d9114cbf9bdc760d87fc6ef1c4916a9e2dae3e7fa685762566048e3c3d1428f7dd6981e5dbd071e4dde377c76945f7df2718
+  metadata.gz: '05830b711c1331f64e2662bc17aa6c5d4fe1c4735f0c7831309a2457454ce6b9e92197cc5e17627fbf296fe601a3240913739e0df2f99124abb6daa3c04c860b'
+  data.tar.gz: 816f5ed634566d5ac0a5bd69f5f077538afd1c7908e700d24087681ee04a8b81821da4f18315e6db425d3e04d75d6b7e3a80ae18ab95ce75df9a748ec7f95907

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/csd.rng

@@ -86,7 +86,7 @@
       </element>
     </define>
     <define name="technical-committee">
-      <element name="technical-committee">
+      <element name="committee">
         <optional>
           <attribute name="type"/>
         </optional>
@@ -96,6 +96,13 @@
   </include>
   <define name="csd-standard">
     <element name="csd-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

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_calconnect.rb

@@ -4,6 +4,7 @@ require "relaton_calconnect/cc_bibliography"
 require "relaton_calconnect/hit_collection"
 require "relaton_calconnect/hit"
 require "relaton_calconnect/scrapper"
+require "relaton_calconnect/technical_committee"
 require "relaton_calconnect/cc_bibliographic_item"
 require "relaton_calconnect/xml_parser"
 require "relaton_calconnect/hash_converter"

data/lib/relaton_calconnect/cc_bibliography.rb

@@ -64,9 +64,9 @@ module RelatonCalconnect
           return { ret: item } if !year
 
           item.date.select { |d| d.type == "published" }.each do |d|
-            return { ret: item } if year.to_i == d.on.year
+            return { ret: item } if year.to_i == d.on(:year)
 
-            missed_years << d.on.year
+            missed_years << d.on(:year)
           end
         end
         { years: missed_years }

data/lib/relaton_calconnect/hash_converter.rb

@@ -1,4 +1,15 @@
 module RelatonCalconnect
   class HashConverter < RelatonBib::HashConverter
+    class << self
+      # @param ret [Hash]
+      def editorialgroup_hash_to_bib(ret)
+        return unless ret[:editorialgroup]
+
+        technical_committee = array(ret[:editorialgroup]).map do |wg|
+          TechnicalCommittee.new RelatonBib::WorkGroup.new(wg)
+        end
+        ret[:editorialgroup] = RelatonBib::EditorialGroup.new technical_committee
+      end
+    end
   end
 end

data/lib/relaton_calconnect/technical_committee.rb

@@ -0,0 +1,8 @@
+module RelatonCalconnect
+  class TechnicalCommittee < RelatonBib::TechnicalCommittee
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.committee { |b| workgroup.to_xml b }
+    end
+  end
+end

data/lib/relaton_calconnect/version.rb

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

data/lib/relaton_calconnect/xml_parser.rb

@@ -7,6 +7,19 @@ module RelatonCalconnect
       def bib_item(item_hash)
         CcBibliographicItem.new item_hash
       end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonBib::EditorialGroup, nil]
+      def fetch_editorialgroup(ext)
+        return unless ext && (eg = ext.at "editorialgroup")
+
+        eg = eg.xpath("committee", "technical-committee").map do |tc|
+          wg = RelatonBib::WorkGroup.new(content: tc.text, number: tc[:number]&.to_i,
+                                         type: tc[:type])
+          TechnicalCommittee.new wg
+        end
+        RelatonBib::EditorialGroup.new eg if eg.any?
+      end
     end
   end
 end

data/relaton_calconnect.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday"
-  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-calconnect
 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
@@ -156,14 +156,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: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -198,6 +198,7 @@ files:
 - lib/relaton_calconnect/hit_collection.rb
 - lib/relaton_calconnect/processor.rb
 - lib/relaton_calconnect/scrapper.rb
+- lib/relaton_calconnect/technical_committee.rb
 - lib/relaton_calconnect/version.rb
 - lib/relaton_calconnect/xml_parser.rb
 - relaton_calconnect.gemspec