relaton-iana 1.14.2 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e28db214fb7ee96d95437e096953b44088e3dcb0b0255a224773a2c3d0265ed2
-  data.tar.gz: 397b757c60191a373016f767ef76bd34000a77d4039ea85bd022376ca40fc3f1
+  metadata.gz: d6512698897df0914041e13906cca68fc122b181d3f4ec5f89016bbb8335a08e
+  data.tar.gz: 6a86c62db84860027c1127c7db46aa7a63cc3e86a5c79d1614b450ee15c7cd6c
 SHA512:
-  metadata.gz: 82a9ba0764bae580b8938ef563e35b31da5a666e5accf9b99ff0f92ca9d1d2bb1c7f64515b545534efe1cb417cf68915507983be0fcbe34eb444380c3c5fe886
-  data.tar.gz: c28062035798f285063e3fff10b6a508998512f77e8ed7d63c4918980df97de8b7e0c5bb2a2a98c7a1142b6e047040ddff7984e6179f21fb6fbc70fb6628ad60
+  metadata.gz: 389b62934467fa0296e801c4078e22184db48e403cd0540a3d3ede2163aaea6d6e7c82a31749706d9d3a52f35fef3943196483941db76cd2e838fc4f79e01dd3
+  data.tar.gz: e7134314b1dfe176b13ee5d0646a3823e7f194b22511b56b00b116a430f556c3b483f33db67f6cb7fc86c85a539dd7f2d0526d87a3c47fa1511806c766ffa4cc

data/.github/workflows/release.yml

@@ -7,7 +7,8 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
         default: 'skip'
   repository_dispatch:

data/Gemfile

@@ -9,6 +9,7 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
+gem "equivalent-xml", "~> 0.6"
 gem "rubocop", "~> 1.7"
 gem "rubocop-performance"
 gem "rubocop-rails"

data/grammars/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</value>

data/lib/relaton_iana/data_fetcher.rb

@@ -1,7 +1,5 @@
 module RelatonIana
   class DataFetcher
-    SOURCE = "https://raw.githubusercontent.com/ietf-ribose/iana-registries/main/".freeze
-
     #
     # Data fetcher initializer
     #
@@ -13,6 +11,7 @@ module RelatonIana
       @format = format
       @ext = format.sub(/^bib/, "")
       @files = []
+      @index = Relaton::Index.find_or_create :IANA, file: "index-v1.yaml"
     end
 
     #
@@ -41,6 +40,7 @@ module RelatonIana
       rescue StandardError => e
         warn "Error: #{e.message}. File: #{file}"
       end
+      @index.save
     end
 
     def parse(content)
@@ -70,6 +70,7 @@ module RelatonIana
       else
         @files << file
       end
+      @index.add_or_update bib.docnumber, file
       File.write file, c, encoding: "UTF-8"
     end
 

data/lib/relaton_iana/iana_bibliography.rb

@@ -3,13 +3,20 @@
 module RelatonIana
   # Methods for search IANA standards.
   module IanaBibliography
-    SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-iana/main/data/"
+    SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-iana/main/"
+    INDEX_FILE = "index-v1.yaml"
 
     # @param text [String]
     # @return [RelatonIana::IanaBibliographicItem]
     def search(text) # rubocop:disable Metrics/MethodLength
-      file = text.sub(/^IANA\s/, "").gsub(/[\s,:\/]/, "_").downcase
-      url = "#{SOURCE}#{file}.yaml"
+      # file = text.sub(/^IANA\s/, "").gsub(/[\s,:\/]/, "_").downcase
+      # url = "#{SOURCE}#{file}.yaml"
+      index = Relaton::Index.find_or_create :IANA, url: "#{SOURCE}index-v1.zip", file: INDEX_FILE
+      id = text.sub(/^IANA\s/, "")
+      row = index.search(id).min_by { |i| i[:id] }
+      return unless row
+
+      url = "#{SOURCE}#{row[:file]}"
       resp = Net::HTTP.get_response URI(url)
       return unless resp.code == "200"
 

data/lib/relaton_iana/processor.rb

@@ -50,5 +50,12 @@ module RelatonIana
     def grammar_hash
       @grammar_hash ||= ::RelatonIana.grammar_hash
     end
+
+    #
+    # Remove index file
+    #
+    def remove_index_file
+      Relaton::Index.find_or_create(:IANA, url: true, file: IanaBibliography::INDEX_FILE).remove_file
+    end
   end
 end

data/lib/relaton_iana/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIana
-  VERSION = "1.14.2"
+  VERSION = "1.16.0"
 end

data/lib/relaton_iana.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "faraday"
+require "relaton/index"
 require "relaton_bib"
 require_relative "relaton_iana/version"
 require_relative "relaton_iana/iana_bibliographic_item"

data/relaton_iana.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+  # spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -29,10 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-
   spec.add_dependency "faraday", "~> 2.7.0"
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-index", "~> 0.2.0"
 
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iana
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.16.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-09-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'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.16.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
 description: 'RelatonIana: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com