relaton-un 1.2.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8126ad17a8daeba18d98bf60b9b058cac2a7980d2bf9dc86135753c7c6d465f4
-  data.tar.gz: b69257fbdfb2688ccb6a093b5cfd19478c6663d7b894cad2943d493db013d3aa
+  metadata.gz: 15db68b8fb83679317777adb635ce62c56044b7685f9b0c7e94bb0040c66fbf7
+  data.tar.gz: 5b4eff35e67ad989f8b8c3ffd1cf5a72b974c6ee18605b585b72acdc57cf48da
 SHA512:
-  metadata.gz: 23647bafcdd4658c5b28fb522856428821814d477e47fbbc27367d5817a9d56048a8716cfd6312b4d81aa245a73409e3d831024f74cb667f73fa7b4489f2f9cb
-  data.tar.gz: 8ead46ec5d80a0a751dc4c39da26a07d2371358505f6eea8b442d4448459a225787e10d7af807e13283296dfd162d8353972dcbe1ec5821ef94116b9a383366f
+  metadata.gz: 24a85da74d47286a193e3b56fc912de77ddeb912a0a2c8c0b0bd575542dd99d67badb818e171491c2c1704c8336f81a3a9c03b39de2ed63e5044ab1df88a0220
+  data.tar.gz: ce0b55e34ff5c2876dbf6c09d9dfa88b09e8c1d497453f48db48e8af0660e679ec932d103937cb85df0ef4d368fc36db12acc20fa1a3d3e7ecad30466123b7cd

data/.github/workflows/ubuntu.yml

@@ -29,4 +29,5 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
+          unset JAVA_TOOL_OPTIONS
           bundle exec rake

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Rails:
-  Enabled: true
+  Enabled: false

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

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <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 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,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 +716,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>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +958,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +1000,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1028,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1050,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1078,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 +1222,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1492,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 +1541,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/grammars/un.rng

@@ -340,6 +340,13 @@
   </define>
   <define name="un-standard">
     <element name="un-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>

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|
@@ -21,5 +26,13 @@ module RelatonUn
     def to_hash
       single_element_array(committee.map { |c| { "committee" => c } })
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix)
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "editorialgroup"
+      committee.map { |c| "#{pref}.committee:: #{c}\n" }.join
+    end
   end
 end

data/lib/relaton_un/hash_converter.rb

@@ -9,6 +9,7 @@ module RelatonUn
         ret = super
         return if ret.nil?
 
+        ret[:submissionlanguage] = array ret[:submissionlanguage]
         session_hash_to_bib ret
         ret
       end

data/lib/relaton_un/hit.rb

@@ -59,7 +59,7 @@ module RelatonUn
     # rubocop:disable Metrics/MethodLength
 
     # @return [RelatonUn::UnBibliographicItem]
-    def un_bib_item
+    def un_bib_item # rubocop:disable Metrics/AbcSize
       UnBibliographicItem.new(
         type: "standard",
         fetched: Date.today.to_s,
@@ -75,6 +75,7 @@ module RelatonUn
         distribution: fetch_distribution,
         editorialgroup: fetch_editorialgroup,
         classification: fetch_classification,
+        job_number: hit[:job_number]
       )
     end
     # rubocop:enable Metrics/MethodLength
@@ -88,11 +89,6 @@ module RelatonUn
 
     # @return [Array<RelatonBib::TypedTitleString>]
     def fetch_title
-      # fs = RelatonBib::FormattedString.new(
-      #   content: hit[:title], language: "en", script: "Latn",
-      # )
-      # [RelatonBib::TypedTitleString.new(type: "main", title: fs)]
-      # [{ title_main: hit[:title], language: "en", script: "Latn" }]
       RelatonBib::TypedTitleString.from_string hit[:title], "en", "Latn"
     end
 
@@ -135,7 +131,7 @@ module RelatonUn
     def fetch_editorialgroup
       tc = hit[:ref].match(/^[\S]+/).to_s.split(/\/|-/).reduce([]) do |m, v|
         if BODY[v] then m << BODY[v]
-        elsif v =~ /(AC|C|CN|CONF|GC|SC|Sub|WG).\d+|PC/ then m << v
+        elsif v.match? /(AC|C|CN|CONF|GC|SC|Sub|WG).\d+|PC/ then m << v
         else m
         end
       end.uniq

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
@@ -48,19 +53,21 @@ module RelatonUn
     # @param form [Nokogiri::HTML::Document]
     # @param text [String]
     # @return [Array<String>]
-    def form_data(form, text)
+    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']",
-        "//textarea",
+        "//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
@@ -91,7 +98,7 @@ module RelatonUn
 
     # @param item [Nokogiri::XML::Element]
     # @return [Hash]
-    def hit_data(item)
+    def hit_data(item) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       en = item.at("//span[.='ENGLISH']/../..")
       {
         ref: item.at("div/div/a")&.text&.sub("\u00A0", ""),
@@ -103,7 +110,8 @@ module RelatonUn
         link: link(en),
         session: session(item),
         agenda: agenda(item),
-        distribution: distribution(item)
+        distribution: distribution(item),
+        job_number: job_number(item),
       }
     end
 
@@ -155,18 +163,25 @@ module RelatonUn
       item.at("//label[.='Distribution:']/following-sibling::span")&.text
     end
 
+    def job_number(item)
+      item.at("//span[contains(@id, 'cfJobNumE')]")&.text
+    end
+
     # 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/session.rb

@@ -3,7 +3,7 @@ module RelatonUn
     include RelatonBib
 
     # @return [String, NilClass]
-    attr_reader :session_number, :collaboration, :agenda_id, :item_footnote
+    attr_reader :session_number, :collaborator, :agenda_id, :item_footnote
 
     # @return [Date, NilClass]
     attr_reader :session_date
@@ -16,7 +16,7 @@ module RelatonUn
     # @param item_number [Array<String>]
     # @pqrqm item_name [Array<String>]
     # @pqrqm subitem_name [Array<String>]
-    # @param collaboration [String]
+    # @param collaborator [String]
     # @param agenda_id [String]
     # @param item_footnote [String]
     def initialize(**args)
@@ -25,12 +25,12 @@ module RelatonUn
       @item_number = args.fetch(:item_number, [])
       @item_name = args.fetch(:item_name, [])
       @subitem_name = args.fetch(:subitem_name, [])
-      @collaboration = args[:collaboration]
+      @collaborator = args[:collaborator]
       @agenda_id = args[:agenda_id]
       @item_footnote = args[:item_footnote]
     end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize
 
     # @param [Nokogiri::XML::Builder]
     def to_xml(builder)
@@ -40,26 +40,48 @@ module RelatonUn
         item_number.each { |n| b.send "item-number", n }
         item_name.each { |n| b.send "item-name", n }
         subitem_name.each { |n| b.send "subitem-name", n }
-        b.collaboration collaboration if collaboration
+        b.collaborator collaborator if collaborator
         b.send "agenda-id", agenda_id if agenda_id
         b.send "item-footnote", item_footnote if item_footnote
       end
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/PerceivedComplexity, Metrics/MethodLength
     # @return [Hash]
     def to_hash
       hash = {}
       hash["session_number"] = session_number if session_number
       hash["session_date"] = session_date.to_s if session_date
-      hash["item_number"] = single_element_array(item_number) if item_number.any?
+      if item_number.any?
+        hash["item_number"] = single_element_array(item_number)
+      end
       hash["item_name"] = single_element_array(item_name) if item_name.any?
-      hash["subitem_name"] = single_element_array(subitem_name) if subitem_name.any?
-      hash["collaboration"] = collaboration if collaboration
+      if subitem_name.any?
+        hash["subitem_name"] = single_element_array(subitem_name)
+      end
+      hash["collaborator"] = collaborator if collaborator
       hash["agenda_id"] = agenda_id if agenda_id
       hash["item_footnote"] = item_footnote if item_footnote
       hash
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix = "")
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "session"
+      out = ""
+      out += "#{pref}.session_number:: #{session_number}\n" if session_number
+      out += "#{pref}.session_date:: #{session_date}\n" if session_date
+      item_number.each { |n| out += "#{pref}.item_number:: #{n}\n" }
+      item_name.each { |n| out += "#{pref}.item_name:: #{n}\n" }
+      subitem_name.each { |n| out += "#{pref}.subitem_name:: #{n}\n" }
+      out += "#{pref}.collaborator:: #{collaborator}\n" if collaborator
+      out += "#{pref}.agenda_id:: #{agenda_id}\n" if agenda_id
+      out += "#{pref}.item_footnote:: #{item_footnote}\n" if item_footnote
+      out
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/MethodLength
   end
 end

data/lib/relaton_un/un_bibliographic_item.rb

@@ -1,5 +1,7 @@
 module RelatonUn
   class UnBibliographicItem < RelatonBib::BibliographicItem
+    include RelatonBib
+
     TYPES = %w[
       recommendation plenary addendum communication corrigendum reissue agenda
       budgetary sec-gen-notes expert-report resolution
@@ -12,37 +14,69 @@ module RelatonUn
     attr_reader :session
 
     # @return [String, NilClass]
-    attr_reader :distribution
+    attr_reader :distribution, :job_number
+
+    # @return [Array<String>]
+    attr_reader :submissionlanguage
 
     # @param session [RelatonUn::Session, NilClass]
-    # @param distribution [String]
+    # @param distribution [String, nil]
+    # @param job_number [String, nil]
     def initialize(**args)
       if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
-        warn "[relaton-un] WARNING: invalid distribution: #{args[:distribution]}"
+        warn "[relaton-un] WARNING: invalid distribution: "\
+        "#{args[:distribution]}"
       end
+      @submissionlanguage = args.delete :submissionlanguage
       @distribution = args.delete :distribution
       @session = args.delete :session
+      @job_number = args.delete :job_number
       super **args
-      # @doctype = args[:doctype]
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    # @param bibdata [TrueClasss, FalseClass, NilClass]
-    def to_xml(builder = nil, **opts)
-      super(builder, **opts) do |b|
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String] :lang language
+    # @return [String] XML
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      super **opts do |b|
         b.ext do
+          b.doctype doctype if doctype
+          submissionlanguage&.each { |sl| b.submissionlanguage sl }
           editorialgroup&.to_xml b
+          ics&.each { |i| i.to_xml b }
           b.distribution distribution if distribution
           session&.to_xml b if session
+          b.job_number job_number if job_number
         end
       end
     end
 
     # @return [Hash]
-    def to_hash
+    def to_hash # rubocop:disable Metrics/AbcSize
       hash = super
+      if submissionlanguage&.any?
+        hash["submissionlanguage"] = single_element_array submissionlanguage
+      end
+      hash["distribution"] = distribution if distribution
       hash["session"] = session.to_hash if session
+      hash["job_number"] = job_number if job_number
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize
+      pref = prefix.empty? ? prefix : prefix + "."
+      out = super
+      submissionlanguage.each do |sl|
+        out += "#{pref}submissionlanguage:: #{sl}\n"
+      end
+      out += "#{pref}distribution:: #{distribution}\n" if distribution
+      out += session.to_asciibib prefix if session
+      out += "#{pref}job_number:: #{job_number}\n" if job_number
+      out
+    end
   end
 end

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "1.2.0".freeze
+  VERSION = "1.5.0".freeze
 end

data/lib/relaton_un/xml_parser.rb

@@ -13,28 +13,31 @@ module RelatonUn
       # @return [Hash]
       def item_data(item)
         data = super
-        data[:session] = fetch_session item
-        data[:distribution] = item.at("distribution")&.text
+        ext = item.at "./ext"
+        return data unless ext
+
+        data[:submissionlanguage] = fetch_submissionlanguage ext
+        data[:session] = fetch_session ext
+        data[:distribution] = ext.at("distribution")&.text
+        data[:job_number] = ext.at("job_number")&.text
         data
       end
 
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
-      # @param item [Nokogiri::XML::Element]
+      # @param ext [Nokogiri::XML::Element]
       # @return [RelatonUn::Session]
-      def fetch_session(item)
-        session = item.at "./ext/session"
-        return unless session
-
+      def fetch_session(ext) # rubocop:disable Metrics/CyclomaticComplexity
+        session = ext.at "./session"
         RelatonUn::Session.new(
           session_number: session.at("number")&.text,
           session_date: session.at("session-date")&.text,
           item_number: session.xpath("item-number").map(&:text),
           item_name: session.xpath("item-name").map(&:text),
           subitem_name: session.xpath("subitem-name").map(&:text),
-          collaboration: session.at("collaboration")&.text,
+          collaborator: session.at("collaborator")&.text,
           agenda_id: session.at("agenda-id")&.text,
-          item_footnote: session.at("item-footnote")&.text,
+          item_footnote: session.at("item-footnote")&.text
         )
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -45,9 +48,15 @@ module RelatonUn
         eg = ext.at("./editorialgroup")
         return unless eg
 
-        committee = eg&.xpath("committee")&.map &:text
+        committee = eg.xpath("committee").map &:text
         EditorialGroup.new committee
       end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [Array<String>]
+      def fetch_submissionlanguage(ext)
+        ext.xpath("./submissionlanguage").map(&:text)
+      end
     end
   end
 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.2.0"
+  spec.add_dependency "relaton-bib", "~> 1.5.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.2.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.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'