relaton-un 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 613a9a82547cda0760295b57949e565c868f3fd2b660a7f7d813ba6e224a00b8
-  data.tar.gz: 5aa7797780314ab7887b540fb84105a0dccab4a36f1c5fabcf5f814e70d4b2e8
+  metadata.gz: 0725035a19dd3a50cf7c3cb122ff4af562adeba0c01447c7a41b8ea4aacd67f1
+  data.tar.gz: cd28290c02918a2f7754d453eb3f9977c311b354adb8fd55718c7bf2446909a0
 SHA512:
-  metadata.gz: 4bf072e67d014ac53bc8a95650a87fcd079420cf93fe2b47ab051a6c41b406b5e75d45127b5d6ba8bab3a6c9279604aee9a059b620c4bc167659f19eb502fcbf
-  data.tar.gz: 8d17af6fa62c494921521a3a4ce417f0fd604ce560949a587d1b37db1230d8a889cfdb831fcd0cef78bdbc676b594680abc51a75e06f67befb464b81756c1d8e
+  metadata.gz: dd656a5b34cadb82262c017c38e5ed7738abc3e76af883b3921b21fda57c0163153e8120bfbadebdfe541bf00b67646bb61f5304a529f4be09f0240a2036532b
+  data.tar.gz: 5b8f6f49eb1af0ce6d6ecf2c9aeed3173743a093b9319b68dcb5290e0e33a1b90f83c41c690c9255909cf29ec519a347cc0e0f3e735041bc0f3cc87a3de07921

data/README.adoc

@@ -25,9 +25,10 @@ Or install it yourself as:
 
 === Search for a standard using keywords
 
-[source]
+[source,ruby]
 ----
 require 'relaton_un'
+=> true
 
 hits = RelatonUn::UnBibliography.search("TRADE/CEFACT/2004/32")
 => <RelatonUn::HitCollection:0x007fc4e6ec2018 @ref=TRADE/CEFACT/2004/32 @fetched=false>
@@ -39,23 +40,23 @@ item = hits[0].fetch
 
 === XML serialization
 
-[source]
+[source,ruby]
 ----
 item.to_xml
-=> '<bibitem id="TRADE/CEFACT/2004/32">
+=> "<bibitem id="TRADE/CEFACT/2004/32" type="standard">
       <title type="main" format="text/plain" language="en" script="Latn">SECRETARIAT REVIEW OF UN/LOCODE, 19 DECEMBER 2003 / SUBMITTED BY THE SECRETARIAT</title>
       <uri type="pdf">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/pdf/G0430683.pdf?OpenElement</uri>
       <uri type="word">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/doc/G0430683.DOC?OpenElement</uri>
       <docidentifier type="UN">TRADE/CEFACT/2004/32</docidentifier>
       <docnumber>TRADE/CEFACT/2004/32</docnumber>
       ...
-    </bibitem>'
+    </bibitem>"
 ----
 With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and adds flavour `ext` element.
-[source]
+[source,ruby]
 ----
 item.to_xml bibdata: true
-=> '<bibdata type="standard">
+=> "<bibdata type="standard">
       <fetched>2020-03-13</fetched>
       <title type="main" format="text/plain" language="en" script="Latn">SECRETARIAT REVIEW OF UN/LOCODE, 19 DECEMBER 2003 / SUBMITTED BY THE SECRETARIAT</title>
       <uri type="pdf">https://documents-dds-ny.un.org/doc/UNDOC/GEN/G04/306/83/pdf/G0430683.pdf?OpenElement</uri>
@@ -63,11 +64,23 @@ item.to_xml bibdata: true
       <docidentifier type="UN">TRADE/CEFACT/2004/32</docidentifier>
       <docnumber>TRADE/CEFACT/2004/32</docnumber>
       ...
-    </bibdata>'
+      <ext>
+        <editorialgroup>
+          <committee>Committee on Trade</committee>
+          <committee>Centre for Trade Facilitation and Electronic Business</committee>
+        </editorialgroup>
+        <distribution>general</distribution>
+        <session>
+          <number>10</number>
+          <agenda-id>12</agenda-id>
+        </session>
+        <job_number>G0430683</job_number>
+      </ext>
+    </bibdata>"
 ----
 
 === Get code, and year
-[source]
+[source,ruby]
 ----
 RelatonUn::UnBibliography.get "UN TRADE/CEFACT/2004/32"
 [relaton-un] ("UN TRADE/CEFACT/2004/32") fetching...
@@ -77,7 +90,7 @@ RelatonUn::UnBibliography.get "UN TRADE/CEFACT/2004/32"
 ----
 
 === Create bibliographic item from XML
-[source]
+[source,ruby]
 ----
 RelatonUn::XMLParser.from_xml File.read('spec/fixtures/un_bib.xml')
 => #<RelatonUn::UnBibliographicItem:0x007fdc5e7ab678
@@ -85,7 +98,7 @@ RelatonUn::XMLParser.from_xml File.read('spec/fixtures/un_bib.xml')
 ----
 
 === Create bibliographic item from YAML
-[source]
+[source,ruby]
 ----
 hash = YAML.load_file 'spec/fixtures/un_bib.yaml'
 => {"id"=>"TRADE/CEFACT/2004/32",

data/grammars/isodoc.rng

@@ -42,8 +42,11 @@
     </define>
     <define name="xref">
       <element name="xref">
+        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +64,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +586,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +671,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +717,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -855,7 +885,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +952,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +994,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1022,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1044,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1072,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1180,6 +1216,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1486,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1501,4 +1535,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_un/editorialgroup.rb

@@ -10,6 +10,11 @@ module RelatonUn
       @committee = committee
     end
 
+    # @return [true]
+    def presence?
+      true
+    end
+
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
       builder.editorialgroup do |b|

data/lib/relaton_un/hit_collection.rb

@@ -6,18 +6,23 @@ require "http-cookie"
 module RelatonUn
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection
-    AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_3) "\
-    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36"
+    AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) "\
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.102 Safari/537.36"
     DOMAIN = "https://documents.un.org"
-    BOUNDARY = "----WebKitFormBoundary6hkaBvITDck8dHCn"
+    BOUNDARY = "----WebKitFormBoundaryVarT9Z7AFUzw2lma"
 
     # @param text [String] reference to search
     def initialize(text)
       super
       @uri = URI.parse DOMAIN
       @jar = HTTP::CookieJar.new
-      @http = Net::HTTP.new @uri.host, @uri.port
+      @http = Net::HTTP.new @uri.host, @uri.port # , "localhost", "8000"
       @http.use_ssl = true
+      # @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      # @http.cert_store = OpenSSL::X509::Store.new
+      # ca_file = "/Users/andrej/Library/Preferences/httptoolkit/ca.pem"
+      # @http.cert_store.set_default_paths
+      # @http.cert_store.add_file ca_file
       @http.read_timeout = 120
       if (form_resp = get_page)
         doc = Nokogiri::HTML page_resp(form_resp, text).body
@@ -50,17 +55,19 @@ 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" 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|167"
+            when "$$xspsubmitscroll" then "0|102"
+            when "view:_id1" then "view:_id1"
             else i[:value]
             end
         m << %{--#{BOUNDARY}}
@@ -77,7 +84,7 @@ module RelatonUn
       form = Nokogiri::HTML form_resp.body
       req = Net::HTTP::Post.new form.at("//form")[:action]
       set_headers req
-      req["Content-Type"] = "multipart/form-data, boundary=#{BOUNDARY}"
+      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
@@ -163,15 +170,18 @@ module RelatonUn
     # rubocop:disable Metrics/MethodLength
 
     # @param req [Net::HTTP::Get, Net::HTTP::Post]
-    def set_headers(req)
+    def set_headers(req) # rubocop:disable Metrics/AbcSize
       set_cookie req
       req["Accept"] = "text/html,application/xhtml+xml,application/xml;q=0.9,"\
-      "image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;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"
       req["Connection"] = "keep-alive"
       req["Origin"] = "https://documents.un.org"
       req["Referer"] = "https://documents.un.org/prod/ods.nsf/home.xsp"
+      req["Sec-Fetch-Dest"] = "document"
       req["Sec-Fetch-Mode"] = "navigate"
       req["Sec-Fetch-Site"] = "same-origin"
       req["Sec-Fetch-User"] = "?1"

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.3.0".freeze
+  VERSION = "1.4.0".freeze
 end

data/relaton_un.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 1.3.0"
+  spec.add_dependency "relaton-bib", "~> 1.4.0"
   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.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/relaton/relaton-un
   source_code_uri: https://github.com/relaton/relaton-un
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'