relaton-un 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31151aa246ce23bc8c206f01e01e95a6de1663d2ebfa4c3b1dc44ac47f831cb1
-  data.tar.gz: fbe48be2bc80864088ee02602fba8ef119f0981fe0caf07f8a69e435ad1170fe
+  metadata.gz: 3c6791ae82b472328fb219a6b7fc1fba4ea6c5b8539120f8131079cf4d66fcee
+  data.tar.gz: 78eccc13a3e597c377d7e82ad474b8c86345118dfd9119fdfb0ee9830e235cc6
 SHA512:
-  metadata.gz: 2335b0f9afb8fd506ce5b107a4bcdbe484e320df9aa32a2d10a90da3d9af656e94bc39fe1eccae2be76dd6647d2e4092b6e510d8f2bba6f1551a5dc9fef640c4
-  data.tar.gz: 59ecf1ca8f3f3b1e7b498b543406f2faf26e6cade82e031e12b05462d606fefa6dda0f2532d777f5fc333da8ee5f13e96b7db623741b07f87cd9591d004d24ed
+  metadata.gz: 2d53ebca1c9e6c802953b6598aec20f91ec15fe2c80f1af3ea09f1fae4b502b14713e7442491cdd5ca10c84cb5ac7307e6dbbe967b839527cf1ecbfd05afb34d
+  data.tar.gz: 9761c548c89ec7a5426f1984e3c3e61003c9869f78c9441333a21070bea317c69f36b46bbbd99ffe791ae084580713f42f5d43797d0b92babff961356b51b9ba

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

@@ -7,11 +7,13 @@ 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'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -8,6 +8,7 @@
 /tmp/
 /.pryrc
 /.rubocop-https*
+/vendor/
 
 .rspec_status
 .vscode/

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.5
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -3,5 +3,10 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton-un.gemspec
 gemspec
 
+gem "equivalent-xml", "~> 0.6"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

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">
@@ -1273,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>
@@ -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_un/hit_collection.rb

@@ -23,8 +23,12 @@ module RelatonUn
       # ca_file = "/Users/andrej/Library/Preferences/httptoolkit/ca.pem"
       # @http.cert_store.set_default_paths
       # @http.cert_store.add_file ca_file
+      if RUBY_VERSION.to_f > 3.0
+        @http.ssl_version = :TLSv1_2 # rubocop:disable Naming/VariableNumber
+      end
       @http.read_timeout = 120
       if (form_resp = get_page)
+        # doc = Nokogiri::HTML page_resp(form_resp, text).body
         doc = Nokogiri::HTML page_resp(form_resp, text).body
         @array = doc.css("div.viewHover").map { |item| hit item }
       end
@@ -34,7 +38,7 @@ module RelatonUn
 
     # @param location [String]
     # @param deeep [Integer]
-    # @return [Strinf, NilClass]
+    # @return [String, nil]
     def get_page(location = "/", deep = 0)
       return if deep > 3
 
@@ -55,16 +59,16 @@ module RelatonUn
     # @return [Array<String>]
     def form_data(form, text) # rubocop:disable Metrics/CyclomaticComplexity
       fd = form.xpath(
-        "//input[@type!='radio']|"\
-        "//input[@type='radio'][@checked]|"\
-        "//select[@name!='view:_id1:_id2:cbLang']|"\
+        "//input[@type!='radio']|" \
+        "//input[@type='radio'][@checked]|" \
+        "//select[@name!='view:_id1:_id2:cbLang']|" \
         "//textarea",
       ).reduce([]) do |m, i|
         v = case i[:name]
             when "view:_id1:_id2:txtSymbol" then text
             when "view:_id1:_id2:rgTrunc", "view:_id1:_id2:cbSort" then "R"
             when "view:_id1:_id2:cbType" then "FP"
-            when "$$xspsubmitid" then "view:_id1:_id2:_id130"
+            when "$$xspsubmitid" then "view:_id1:_id2:_id131"
             when "$$xspsubmitscroll" then "0|102"
             when "view:_id1" then "view:_id1"
             else i[:value]
@@ -86,7 +90,7 @@ module RelatonUn
       req["Content-Type"] = "multipart/form-data; boundary=#{BOUNDARY}"
       req.body = form_data(form, text).join("\r\n")
       resp = @http.request req
-      get_page URI.parse(resp["location"]).request_uri
+      get_page Addressable::URI.parse(resp["location"]).request_uri
     end
 
     # @param item [Nokogiri::XML::Element]
@@ -173,9 +177,9 @@ module RelatonUn
     # @param req [Net::HTTP::Get, Net::HTTP::Post]
     def set_headers(req) # rubocop:disable Metrics/AbcSize
       set_cookie req
-      req["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,"\
-      "image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;"\
-      "v=b3;q=0.9"
+      req["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9," \
+                      "image/avif,image/webp,image/apng,*/*;q=0.8," \
+                      "application/signed-exchange;v=b3;q=0.9"
       req["Accept-Encoding"] = "gzip, deflate, br"
       req["Accept-Language"] = "en-US;q=0.8,en;q=0.7"
       req["Cache-Control"] = "max-age=0"

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.14.0".freeze
+  VERSION = "1.16.0".freeze
 end

data/lib/relaton_un.rb

@@ -1,3 +1,4 @@
+require "addressable"
 require "relaton_bib"
 require "relaton_un/version"
 require "relaton_un/un_bibliographic_item"

data/relaton_un.gemspec

@@ -9,13 +9,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonIso: retrieve CC Standards for bibliographic "\
+  spec.summary       = "RelatonIso: retrieve CC Standards for bibliographic " \
                        "use using the IsoBibliographicItem model"
-  spec.description   = "RelatonIso: retrieve CC Standards for bibliographic "\
+  spec.description   = "RelatonIso: retrieve CC Standards for bibliographic " \
                        "use using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-un"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -32,15 +32,10 @@ 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 "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-
-  spec.add_dependency "faraday", "~> 1.0"
-  spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "addressable", "~> 2.8.0"
+  spec.add_dependency "faraday", "~> 2.7.0"
+  spec.add_dependency "http-cookie", "~> 1.0.5"
+  spec.add_dependency "relaton-bib", "~> 1.16.0"
   spec.add_dependency "unf_ext", ">= 0.0.7.7"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,127 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+        version: 2.8.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-- !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'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: http-cookie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +132,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.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: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem