relaton-3gpp 1.14.3 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8d98ffac2c963fb2b403b0db8d549218150a7a23cb13ed17fd65604287fd54
-  data.tar.gz: dafdb6e3178f868bf6b25cf1cb8fc250a4e92d694a18d7d9396b3f6df1088402
+  metadata.gz: 207139041595ff473f6d1372793a3ee8142c6b456d208be33c68f50e1c7b8961
+  data.tar.gz: ff9c7606fcc605644880263e4be2befe1e460a174b6c7ae92d27f12e86b03b14
 SHA512:
-  metadata.gz: 98c8bc6c6460f8e11670d03abcf4d67be9855cbe46cb1770847f02e0a0674600b8dcfba2b444ae9c7a5ae7d2f58b11d6b1435a3fb80a218a327dea7967d7686d
-  data.tar.gz: 6bbf146a6e1b27e47e0340f50835dff409a22c647b6e63ade2c5dbc3d9ed6da326fa3b06e736d29f3dcd94d1e9bb7939d52d1fdd3ce0f34350103b3bd99911d5
+  metadata.gz: 203d9cdb69126f86d801f5ed93c2df91af6f876644846d22d79ba749e11b90804f7de660a2ea1b4ec2795866fa15c3670daa911dd915f78cd0696bf7933ab728
+  data.tar.gz: d20cf590d0e16a30475a9a51b5431d6b467e66c490fc32145d46521da56bef995d249de98bb09919e3442fc7f542f9730fc0f9092afd45a8d29f2f913f870b96

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,9 +6,11 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 Gemfile.lock
 .vscode/
 .rspec_status
+status_smg_3GPP*

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

@@ -6,7 +6,13 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 13.0"
-
 gem "rspec", "~> 3.0"
 
-gem "rubocop", "~> 1.7"
+gem "equivalent-xml", "~> 0.6"
+gem "rubocop", "~> 1.23.0"
+gem "rubocop-performance", "~> 1.12.0"
+gem "rubocop-rails", "~> 2.12.0"
+gem "ruby-jing", "~> 0.0.2"
+gem "simplecov", "~> 0.21.2"
+gem "vcr", "~> 6.1.0"
+gem "webmock", "~> 3.18.0"

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/relaton_3gpp/bibliography.rb

@@ -4,13 +4,18 @@ module Relaton3gpp
   # Methods for search IANA standards.
   module Bibliography
     # SOURCE = "http://xml2rfc.tools.ietf.org/public/rfc/bibxml-3gpp-new/"
-    SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/"
+    SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/"
+    INDEX_FILE = "index-v1.yaml"
 
     # @param text [String]
     # @return [RelatonBib::BibliographicItem]
     def search(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      file = text.sub(/^3GPP\s/, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
-      url = "#{SOURCE}#{file}.yaml"
+      index = Relaton::Index.find_or_create "3GPP", url: "#{SOURCE}index-v1.zip", file: INDEX_FILE
+      row = index.search(text.sub(/^3GPP\s/, "")).min_by { |r| r[:id] }
+      return unless row
+
+      # file = text.sub(/^3GPP\s/, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
+      url = "#{SOURCE}#{row[:file]}"
       resp = Net::HTTP.get_response URI(url)
       return unless resp.code == "200"
 

data/lib/relaton_3gpp/data_fetcher.rb

@@ -19,6 +19,10 @@ module Relaton3gpp
       @files = []
     end
 
+    def index
+      @index ||= Relaton::Index.find_or_create "3gpp", file: "index-v1.yaml"
+    end
+
     #
     # Initialize fetcher and run fetch
     #
@@ -56,11 +60,15 @@ module Relaton3gpp
       specrels = dbs["Specs_GSM+3G_release-info"]
       releases = dbs["Releases"]
       tstatus = dbs["temp-status"]
-      FileUtils.rm_f File.join(@output, "/*") if renewal && dbs["2001-04-25_schedule"].any?
+      if renewal && dbs["2001-04-25_schedule"].any?
+        FileUtils.rm_f File.join(@output, "/*") # if renewal && dbs["2001-04-25_schedule"].any?
+        index.remove_all # if renewal
+      end
       dbs["2001-04-25_schedule"].each do |row|
         fetch_doc row, specs, specrels, releases, tstatus
       end
       File.write CURRENT, @current.to_yaml, encoding: "UTF-8"
+      index.save
     end
 
     #
@@ -136,6 +144,7 @@ module Relaton3gpp
       else
         @files << file
       end
+      index.add_or_update bib.docnumber, file
       File.write file, c, encoding: "UTF-8"
     end
 

data/lib/relaton_3gpp/processor.rb

@@ -50,5 +50,12 @@ module Relaton3gpp
     def grammar_hash
       @grammar_hash ||= ::Relaton3gpp.grammar_hash
     end
+
+    #
+    # Remove index file
+    #
+    def remove_index_file
+      Relaton::Index.find_or_create("3GPP", url: true, file: Bibliography::INDEX_FILE).remove_file
+    end
   end
 end

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.14.3"
+  VERSION = "1.14.4"
 end

data/lib/relaton_3gpp.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "net/http"
+require "relaton/index"
 require "relaton_bib"
 require_relative "relaton_3gpp/version"
 require_relative "relaton_3gpp/release"

data/relaton_3gpp.gemspec

@@ -8,11 +8,11 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonIana: Ruby XMLDOC impementation."
-  spec.description   = "RelatonIana: Ruby XMLDOC impementation."
-  spec.homepage      = "https://github.com/relaton/relaton-iana"
+  spec.summary       = "Relaton3gpp: Ruby XMLDOC impementation."
+  spec.description   = "Relaton3gpp: Ruby XMLDOC impementation."
+  spec.homepage      = "https://github.com/relaton/relaton-3gpp"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'https://mygemserver.com'"
 
@@ -35,17 +35,10 @@ Gem::Specification.new do |spec|
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "rubocop", "~> 1.23.0"
-  spec.add_development_dependency "rubocop-performance", "~> 1.12.0"
-  spec.add_development_dependency "rubocop-rails", "~> 2.12.0"
-  spec.add_development_dependency "ruby-jing", "~> 0.0.2"
-  spec.add_development_dependency "simplecov", "~> 0.21.2"
-  spec.add_development_dependency "vcr", "~> 6.0.0"
-  spec.add_development_dependency "webmock", "~> 3.14.0"
 
   spec.add_dependency "mdb", "~> 0.5.0"
   spec.add_dependency "net-ftp", "~> 0.1.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,169 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2023-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.12.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.2
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.0
-- !ruby/object:Gem::Dependency
-  name: webmock
+  name: mdb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0
-  type: :development
+        version: 0.5.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: mdb
+  name: net-ftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: net-ftp
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.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
@@ -178,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
-description: 'RelatonIana: Ruby XMLDOC impementation.'
+description: 'Relaton3gpp: Ruby XMLDOC impementation.'
 email:
 - open.source@ribose.com
 executables: []
@@ -213,11 +115,11 @@ files:
 - lib/relaton_3gpp/version.rb
 - lib/relaton_3gpp/xml_parser.rb
 - relaton_3gpp.gemspec
-homepage: https://github.com/relaton/relaton-iana
+homepage: https://github.com/relaton/relaton-3gpp
 licenses:
 - BSD-2-Clause
 metadata:
-  homepage_uri: https://github.com/relaton/relaton-iana
+  homepage_uri: https://github.com/relaton/relaton-3gpp
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -226,15 +128,15 @@ 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: 'RelatonIana: Ruby XMLDOC impementation.'
+summary: 'Relaton3gpp: Ruby XMLDOC impementation.'
 test_files: []