relaton-iho 1.5.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5287c92a9460b9824298f86fe7a8a921c6e95ec905af81c3972ccd89b39c435e
-  data.tar.gz: 89f4d59af4346061c1a7c964471f1c3989a850767e96a3b2f1b2949e88557a1a
+  metadata.gz: 61320ca932f5b001e0ee77ba3f8372f47955a9c066f80a63fa87b9b1d3cc4377
+  data.tar.gz: ed1e7270d08a2c8bbc18ca6452310a44a4ae09c24b813f16482f7998b1936f32
 SHA512:
-  metadata.gz: a7f9474e438600fc90653129f6bc7cd3fdf49f07fac96ca63771b8d1eeeda06635771e2dafeb0f1d4462efa09caaa197548cca3079f112334a58e87d29783468
-  data.tar.gz: 2999394cad48607762ffdc67456c0c14731315d9138b3b26e4d1f260bd464918d7b836f81d228c7881c100bb582fd5a2a3d2fde716f64d296b9fb7ec8e66bce4
+  metadata.gz: cd79eaa7e5d7dbcceca170fbff4d6859ccabd8059f43f4ff974e3ac5d9bde0f23269af77b7402783194a4f46a08237f711006b87cbc46ab570f778cc58c45850
+  data.tar.gz: 206d9a1d25fa364fdbfa578b75b9b2dc020bdb5f1bcb1fa6c53cddb7064f78f35b6ffbfc36198cd55b0a08cd63c97bdf1fadd0fca4a3f4499701566cf7e27cb7

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

@@ -119,11 +119,7 @@ hash = YAML.load_file 'spec/fixtures/iho.yaml'
 => {"id"=>"B-11",
 ...
 
-bib_hash = RelatonIho::HashConverter.hash_to_bib hash
-=> {:id=>"B-11",
-...
-
-RelatonIho::IhoBibliographicItem.new bib_hash
+RelatonIho::IhoBibliographicItem.from_hash hash
 => #<RelatonIho::IhoBibliographicItem:0x007fc322ef8548
 ...
 ----

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">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -1164,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_iho/hash_converter.rb

@@ -23,7 +23,7 @@ module RelatonIho
 
       # @param ret [Hash]
       def commentperiod_hash_to_bib(ret)
-        ret[:commentperiod] &&= CommentPeriond.new(ret[:commentperiod])
+        ret[:commentperiod] &&= CommentPeriond.new(**ret[:commentperiod])
       end
 
       # @param ret [Hash]

data/lib/relaton_iho/iho_bibliographic_item.rb

@@ -13,6 +13,13 @@ module RelatonIho
       super
     end
 
+    # @param hash [Hash]
+    # @return [RelatonIho::IhoBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonIho::HashConverter.hash_to_bib(hash)
+      new **item_hash
+    end
+
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [Boolean] :bibdata

data/lib/relaton_iho/iho_bibliography.rb

@@ -16,7 +16,7 @@ module RelatonIho
         return unless resp.code == "200"
 
         hash = HashConverter.hash_to_bib YAML.safe_load(resp.body, [Date])
-        item = IhoBibliographicItem.new hash
+        item = IhoBibliographicItem.new **hash
         warn "[relaton-iho] (\"#{text}\") found #{item.docidentifier.first.id}"
         item
       rescue SocketError, Errno::EINVAL, Errno::ECONNRESET, EOFError,

data/lib/relaton_iho/processor.rb

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

data/lib/relaton_iho/version.rb

@@ -1,3 +1,3 @@
 module RelatonIho
-  VERSION = "1.5.0".freeze
+  VERSION = "1.7.2".freeze
 end

data/lib/relaton_iho/xml_parser.rb

@@ -18,10 +18,10 @@ module RelatonIho
       # @param item_hash [Hash]
       # @return [RelatonIho::IhoBibliographicItem]
       def bib_item(item_hash)
-        IhoBibliographicItem.new item_hash
+        IhoBibliographicItem.new **item_hash
       end
 
-      # @param ext [Nokogiri::XML::Element]
+      # @param ext [Nokogiri::XML::Element, nil]
       # @return [RelatonIho::EditorialGroupCollection, nil]
       def fetch_editorialgroup(ext)
         return unless ext
@@ -35,7 +35,7 @@ module RelatonIho
         EditorialGroupCollection.new egs if egs.any?
       end
 
-      # @param ext [Nokogiri::XML::Element. nil]
+      # @param ihgrp [Nokogiri::XML::Element, nil]
       # @return [RelatonIho::Committee, RelatonIho::Commission,
       #   RelatonIho::Workgroup, nil]
       def iho_group(ihgrp)

data/relaton_iho.gemspec

@@ -22,15 +22,15 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   s.add_development_dependency "byebug"
-  s.add_development_dependency "debase"
+  # s.add_development_dependency "debase"
   s.add_development_dependency "equivalent-xml", "~> 0.6"
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "ruby-debug-ide"
+  # s.add_development_dependency "ruby-debug-ide"
   s.add_development_dependency "ruby-jing"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "vcr"
   s.add_development_dependency "webmock"
 
-  s.add_dependency "relaton-bib", "~> 1.5.0"
+  s.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !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
@@ -80,20 +66,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.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 description: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem
   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"

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,32 +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: |
-          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