relaton-ieee 1.7.0 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 446b15d222e45953544bb1c49b9811651c13246cfdac2c60c4bb8a761b86adcf
-  data.tar.gz: deadb07888412133d01574f35d17131f4fbebf8e53eae341e5384c85fce9afac
+  metadata.gz: 3c776b17899137d3858c7e0bd36014b085c4699d8bd827540c2b83462a4f6011
+  data.tar.gz: c1c70bb00cc61e17107b161dcfda3e3854efc1dc8778e7fa0ca3a714341d59b6
 SHA512:
-  metadata.gz: e685ed12ac545f7dc2da6f763e0bb49a5a933b1e853d79d433882e0d79e8bd9bb11317c7511743a9d0326c2c1c94ca4a289edef9eb50bef4f51077e0a59a2880
-  data.tar.gz: 6882a387ffed1d11ea5b3bb593691e1744a426365dde5548fe6e0aa15363cd6b112ee4b91e73dd50516ed0d7429ff3c9b5de55edfa08073fa613b17f12b6d4fc
+  metadata.gz: 28e3210a520f00460e3e8d820e62577ae0195bdd62e3d54493a617c50dcc0c5596a3b230c91c157d4102fc028f04370f5988c84d78f5244ec3934e22d848846d
+  data.tar.gz: e2e5cc4ec8205b318a51574fac212da2975a797fc7825734c900478837662d83d256f074d5bb9b4dcaf9f872bbf9e924f66addf200470564faff3d7d3f6d63e1

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/Gemfile

@@ -3,5 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_ieee.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"

data/README.adoc

@@ -153,11 +153,7 @@ hash = YAML.load_file 'spec/fixtures/ieee_528_2019.yaml'
  => {"id"=>"528-2019", "title"=>{
  ...
 
- bib_hash = RelatonIeee::HashConverter.hash_to_bib hash
- => {:id=>"528-2019", :title=>[{
- ...
-
- RelatonIeee::IeeeBibliographicItem.new bib_hash
+ RelatonIeee::IeeeBibliographicItem.from_hash hash
  => #<RelatonIeee::IeeeBibliographicItem:0x007fce940b3eb0
  ...
 ----

data/lib/relaton_ieee/hash_converter.rb

@@ -15,14 +15,14 @@ module RelatonIeee
       # @param item_hash [Hash]
       # @return [RelatonIeee::IeeeBibliographicItem]
       def bib_item(item_hash)
-        IeeeBibliographicItem.new item_hash
+        IeeeBibliographicItem.new **item_hash
       end
 
       # @param hash [Hash]
       def committee_hash_to_bib(hash)
         return unless hash[:committee]
 
-        hash[:committee] = hash[:committee].map { |c| Committee.new c }
+        hash[:committee] = hash[:committee].map { |c| Committee.new **c }
       end
     end
   end

data/lib/relaton_ieee/hit_collection.rb

@@ -15,7 +15,7 @@ module RelatonIeee
     # @param opts [Hash]
     def initialize(ref) # rubocop:disable Metrics/MethodLength
       super
-      code = ref.sub /^IEEE\s/, ""
+      code = ref.sub /^IEEE\s(Std\s)?/, ""
       search = CGI.escape({ data: { searchTerm: code } }.to_json)
       url = "#{DOMAIN}/bin/standards/search?data=#{search}"
       resp = Faraday.get url
@@ -23,7 +23,7 @@ module RelatonIeee
       json = JSON.parse resp_json["message"]
       @array = json["response"]["searchResults"]["resultsMapList"]
         .reduce([]) do |s, hit|
-          /^(?:\w+\s)?(?<id>[^-\/]+)(-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
+          /^(?:\w+\s)?(?<id>[A-Z\d\.]+)(-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
           next s unless id && code =~ %r{^#{id}}
 
           s << Hit.new(hit["record"].merge(code: id, year: year.to_i), self)

data/lib/relaton_ieee/ieee_bibliographic_item.rb

@@ -9,6 +9,13 @@ module RelatonIeee
       super
     end
 
+    # @param hash [Hash]
+    # @return [RelatonIeee::IeeeBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonIeee::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_ieee/processor.rb

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

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.7.0".freeze
+  VERSION = "1.7.5".freeze
 end

data/lib/relaton_ieee/xml_parser.rb

@@ -22,7 +22,7 @@ module RelatonIeee
       # @param item_hash [Hash]
       # @return [RelatonIeee::IeeeBibliographicItem]
       def bib_item(item_hash)
-        IeeeBibliographicItem.new item_hash
+        IeeeBibliographicItem.new **item_hash
       end
     end
   end

data/relaton_ieee.gemspec

@@ -31,17 +31,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "debase"
+  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  # spec.add_development_dependency "rake", "~> 13.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", "~> 1.0.0"
+  spec.add_dependency "faraday", "~> 1.1"
   spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2021-04-19 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
@@ -52,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
@@ -158,9 +116,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,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,38 +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: |
-          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