relaton-ieee 1.7.0 → 1.7.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 446b15d222e45953544bb1c49b9811651c13246cfdac2c60c4bb8a761b86adcf
4
- data.tar.gz: deadb07888412133d01574f35d17131f4fbebf8e53eae341e5384c85fce9afac
3
+ metadata.gz: 3c776b17899137d3858c7e0bd36014b085c4699d8bd827540c2b83462a4f6011
4
+ data.tar.gz: c1c70bb00cc61e17107b161dcfda3e3854efc1dc8778e7fa0ca3a714341d59b6
5
5
  SHA512:
6
- metadata.gz: e685ed12ac545f7dc2da6f763e0bb49a5a933b1e853d79d433882e0d79e8bd9bb11317c7511743a9d0326c2c1c94ca4a289edef9eb50bef4f51077e0a59a2880
7
- data.tar.gz: 6882a387ffed1d11ea5b3bb593691e1744a426365dde5548fe6e0aa15363cd6b112ee4b91e73dd50516ed0d7429ff3c9b5de55edfa08073fa613b17f12b6d4fc
6
+ metadata.gz: 28e3210a520f00460e3e8d820e62577ae0195bdd62e3d54493a617c50dcc0c5596a3b230c91c157d4102fc028f04370f5988c84d78f5244ec3934e22d848846d
7
+ data.tar.gz: e2e5cc4ec8205b318a51574fac212da2975a797fc7825734c900478837662d83d256f074d5bb9b4dcaf9f872bbf9e924f66addf200470564faff3d7d3f6d63e1
@@ -0,0 +1,46 @@
1
+ # Auto-generated by Cimas: Do not edit it manually!
2
+ # See https://github.com/metanorma/cimas
3
+ name: rake
4
+
5
+ on:
6
+ push:
7
+ branches: [ master, main ]
8
+ tags: [ v* ]
9
+ pull_request:
10
+
11
+ jobs:
12
+ rake:
13
+ name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
14
+ runs-on: ${{ matrix.os }}
15
+ continue-on-error: ${{ matrix.experimental }}
16
+ strategy:
17
+ fail-fast: false
18
+ matrix:
19
+ ruby: [ '2.7', '2.6', '2.5', '2.4' ]
20
+ os: [ ubuntu-latest, windows-latest, macos-latest ]
21
+ experimental: [ false ]
22
+ include:
23
+ - ruby: '3.0'
24
+ os: 'ubuntu-latest'
25
+ experimental: true
26
+ - ruby: '3.0'
27
+ os: 'windows-latest'
28
+ experimental: true
29
+ - ruby: '3.0'
30
+ os: 'macos-latest'
31
+ experimental: true
32
+ steps:
33
+ - uses: actions/checkout@v2
34
+ with:
35
+ submodules: true
36
+
37
+ # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
38
+ - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
39
+ run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
40
+
41
+ - uses: ruby/setup-ruby@v1
42
+ with:
43
+ ruby-version: ${{ matrix.ruby }}
44
+ bundler-cache: true
45
+
46
+ - run: bundle exec rake
data/Gemfile CHANGED
@@ -3,5 +3,5 @@ source "https://rubygems.org"
3
3
  # Specify your gem's dependencies in relaton_ieee.gemspec
4
4
  gemspec
5
5
 
6
- gem "rake", "~> 12.0"
6
+ gem "rake", "~> 13.0"
7
7
  gem "rspec", "~> 3.0"
data/README.adoc CHANGED
@@ -153,11 +153,7 @@ hash = YAML.load_file 'spec/fixtures/ieee_528_2019.yaml'
153
153
  => {"id"=>"528-2019", "title"=>{
154
154
  ...
155
155
 
156
- bib_hash = RelatonIeee::HashConverter.hash_to_bib hash
157
- => {:id=>"528-2019", :title=>[{
158
- ...
159
-
160
- RelatonIeee::IeeeBibliographicItem.new bib_hash
156
+ RelatonIeee::IeeeBibliographicItem.from_hash hash
161
157
  => #<RelatonIeee::IeeeBibliographicItem:0x007fce940b3eb0
162
158
  ...
163
159
  ----
@@ -15,14 +15,14 @@ module RelatonIeee
15
15
  # @param item_hash [Hash]
16
16
  # @return [RelatonIeee::IeeeBibliographicItem]
17
17
  def bib_item(item_hash)
18
- IeeeBibliographicItem.new item_hash
18
+ IeeeBibliographicItem.new **item_hash
19
19
  end
20
20
 
21
21
  # @param hash [Hash]
22
22
  def committee_hash_to_bib(hash)
23
23
  return unless hash[:committee]
24
24
 
25
- hash[:committee] = hash[:committee].map { |c| Committee.new c }
25
+ hash[:committee] = hash[:committee].map { |c| Committee.new **c }
26
26
  end
27
27
  end
28
28
  end
@@ -15,7 +15,7 @@ module RelatonIeee
15
15
  # @param opts [Hash]
16
16
  def initialize(ref) # rubocop:disable Metrics/MethodLength
17
17
  super
18
- code = ref.sub /^IEEE\s/, ""
18
+ code = ref.sub /^IEEE\s(Std\s)?/, ""
19
19
  search = CGI.escape({ data: { searchTerm: code } }.to_json)
20
20
  url = "#{DOMAIN}/bin/standards/search?data=#{search}"
21
21
  resp = Faraday.get url
@@ -23,7 +23,7 @@ module RelatonIeee
23
23
  json = JSON.parse resp_json["message"]
24
24
  @array = json["response"]["searchResults"]["resultsMapList"]
25
25
  .reduce([]) do |s, hit|
26
- /^(?:\w+\s)?(?<id>[^-\/]+)(-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
26
+ /^(?:\w+\s)?(?<id>[A-Z\d\.]+)(-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
27
27
  next s unless id && code =~ %r{^#{id}}
28
28
 
29
29
  s << Hit.new(hit["record"].merge(code: id, year: year.to_i), self)
@@ -9,6 +9,13 @@ module RelatonIeee
9
9
  super
10
10
  end
11
11
 
12
+ # @param hash [Hash]
13
+ # @return [RelatonIeee::IeeeBibliographicItem]
14
+ def self.from_hash(hash)
15
+ item_hash = ::RelatonIeee::HashConverter.hash_to_bib(hash)
16
+ new **item_hash
17
+ end
18
+
12
19
  # @param opts [Hash]
13
20
  # @option opts [Nokogiri::XML::Builder] :builder XML builder
14
21
  # @option opts [Boolean] :bibdata
@@ -28,8 +28,7 @@ module RelatonIeee
28
28
  # @param hash [Hash]
29
29
  # @return [RelatonIeee::IeeeBibliographicItem]
30
30
  def hash_to_bib(hash)
31
- item_hash = ::RelatonIeee::HashConverter.hash_to_bib(hash)
32
- ::RelatonIeee::IeeeBibliographicItem.new item_hash
31
+ ::RelatonIeee::IeeeBibliographicItem.new hash
33
32
  end
34
33
 
35
34
  # Returns hash of XML grammar
@@ -1,3 +1,3 @@
1
1
  module RelatonIeee
2
- VERSION = "1.7.0".freeze
2
+ VERSION = "1.7.5".freeze
3
3
  end
@@ -22,7 +22,7 @@ module RelatonIeee
22
22
  # @param item_hash [Hash]
23
23
  # @return [RelatonIeee::IeeeBibliographicItem]
24
24
  def bib_item(item_hash)
25
- IeeeBibliographicItem.new item_hash
25
+ IeeeBibliographicItem.new **item_hash
26
26
  end
27
27
  end
28
28
  end
data/relaton_ieee.gemspec CHANGED
@@ -31,17 +31,17 @@ Gem::Specification.new do |spec|
31
31
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
32
32
  spec.require_paths = ["lib"]
33
33
 
34
- spec.add_development_dependency "debase"
34
+ # spec.add_development_dependency "debase"
35
35
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
36
36
  spec.add_development_dependency "pry-byebug"
37
- spec.add_development_dependency "rake", "~> 10.0"
37
+ # spec.add_development_dependency "rake", "~> 13.0"
38
38
  # spec.add_development_dependency "rspec", "~> 3.0"
39
- spec.add_development_dependency "ruby-debug-ide"
39
+ # spec.add_development_dependency "ruby-debug-ide"
40
40
  # spec.add_development_dependency "ruby-jing"
41
41
  spec.add_development_dependency "simplecov"
42
42
  spec.add_development_dependency "vcr"
43
43
  spec.add_development_dependency "webmock"
44
44
 
45
- spec.add_dependency "faraday", "~> 1.0.0"
45
+ spec.add_dependency "faraday", "~> 1.1"
46
46
  spec.add_dependency "relaton-bib", "~> 1.7.0"
47
47
  end
metadata CHANGED
@@ -1,29 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-ieee
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.0
4
+ version: 1.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-11-27 00:00:00.000000000 Z
11
+ date: 2021-04-19 00:00:00.000000000 Z
12
12
  dependencies:
13
- - !ruby/object:Gem::Dependency
14
- name: debase
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ">="
18
- - !ruby/object:Gem::Version
19
- version: '0'
20
- type: :development
21
- prerelease: false
22
- version_requirements: !ruby/object:Gem::Requirement
23
- requirements:
24
- - - ">="
25
- - !ruby/object:Gem::Version
26
- version: '0'
27
13
  - !ruby/object:Gem::Dependency
28
14
  name: equivalent-xml
29
15
  requirement: !ruby/object:Gem::Requirement
@@ -52,34 +38,6 @@ dependencies:
52
38
  - - ">="
53
39
  - !ruby/object:Gem::Version
54
40
  version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: rake
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: '10.0'
62
- type: :development
63
- prerelease: false
64
- version_requirements: !ruby/object:Gem::Requirement
65
- requirements:
66
- - - "~>"
67
- - !ruby/object:Gem::Version
68
- version: '10.0'
69
- - !ruby/object:Gem::Dependency
70
- name: ruby-debug-ide
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
74
- - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :development
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: '0'
83
41
  - !ruby/object:Gem::Dependency
84
42
  name: simplecov
85
43
  requirement: !ruby/object:Gem::Requirement
@@ -128,14 +86,14 @@ dependencies:
128
86
  requirements:
129
87
  - - "~>"
130
88
  - !ruby/object:Gem::Version
131
- version: 1.0.0
89
+ version: '1.1'
132
90
  type: :runtime
133
91
  prerelease: false
134
92
  version_requirements: !ruby/object:Gem::Requirement
135
93
  requirements:
136
94
  - - "~>"
137
95
  - !ruby/object:Gem::Version
138
- version: 1.0.0
96
+ version: '1.1'
139
97
  - !ruby/object:Gem::Dependency
140
98
  name: relaton-bib
141
99
  requirement: !ruby/object:Gem::Requirement
@@ -158,9 +116,7 @@ executables: []
158
116
  extensions: []
159
117
  extra_rdoc_files: []
160
118
  files:
161
- - ".github/workflows/macos.yml"
162
- - ".github/workflows/ubuntu.yml"
163
- - ".github/workflows/windows.yml"
119
+ - ".github/workflows/rake.yml"
164
120
  - ".gitignore"
165
121
  - ".rspec"
166
122
  - ".rubocop.yml"
@@ -1,40 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: macos
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- branches: [ '**' ]
10
-
11
- jobs:
12
- test-macos:
13
- name: Test on Ruby ${{ matrix.ruby }} macOS
14
- runs-on: macos-latest
15
- strategy:
16
- fail-fast: false
17
- matrix:
18
- ruby: [ '2.6', '2.5', '2.4' ]
19
- steps:
20
- - uses: actions/checkout@master
21
- - name: Checkout submodules
22
- shell: bash
23
- run: |
24
- auth_header="$(git config --local --get http.https://github.com/.extraheader)"
25
- git submodule sync --recursive
26
- git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
27
- - name: Use Ruby
28
- uses: actions/setup-ruby@v1
29
- with:
30
- ruby-version: ${{ matrix.ruby }}
31
- architecture: 'x64'
32
- - name: Update gems
33
- run: |
34
- sudo gem install bundler --force
35
- ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
36
- ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
37
- bundle install --jobs 4 --retry 3
38
- - name: Run specs
39
- run: |
40
- bundle exec rake
@@ -1,38 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: ubuntu
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- branches: [ '**' ]
10
-
11
- jobs:
12
- test-linux:
13
- name: Test on Ruby ${{ matrix.ruby }} Ubuntu
14
- runs-on: ubuntu-latest
15
- strategy:
16
- fail-fast: false
17
- matrix:
18
- ruby: [ '2.6', '2.5', '2.4' ]
19
- steps:
20
- - uses: actions/checkout@master
21
- - name: Checkout submodules
22
- shell: bash
23
- run: |
24
- auth_header="$(git config --local --get http.https://github.com/.extraheader)"
25
- git submodule sync --recursive
26
- git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
27
- - name: Use Ruby
28
- uses: actions/setup-ruby@v1
29
- with:
30
- ruby-version: ${{ matrix.ruby }}
31
- architecture: 'x64'
32
- - name: Update gems
33
- run: |
34
- gem install bundler
35
- bundle install --jobs 4 --retry 3
36
- - name: Run specs
37
- run: |
38
- bundle exec rake
@@ -1,41 +0,0 @@
1
- # Auto-generated by Cimas: Do not edit it manually!
2
- # See https://github.com/metanorma/cimas
3
- name: windows
4
-
5
- on:
6
- push:
7
- branches: [ master ]
8
- pull_request:
9
- branches: [ '**' ]
10
-
11
- jobs:
12
- test-windows:
13
- name: Test on Ruby ${{ matrix.ruby }} Windows
14
- runs-on: windows-latest
15
- strategy:
16
- fail-fast: false
17
- matrix:
18
- ruby: [ '2.6', '2.5', '2.4' ]
19
- steps:
20
- - uses: actions/checkout@master
21
- - name: Checkout submodules
22
- shell: bash
23
- run: |
24
- auth_header="$(git config --local --get http.https://github.com/.extraheader)"
25
- git submodule sync --recursive
26
- git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
27
- - name: Use Ruby
28
- uses: actions/setup-ruby@v1
29
- with:
30
- ruby-version: ${{ matrix.ruby }}
31
- architecture: 'x64'
32
- - name: Update gems
33
- shell: pwsh
34
- run: |
35
- gem install bundler
36
- bundle config --local path vendor/bundle
37
- bundle update
38
- bundle install --jobs 4 --retry 3
39
- - name: Run specs
40
- run: |
41
- bundle exec rake