relaton-bib 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ebdb538f6fb256157a23a01994bb4654df470e7d9abe245d8de7ff88d5fecf
-  data.tar.gz: 56e5146c1d0a6f0c02c12d17d30a3041bb3eabff1b54e0c6f0478f7c7a4743ac
+  metadata.gz: b3035696b10da4bcbf4adf75f8eca150fe15ffa9a729b21f721307d6d4e03c63
+  data.tar.gz: 9b43ee47cd051f7cfbff05e14f8a31eaaf0dbce1721e105356a6c215dc22ab40
 SHA512:
-  metadata.gz: 692cce83ac3ce023196a5dd6a06ed30a07cfb442407c02249e948866932db7d0c81a49a7aa8b34afa05c995e9cbcbccdbb7141bd10e699657b545ec3d906918a
-  data.tar.gz: c823d2926c8c50810c2989de01f06afbd47e104ff458269d8c17db79e2281550d499d5f267fa1324924005a15de86111b52c2b3cc62142140d09fb9526b14025
+  metadata.gz: e12995f779d549a6e014815b6f4249d7e0528282192c5ef7da6ab40c1bc624278d3ead2f3fedb01bba09d60576424beead0a01e21a6f7e8209362e175e458a2e
+  data.tar.gz: 7a7b94d82f2dc38d772dc09da89eacc80c5860e4748b2f240a94dd8f7b7d7a7f949ac4508cdfbfa20f81fb8e1b63c5a61ad959258601717a3aaf0a5957be22d9

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/lib/relaton_bib/bibliographic_item.rb

@@ -197,23 +197,23 @@ module RelatonBib
       @title = TypedTitleStringCollection.new(args[:title])
 
       @date = (args[:date] || []).map do |d|
-        d.is_a?(Hash) ? BibliographicDate.new(d) : d
+        d.is_a?(Hash) ? BibliographicDate.new(**d) : d
       end
 
       @contributor = (args[:contributor] || []).map do |c|
         if c.is_a? Hash
-          e = c[:entity].is_a?(Hash) ? Organization.new(c[:entity]) : c[:entity]
+          e = c[:entity].is_a?(Hash) ? Organization.new(**c[:entity]) : c[:entity]
           ContributionInfo.new(entity: e, role: c[:role])
         else c
         end
       end
 
       @abstract = (args[:abstract] || []).map do |a|
-        a.is_a?(Hash) ? FormattedString.new(a) : a
+        a.is_a?(Hash) ? FormattedString.new(**a) : a
       end
 
       @copyright = args.fetch(:copyright, []).map do |c|
-        c.is_a?(Hash) ? CopyrightAssociation.new(c) : c
+        c.is_a?(Hash) ? CopyrightAssociation.new(**c) : c
       end
 
       @docidentifier  = args[:docid] || []
@@ -229,7 +229,7 @@ module RelatonBib
       @status         = args[:docstatus]
       @relation       = DocRelationCollection.new(args[:relation] || [])
       @link           = args.fetch(:link, []).map do |s|
-        if s.is_a?(Hash) then TypedUri.new(s)
+        if s.is_a?(Hash) then TypedUri.new(**s)
         elsif s.is_a?(String) then TypedUri.new(content: s)
         else s
         end

data/lib/relaton_bib/bibtex_parser.rb

@@ -1,4 +1,8 @@
-require "bibtex"
+if RUBY_VERSION < "3"
+  require "bibtex"
+else
+  warn "[relaton-bib] WARNING: BibTex isn't supported with Ruby 3+"
+end
 require "iso639"
 
 module RelatonBib
@@ -101,14 +105,14 @@ module RelatonBib
         if bibtex["organization"]
           contributor << {
             entity: { name: bibtex.organization.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }]
+            role: [{ type: "distributor", description: ["sponsor"] }],
           }
         end
 
         if bibtex["school"]
           contributor << {
             entity: { name: bibtex.school.to_s },
-            role: [{ type: "distributor", description: ["sponsor"] }]
+            role: [{ type: "distributor", description: ["sponsor"] }],
           }
         end
         contributor

data/lib/relaton_bib/copyright_association.rb

@@ -30,7 +30,7 @@ module RelatonBib
       end
 
       @owner = owner.map do |o|
-        o.is_a?(Hash) ? ContributionInfo.new(entity: Organization.new(o)) : o
+        o.is_a?(Hash) ? ContributionInfo.new(entity: Organization.new(**o)) : o
       end
 
       @from  = Date.strptime(from.to_s, "%Y") if from.to_s.match? /\d{4}/

data/lib/relaton_bib/document_relation_collection.rb

@@ -18,7 +18,7 @@ module RelatonBib
     #                   RelatonBib::SourceLocalityStack>] :source_locality
     # @option relation [RelatonBib::BibliographicItem, NillClass] :bibitem (nil)
     def initialize(relation)
-      @array = relation.map { |r| r.is_a?(Hash) ? DocumentRelation.new(r) : r }
+      @array = relation.map { |r| r.is_a?(Hash) ? DocumentRelation.new(**r) : r }
     end
 
     # @todo We don't have replace type anymore. Suppose we should update this

data/lib/relaton_bib/document_status.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module RelatonBib
   # Document status.
   class DocumentStatus
@@ -54,7 +55,7 @@ module RelatonBib
     # @return [RelatonBib::DocumentStatus::Stage]
     def stage_new(stg)
       if stg.is_a?(Stage) then stg
-      elsif stg.is_a?(Hash) then Stage.new(stg)
+      elsif stg.is_a?(Hash) then Stage.new(**stg)
       elsif stg.is_a?(String) then Stage.new(value: stg)
       end
     end

data/lib/relaton_bib/hash_converter.rb

@@ -97,7 +97,7 @@ module RelatonBib
         return unless ret[:place]
 
         ret[:place] = array(ret[:place]).map do |pl|
-          pl.is_a?(String) ? Place.new(name: pl) : Place.new(pl)
+          pl.is_a?(String) ? Place.new(name: pl) : Place.new(**pl)
         end
       end
 
@@ -146,7 +146,7 @@ module RelatonBib
         ret[:biblionote] = array(ret[:biblionote])
           .reduce(BiblioNoteCollection.new([])) do |mem, n|
           mem << if n.is_a?(String) then BiblioNote.new content: n
-                 else BiblioNote.new(n)
+                 else BiblioNote.new(**n)
                  end
         end
       end
@@ -247,10 +247,10 @@ module RelatonBib
                       script: d[:script], format: d[:format] }
                   else { content: d }
                   end
-            FormattedString.new cnt
+            FormattedString.new **cnt
           end
           Affiliation.new(
-            organization: Organization.new(org_hash_to_bib(a[:organization])),
+            organization: Organization.new(**org_hash_to_bib(a[:organization])),
             description: a[:description]
           )
         end
@@ -288,7 +288,7 @@ module RelatonBib
         ret[:relation] = array(ret[:relation])
         ret[:relation]&.each do |r|
           if r[:description]
-            r[:description] = FormattedString.new r[:description]
+            r[:description] = FormattedString.new **r[:description]
           end
           relation_bibitem_hash_to_bib(r)
           relation_locality_hash_to_bib(r)
@@ -309,7 +309,7 @@ module RelatonBib
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        BibliographicItem.new item_hash
+        BibliographicItem.new **item_hash
       end
 
       # @param rel [Hash] relation
@@ -356,26 +356,26 @@ module RelatonBib
           end
           s[:abbreviation] &&
             s[:abbreviation] = localizedstring(s[:abbreviation])
-          Series.new(s)
+          Series.new(**s)
         end
       end
 
       # @param title [Hash]
       # @return [RelatonBib::TypedTitleString]
       def typed_title_strig(title)
-        TypedTitleString.new title
+        TypedTitleString.new **title
       end
 
       # @param ret [Hash]
       def medium_hash_to_bib(ret)
-        ret[:medium] = Medium.new(ret[:medium]) if ret[:medium]
+        ret[:medium] = Medium.new(**ret[:medium]) if ret[:medium]
       end
 
       # @param ret [Hash]
       def classification_hash_to_bib(ret)
         if ret[:classification]
           ret[:classification] = array(ret[:classification]).map do |cls|
-            Classification.new cls
+            Classification.new **cls
           end
         end
       end
@@ -409,7 +409,7 @@ module RelatonBib
         return unless ret[:editorialgroup]
 
         technical_committee = array(ret[:editorialgroup]).map do |wg|
-          TechnicalCommittee.new WorkGroup.new(wg)
+          TechnicalCommittee.new WorkGroup.new(**wg)
         end
         ret[:editorialgroup] = EditorialGroup.new technical_committee
       end
@@ -418,7 +418,7 @@ module RelatonBib
       def ics_hash_to_bib(ret)
         return unless ret[:ics]
 
-        ret[:ics] = array(ret[:ics]).map { |ics| ICS.new ics }
+        ret[:ics] = array(ret[:ics]).map { |ics| ICS.new **ics }
       end
 
       # @param ret [Hash]
@@ -427,7 +427,7 @@ module RelatonBib
 
         sids = array(ret[:structuredidentifier]).map do |si|
           si[:agency] = array si[:agency]
-          StructuredIdentifier.new si
+          StructuredIdentifier.new **si
         end
         ret[:structuredidentifier] = StructuredIdentifierCollection.new sids
       end
@@ -485,7 +485,7 @@ module RelatonBib
       # @return [RelatonBib::FormattedRef]
       def formattedref(frf)
         if frf.is_a?(Hash)
-          RelatonBib::FormattedRef.new(frf)
+          RelatonBib::FormattedRef.new(**frf)
         else
           RelatonBib::FormattedRef.new(content: frf)
         end

data/lib/relaton_bib/organization.rb

@@ -82,7 +82,7 @@ module RelatonBib
       @subdivision  = (args[:subdivision] || []).map do |sd|
         localized_string sd
       end
-      @identifier   = args.fetch(:identifier, [])
+      @identifier = args.fetch(:identifier, [])
     end
 
     # @param opts [Hash]

data/lib/relaton_bib/typed_title_string.rb

@@ -8,7 +8,7 @@ module RelatonBib
     # @param title [Array<RelatonBib::TypedTitleString, Hash>]
     def initialize(title = [])
       @array = (title || []).map do |t|
-        t.is_a?(Hash) ? TypedTitleString.new(t) : t
+        t.is_a?(Hash) ? TypedTitleString.new(**t) : t
       end
     end
 
@@ -96,12 +96,12 @@ module RelatonBib
         fsargs = args.select do |k, _v|
           %i[content language script format].include? k
         end
-        @title = FormattedString.new(fsargs)
+        @title = FormattedString.new(**fsargs)
       end
     end
 
     # @param title [String]
-    # @return [Array<self>]
+    # @return [TypedTitleStringCollection]
     def self.from_string(title, lang = nil, script = nil)
       types = %w[title-intro title-main title-part]
       ttls = split_title(title)

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.7.1".freeze
+  VERSION = "1.7.2".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -326,7 +326,7 @@ module RelatonBib
 
       # @param item [Nokogiri::XML::Element]
       # @return [Array<RelatonBib::CopyrightAssociation>]
-      def fetch_copyright(item)
+      def fetch_copyright(item) # rubocop:disable Metrics/AbcSize
         item.xpath("./copyright").map do |cp|
           owner = cp.xpath("owner").map do |o|
             ContributionInfo.new entity: get_org(o.at("organization"))
@@ -376,7 +376,7 @@ module RelatonBib
       # @param item_hash [Hash]
       # @return [RelatonBib::BibliographicItem]
       def bib_item(item_hash)
-        BibliographicItem.new item_hash
+        BibliographicItem.new **item_hash
       end
 
       # @param rel [Nokogiri::XML::Element]
@@ -453,7 +453,7 @@ module RelatonBib
 
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonBib::StructuredIdentifierCollection]
-      def fetch_structuredidentifier(ext) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      def fetch_structuredidentifier(ext) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         return unless ext
 
         sids = ext.xpath("structuredidentifier").map do |si|

data/relaton-bib.gemspec

@@ -24,13 +24,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_development_dependency "byebug"
-  spec.add_development_dependency "debase"
+  spec.add_development_dependency "debase" if RUBY_VERSION < "3"
   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" if RUBY_VERSION < "3"
   spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov" if RUBY_VERSION < "3"
 
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -185,9 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".hound.yml"

data/.github/workflows/macos.yml

@@ -1,40 +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: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - 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: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,39 +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: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - 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,41 +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: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - 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