relaton-itu 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef87fd606902663b9e0236740fabc892089c45496363a7e2130d5575592a0e07
-  data.tar.gz: f283ad42e01ffc75850880b4bb224e601db7db1c3df71fe883800c1b4ba3d382
+  metadata.gz: 9c4af93cb7f6ba7f9beff7222f442fb1d0b17ad382308fd492fadbbe7932cd69
+  data.tar.gz: c19c46f3a457914f60cab5992a1443ccf22242ae9ba7c62d141f4de7bdd23fa2
 SHA512:
-  metadata.gz: 99e6637a4eaa1121993c22ff14a4c3dc5a2e00a875b86ee8187b39d81025ac28d3771dca370e9f2c5b2f42be9e77c37e8a4b9576952c5facecf0b407d5e730b5
-  data.tar.gz: 57e935f3354bf931bcb5cf6ad851b113139ef25100e9e78a8d8766d193dfbb002c801daa698807e5e2844c43b69128a0cbdef1c411de2599dcc5fc028733932f
+  metadata.gz: addf42eb6f8631ed0f37fdcfc662edcab0b8877c9316c661b7168e6af64b9e584b23787bf9d5d59372da60f19c7468b378f896279ca6b39d6139c1791f023dc5
+  data.tar.gz: 6789334b80124b7a9bbe33631379a952db3849cd34aa46c2bcbdb922f3f9393e65cb93120cd72b35d3590ab3e0f5b42595c3be815db9ca15042d1bb1e8a42332

data/Gemfile

@@ -4,3 +4,9 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 # Specify your gem's dependencies in relaton_itu.gemspec
 gemspec
+
+gem "pry-byebug"
+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">
@@ -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_itu/hit_collection.rb

@@ -35,9 +35,9 @@ module RelatonItu
     private
 
     def request_search
-      url = "#{DOMAIN}/net4/ITU-T/search/GlobalSearch/Search"
+      url = "#{DOMAIN}/net4/ITU-T/search/GlobalSearch/RunSearch"
       data = { json: params.to_json }
-      resp = agent.post url, data.to_json, "Content-Type" => "application/json"
+      resp = agent.post url, data
       @array = hits JSON.parse(resp.body)
     end
 
@@ -55,6 +55,7 @@ module RelatonItu
 
       hash = YAML.safe_load resp.body
       item_hash = HashConverter.hash_to_bib(hash)
+      item_hash[:fetched] = Date.today.to_s
       item = ItuBibliographicItem.new(**item_hash)
       hit = Hit.new({ url: uri.to_s }, self)
       hit.fetch = item
@@ -88,7 +89,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Name",
-              "Target" => "\\/name_s",
+              "Target" => "/name_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -96,7 +97,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "Short description",
-              "Target" => "\\/short_description_s",
+              "Target" => "/short_description_s",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -104,7 +105,7 @@ module RelatonItu
               "Selected" => false,
               "Value" => "",
               "Label" => "File content",
-              "Target" => "\\/file",
+              "Target" => "/file",
               "TypeName" => "CHECKBOX",
               "GetCriteriaType" => 0,
             },
@@ -125,7 +126,7 @@ module RelatonItu
       data["results"].map do |h|
         code  = h["Media"]["Name"]
         title = h["Title"]
-        url   = h["Redirection"]
+        url   = "#{DOMAIN}#{h['Redirection']}"
         type  = h["Collection"]["Group"].downcase[0...-1]
         Hit.new({ code: code, title: title, url: url, type: type }, self)
       end

data/lib/relaton_itu/itu_bibliography.rb

@@ -59,19 +59,19 @@ module RelatonItu
 
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
-        warn "[relaton-itu] WARNING: no match found online for #{id}. "\
-          "The code must be exactly like it is on the standards website."
+        warn "[relaton-itu] WARNING: no match found online for #{id}. " \
+             "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "[relaton-itu] (There was no match for #{year}, though there "\
-            "were matches found for #{missed_years.join(', ')}.)"
+          warn "[relaton-itu] (There was no match for #{year}, though there " \
+               "were matches found for #{missed_years.join(', ')}.)"
         end
         if /\d-\d/.match? code
-          warn "[relaton-itu] The provided document part may not exist, or "\
-            "the document may no longer be published in parts."
+          warn "[relaton-itu] The provided document part may not exist, or " \
+               "the document may no longer be published in parts."
         else
-          warn "[relaton-itu] If you wanted to cite all document parts for the reference, "\
-            "use \"#{code} (all parts)\".\nIf the document is not a standard, "\
-            "use its document type abbreviation (TS, TR, PAS, Guide)."
+          warn "[relaton-itu] If you wanted to cite all document parts for the reference, " \
+               "use \"#{code} (all parts)\".\nIf the document is not a standard, " \
+               "use its document type abbreviation (TS, TR, PAS, Guide)."
         end
         nil
       end

data/lib/relaton_itu/scrapper.rb

@@ -190,7 +190,7 @@ module RelatonItu
           did = RelatonBib::DocumentIdentifier.new(id: ref.text, type: "ITU")
           bibitem = ItuBibliographicItem.new(formattedref: fref, docid: [did],
                                              type: "standard")
-          { type: "complements", bibitem: bibitem }
+          { type: "complementOf", bibitem: bibitem }
         end
       end
 

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.14.0".freeze
+  VERSION = "1.14.1".freeze
 end

data/relaton-itu.gemspec

@@ -27,13 +27,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr", "~> 5.0.0"
-  spec.add_development_dependency "webmock"
 
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "relaton-bib", "~> 1.14.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,62 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.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: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.0.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: mechanize
   requirement: !ruby/object:Gem::Requirement