relaton-un 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8cddb509c1d3493c6e33544358f4e1826e2431f3fc1425c5a101e8fc30ed3bf
-  data.tar.gz: 0a9090a2aa04fe9fa9432fbc5ea96ff66db4a1345becf4db6c4cb92baa3e2a69
+  metadata.gz: f4e4c99e686c0404548000a0a43cde77f7e5596a7f4a00bf6366a820850717e8
+  data.tar.gz: 971ce2228135c5755f20eb67883c213f7d4a75cd2749b6ce824a7453226874bf
 SHA512:
-  metadata.gz: 86723673e87178d39bb6b41208d33820e8d518e2db675b1f7e5cc3afa6340603868332281b08e5d42c2200a0e8f63ce379476746453ffe7accc0098f6607d999
-  data.tar.gz: 63e99c6607c427466c13e68304b067d0e76b250e766eb0c5407609c47f96d28ac7bef78ee62f66ed97b5a58520473343b46d5b2eefe5dac47df200ec22376d71
+  metadata.gz: 43872981020e361dcbc7fe270a1f2d859ae2d923e52e44997229232b05d485d6f1b66449067aba7f0168daa78b65221163bc67943bc49a5deb5214d719acf2f8
+  data.tar.gz: aa280783dc71bed1b0b298006ed354256cf4f3e12fdf9dbd2c65967499b6bb27191d578af07325bf25326d5f4cd4c8a60f07b92178ad8c3e93ab36afa425e5e1

data/Gemfile

@@ -3,5 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in relaton-un.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

data/lib/relaton_un/hit.rb

@@ -82,9 +82,11 @@ module RelatonUn
 
     # @return [Array<RelatonBib::DocumentIdentifier>]
     def fetch_docid
-      hit[:symbol].map do |s|
+      dids = hit[:symbol].map do |s|
         RelatonBib::DocumentIdentifier.new(id: s, type: "UN")
       end
+      dids.first.instance_variable_set :@primary, true
+      dids
     end
 
     # @return [Array<RelatonBib::TypedTitleString>]

data/lib/relaton_un/hit_collection.rb

@@ -12,7 +12,7 @@ module RelatonUn
     BOUNDARY = "----WebKitFormBoundaryVarT9Z7AFUzw2lma"
 
     # @param text [String] reference to search
-    def initialize(text)
+    def initialize(text) # rubocop:disable Metrics/AbcSize
       super
       @uri = URI.parse DOMAIN
       @jar = HTTP::CookieJar.new
@@ -58,13 +58,12 @@ module RelatonUn
         "//input[@type!='radio']|"\
         "//input[@type='radio'][@checked]|"\
         "//select[@name!='view:_id1:_id2:cbLang']|"\
-        "//textarea"
+        "//textarea",
       ).reduce([]) do |m, i|
         v = case i[:name]
             when "view:_id1:_id2:txtSymbol" then text
-            when "view:_id1:_id2:rgTrunc" then "R"
+            when "view:_id1:_id2:rgTrunc", "view:_id1:_id2:cbSort" then "R"
             when "view:_id1:_id2:cbType" then "FP"
-            when "view:_id1:_id2:cbSort" then "R"
             when "$$xspsubmitid" then "view:_id1:_id2:_id130"
             when "$$xspsubmitscroll" then "0|102"
             when "view:_id1" then "view:_id1"
@@ -80,7 +79,7 @@ module RelatonUn
     # @param form_resp [Net::HTTPOK]
     # @param text [String]
     # @return [Net::HTTPOK]
-    def page_resp(form_resp, text)
+    def page_resp(form_resp, text) # rubocop:disable Metrics/AbcSize
       form = Nokogiri::HTML form_resp.body
       req = Net::HTTP::Post.new form.at("//form")[:action]
       set_headers req
@@ -118,8 +117,10 @@ module RelatonUn
     # @param item [Nokogiri::XML::Element]
     # @return [String]
     def symbol(item)
-      item.xpath("div/div[not(contains(@class, 'hidden'))]/"\
-        "label[contains(.,'Symbol')]/following-sibling::span[1]").map &:text
+      item.xpath(
+        "div/div[not(contains(@class, 'hidden'))]/"\
+        "label[contains(.,'Symbol')]/following-sibling::span[1]",
+      ).map &:text
     end
 
     # @param item [Nokogiri::XML::Element]

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.10.0".freeze
+  VERSION = "1.10.1".freeze
 end

data/relaton_un.gemspec

@@ -33,7 +33,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
@@ -41,7 +40,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 1.10.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.1"
   spec.add_dependency "unf_ext", ">= 0.0.7.7"
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-02-08 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: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement