relaton-calconnect 1.5.pre → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dca0aeb725696f4ef2d17c143b6b6255d9a47d8c05a082916f783be1bf88f4e
-  data.tar.gz: 27d64a1311420b5d770f753eccd8c58fc5feaf20b89b1d3a561a58e43fcc964f
+  metadata.gz: 857927d12dd48d1a82d159cc30be480c9b1339861e8301105239fc1e21ed3958
+  data.tar.gz: edff3c271819dcb5f5edbddfdeaac31e52ee5ccf35fe3939583e80d0183f805c
 SHA512:
-  metadata.gz: 71c362c5d1645a5debb3bc59a64c495fc55bd9fddab3be87914aef4db96e472cb5ccc45d0721297f8b16ded6ced2daf2084bb67c45d84dfd36322e8d1b47a8d1
-  data.tar.gz: f57d905480e90042445a6d5da7a91f5fa58d9de204586cb4b07b180e21b2468d83afeed0fe52fc7df93703e6a1bb84fc6635c4e99f2f738b8f0ff8b09024193c
+  metadata.gz: 896cbcaaa97d35e0e476c64ac3767eb4a6eeed486293ac0e150d153d16d454b9064f6aa04650f0b4e7e12b0bad6d2db74d0848b653db82f6a8f2a5ba939278fc
+  data.tar.gz: b6cdf91c3c963deea83ef1a3c8833b4beffac7bd726d6350e7d0881b613a2f9b0619da89cc140b90d2b85860a5b07e0fa32e0d9aedcf731915ec0a56c8716744

data/.github/workflows/rake.yml

@@ -0,0 +1,46 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
+      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
+        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake

data/README.adoc

@@ -101,11 +101,7 @@ hash = YAML.load_file 'spec/fixtures/cc_dir_10005_2019.yml'
 => {"id"=>"CC/DIR10005-2019",
 ...
 
-bib_hash = RelatonCalconnect::HashConverter.hash_to_bib hash
-=> {:id=>"CC/DIR10005-2019",
-...
-
-RelatonCalconnect::CcBibliographicItem.new bib_hash
+RelatonCalconnect::CcBibliographicItem.from_hash hash
 => #<RelatonCalconnect::CcBibliographicItem:0x007fc5a0109f88
 ...
 ----

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

@@ -4,5 +4,12 @@ module RelatonCalconnect
       directive guide specification standard report administrative amendment
       technical\ corrigendum advisory
     ].freeze
+
+    # @param hash [Hash]
+    # @return [RelatonIsoBib::CcBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonCalconnect::HashConverter.hash_to_bib(hash)
+      new **item_hash
+    end
   end
 end

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/processor.rb

@@ -28,8 +28,7 @@ module RelatonCalconnect
     # @param hash [Hash]
     # @return [RelatonIsoBib::CcBibliographicItem]
     def hash_to_bib(hash)
-      item_hash = ::RelatonCalconnect::HashConverter.hash_to_bib(hash)
-      ::RelatonCalconnect::CcBibliographicItem.new item_hash
+      ::RelatonCalconnect::CcBibliographicItem.from_hash hash
     end
 
     # Returns hash of XML grammar

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.5.pre".freeze
+  VERSION = "1.7.2".freeze
 end

data/lib/relaton_calconnect/xml_parser.rb

@@ -5,7 +5,20 @@ module RelatonCalconnect
       # @param item_hash [Hash]
       # @return [RelatonIsoBib::IsoBibliographicItem]
       def bib_item(item_hash)
-        CcBibliographicItem.new 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

data/relaton_calconnect.gemspec

@@ -26,16 +26,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_development_dependency "debase"
+  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "ruby-debug-ide"
+  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday"
-  spec.add_dependency "relaton-bib", "~> 1.5.pre"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.5.pre
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: debase
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +128,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: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -172,9 +144,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -198,6 +168,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
@@ -216,9 +187,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:

data/.github/workflows/macos.yml

@@ -1,32 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,33 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          unset JAVA_TOOL_OPTIONS
-          bundle exec rake

data/.github/workflows/windows.yml

@@ -1,35 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle update
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake