relaton-bib 1.14.7 → 1.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bb386ccf7f35f6ce3d67f166b9bf3a064e86fabba2e9c4db568c4bfea3381f6
-  data.tar.gz: e754cf74d0fd518b12ff5f91c3f1e0bfef94ed09ef0c6f989e3b509a8973cd9d
+  metadata.gz: 1273f9228474261e4a5a9364d279c8fa3206f513fa20abf9c6dc25eaf141e00a
+  data.tar.gz: ec2ba1a41d35c28b90a188ade205ce7b450fe391cea19648f4d09ebee5e5ca0c
 SHA512:
-  metadata.gz: cdbc44992b546db45cb397f92ea906166a0ba9f079b0e9daf40e7603e150756c2e852c1dc57535aa539193fd1cd5545638f1fd634bb837eaa2d1a9b6e68e3b39
-  data.tar.gz: d7cc462c834c3d018377787e3f46bb017fb01b79ce90a85dcf97f20484d0ec47fcd12dfa4ecf49d9c34571e7198e3173024606cf9fdf4d1155ba7bb0542b723d
+  metadata.gz: 742952cf22934e1569bdc0adedd75edc306e45176709211b7fcdf82752c0e5143f625d1d035d4d21c003b73c4b2d2666682f739cab038fcb482dfff0131e015c
+  data.tar.gz: 604ce84dc9d51c2496280ddd04710d3403e8e6d83c914b4a6955d3c2aa2fdba65530d7255a8ab964dc328fed21965714c0deeb9384b0564f487972e9a92d333a

data/.github/workflows/integration-tests.yml

@@ -0,0 +1,54 @@
+name: integration-tests
+
+on:
+  push:
+    branches: [ master, main ]
+  pull_request:
+
+jobs:
+  tests:
+    name: Integration test ${{ matrix.repo }}
+    runs-on: ubuntu-latest
+
+    concurrency:
+      group: '${{ github.workflow }}-${{ github.job }}-${{ matrix.repo }}-${{ github.head_ref || github.ref_name }}'
+      cancel-in-progress: true
+
+    continue-on-error: true
+    strategy:
+      matrix:
+        repo: [ relaton-render ]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.1'
+        bundler-cache: true
+
+    - uses: actions/checkout@v3
+      with:
+        submodules: recursive
+        repository: relaton/${{ matrix.repo }}
+        path: ${{ matrix.repo }}
+        fetch-depth: 0
+
+    - if: github.event_name == 'pull_request'
+      run: |
+        if [ `git rev-parse --verify "${GITHUB_HEAD_REF}" 2>/dev/null` ]
+        then
+          git checkout "${GITHUB_HEAD_REF}"
+        fi
+      working-directory: ${{ matrix.repo }}
+
+    - run: |
+        gem_name=$(echo ${GITHUB_REPOSITORY} | cut -d "/" -f 2)
+        bundle remove ${gem_name} || true
+        bundle add ${gem_name} --path ..
+      working-directory: ${{ matrix.repo }}
+
+    - run: bundle exec rake
+      working-directory: ${{ matrix.repo }}

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/grammars/versions.json

@@ -1,11 +1,11 @@
 {
-"relaton-models": "v1.2.1",
-"basicdoc-models": "v1.0.1",
+"relaton-models": "v1.2.3",
+"basicdoc-models": "v1.0.2",
 "metanorma-requirements-models": "v1.0.0",
 "relaton-model-ieee": "v1.0.0",
 "relaton-model-iso": "v1.0.0",
 "relaton-model-iec": "v1.0.0",
-"relaton-model-bsi": "v1.0.0",
+"relaton-model-bsi": "v1.0.2",
 "relaton-model-gb": "v1.0.0",
 "relaton-model-mpfa": "v1.0.0",
 "relaton-model-bipm": "v1.0.0",
@@ -27,5 +27,6 @@
 "relaton-model-iana": "v1.0.0",
 "relaton-model-omg": "v1.0.0",
 "relaton-model-oasis": "v1.0.0",
-"date": "2022-12-01T15:03:50Z"
+"relaton-model-jis": "v0.0.1",
+"date": "2023-03-28T19:11:37Z"
 }

data/lib/relaton_bib/document_identifier.rb

@@ -28,17 +28,17 @@ module RelatonBib
     def remove_part
       case @type
       when "Chinese Standard" then @id.sub!(/\.\d+/, "")
-      when "ISO", "IEC", "BSI" then @id.sub!(/-[^:]+/, "")
       when "URN" then remove_urn_part
+      else @id.sub!(/-[^:]+/, "")
       end
     end
 
     def remove_date
       case @type
       when "Chinese Standard" then @id.sub!(/-[12]\d\d\d/, "")
-      when "ISO", "IEC", "BSI" then @id.sub!(/:[12]\d\d\d/, "")
       when "URN"
         @id.sub!(/^(urn:iec:std:[^:]+:[^:]+:)[^:]*/, '\1')
+      else @id.sub!(/:[12]\d\d\d/, "")
       end
     end
 

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.14.7".freeze
+  VERSION = "1.14.9".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -363,9 +363,11 @@ module RelatonBib
       #
       # @param [Nokogiri::XML::Element] org XML element
       #
-      # @return [RelatonBib::Organization] organization
+      # @return [RelatonBib::Organization, nil] organization
       #
       def get_org(org) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        return unless org
+
         names = org.xpath("name").map do |n|
           { content: n.text, language: n[:language], script: n[:script] }
         end

data/relaton-bib.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bibtex-ruby"
   spec.add_dependency "htmlentities"
   spec.add_dependency "iso639"
-  spec.add_dependency "nokogiri", "~> 1.13.0"
+  spec.add_dependency "nokogiri", "~> 1.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.14.7
+  version: 1.14.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 description: 'RelatonBib: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -213,6 +213,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/integration-tests.yml"
 - ".github/workflows/rake.yml"
 - ".github/workflows/release.yml"
 - ".gitignore"