relaton-ieee 1.14.6 → 1.14.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d8765c1fbcffbcaa1100c86bf97e9dc3704aae3dea2617c839b00db5822dc47
-  data.tar.gz: 74577930c19049f0ee094ef155b8e6125c286b61592d69b89fdb1afc2c68f925
+  metadata.gz: d8500bb75c78bc6904e1dde9a154f9c72d8a2be249cc8b38ba03d55d94e986a5
+  data.tar.gz: 012cbab554ade90a6318fd71eaeccc696d91a32ee2421738dde463d00e0d559e
 SHA512:
-  metadata.gz: ba4821384d2c1f45ccf4328c40063e690422366320a138d06e02a65b5dc7e74c9ec7ab04467907eb4f67b1616977fa09605db45f6a3c2db07eab97cae113cd46
-  data.tar.gz: 80de43ec9e466351f04751e6d9347766258a1ba82e581e24914204219e1ac6eb21949b07be654f99564621578f4e6ab1e791dd64d1c7cc623cc729506b54e66e
+  metadata.gz: d28e213f967b4a130692feb59efafa02f56c6b1ed2e5e3058528725f750987efa107a308cc5828d8911c4de3d6d6668331ed6ff3a68f589fc5062f7a4fb8ba88
+  data.tar.gz: 752359a0e401653c9d74ad2d4cec62e72bc8eaba107c6a3f74922cf6d8d6d40e7d89f99891ca7f68112a7bdcb2266444f105065dc5ec6d55d5622e03c1f510f5

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -10,8 +10,9 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -5,3 +5,11 @@ gemspec
 
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
+
+gem "equivalent-xml", "~> 0.6"
+gem "pry-byebug"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"
+gem "webrick"

data/lib/relaton_ieee/data_fetcher.rb

@@ -31,7 +31,6 @@ module RelatonIeee
       @ext = format.sub(/^bib/, "")
       @crossrefs = {}
       @backrefs = {}
-      # @normtitles = []
     end
 
     #
@@ -44,7 +43,7 @@ module RelatonIeee
     def self.fetch(output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
-      FileUtils.mkdir_p output # unless Dir.exist? output
+      FileUtils.mkdir_p output
       new(output, format).fetch
       t2 = Time.now
       puts "Stopped at: #{t2}"
@@ -99,7 +98,8 @@ module RelatonIeee
       stdid = doc.at("./publicationinfo/standard_id")&.text
       return if stdid == "0"
 
-      bib = DataParser.parse doc, self
+      fetcher = DataParser.new doc, self
+      bib = fetcher.parse
       if bib.docnumber.nil?
         nt = doc&.at("./normtitle")&.text
         warn "PubID parse error. Normtitle: #{nt}, file: #{filename}"

data/lib/relaton_ieee/ieee_bibliography.rb

@@ -1,8 +1,9 @@
 module RelatonIeee
   class IeeeBibliography
-    class << self
-      GH_URL = "https://raw.githubusercontent.com/relaton/relaton-data-ieee/main/data/".freeze
+    GH_URL = "https://raw.githubusercontent.com/relaton/relaton-data-ieee/main/".freeze
+    INDEX_FILE = "index-v1.yaml".freeze
 
+    class << self
       #
       # Search IEEE bibliography item by reference.
       #
@@ -10,10 +11,13 @@ module RelatonIeee
       #
       # @return [RelatonIeee::IeeeBibliographicItem]
       #
-      def search(code)
-        ref = code.sub(/Std\s/i, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
-        url = "#{GH_URL}#{ref}.yaml"
-        resp = Faraday.get url
+      def search(code) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        ref = code.sub(/Std\s/i, "") # .gsub(/[\s,:\/]/, "_").squeeze("_").upcase
+        index = Relaton::Index.find_or_create :ieee, url: "#{GH_URL}index-v1.zip", file: INDEX_FILE
+        row = index.search(ref).min_by { |r| r[:id] }
+        return unless row
+
+        resp = Faraday.get "#{GH_URL}#{row[:file]}"
         return unless resp.status == 200
 
         hash = YAML.safe_load resp.body

data/lib/relaton_ieee/processor.rb

@@ -49,5 +49,12 @@ module RelatonIeee
     def grammar_hash
       @grammar_hash ||= ::RelatonIeee.grammar_hash
     end
+
+    #
+    # Remove index file
+    #
+    def remove_index_file
+      Relaton::Index.find_or_create(:ieee, url: true, file: IeeeBibliography::INDEX_FILE).remove_file
+    end
   end
 end

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.14.6".freeze
+  VERSION = "1.14.8".freeze
 end

data/lib/relaton_ieee.rb

@@ -1,6 +1,7 @@
 require "digest/md5"
 require "faraday"
 require "yaml"
+require "relaton/index"
 require "relaton_bib"
 require "relaton_ieee/version"
 require "relaton_ieee/document_status"

data/relaton_ieee.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
                        "use using the IeeeBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-ieee"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -31,16 +31,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "webrick"
-
-  spec.add_dependency "faraday", "~> 1.0"
-  spec.add_dependency "mini_portile2"
+  spec.add_dependency "faraday", "~> 2.7.0"
+  spec.add_dependency "mini_portile2", "~> 2.8.0"
   spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-index", "~> 0.2.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,155 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.14.6
+  version: 1.14.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: 2.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  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'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: ruby-jing
-  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
-    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: vcr
-  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: webmock
-  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: webrick
-  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: faraday
+  name: mini_portile2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
-  name: mini_portile2
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: relaton-index
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -219,14 +135,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonIeee: retrieve IEEE Standards for bibliographic use using the IeeeBibliographicItem