relaton-un 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 015c42748ac36cf87b341555c5b951fc1cf4afb86ed7308bad2172358c6480f0
-  data.tar.gz: b4c0f18281564885142a4b5b1f3b019fab1633681927817e7b1575d6888b420d
+  metadata.gz: a0fcd871844a8cafc3b613fc6e77ccd219717122b95bfdfafca8362b46f63490
+  data.tar.gz: 952d86d121183c5a32e822a2f7bb3ae651851f87999dfe21ccf0bb0b302fbf5f
 SHA512:
-  metadata.gz: 2d63b262ab2ddfb66ac9a698cd705835a7e2ea04b40f38d55d657843bb8d41a8ef3e32256692c7fd05f177b8ffb2c12cb51047f94bea81743504a605bc599186
-  data.tar.gz: a061b39e0a51c7bd210096e7c615e48140db1e704565c256c04c9e9ae3601ebe8860a0a65d494db1b9c9622245a6114c2a4aa59510be5101a4cf671e40bbfb21
+  metadata.gz: 03c2ccfe9ce6cce797f2a5c905b74976793c8245ed36b813dfaf55e3989e1cdb41426a6d52a357c71cffa42d67427d78ae6c4d3418fdf471b176276557ff2579
+  data.tar.gz: 9f2c4b1db54d38a5e48407a33d01aab3d2e98c8d6eec700262f33f00505d7a2339378a5511ba600cad13a01ee710c5e4ba1e6ef703282644f4febe46b660fad0

data/grammars/un.rng

@@ -107,7 +107,9 @@
       <zeroOrMore>
         <ref name="submissionlanguage"/>
       </zeroOrMore>
-      <ref name="editorialgroup"/>
+      <optional>
+        <ref name="editorialgroup"/>
+      </optional>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>

data/lib/relaton_un/editorialgroup.rb

@@ -0,0 +1,25 @@
+module RelatonUn
+  class EditorialGroup
+    include RelatonBib
+
+    # @return [Array<String>]
+    attr_reader :committee
+
+    # @param committee [Array<String>]
+    def initialize(committee)
+      @committee = committee
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.editorialgroup do |b|
+        committee.each { |c| b.committee c }
+      end
+    end
+
+    # @return [Array<Hash>, Hash]
+    def to_hash
+      single_element_array(committee.map { |c| { "committee" => c } })
+    end
+  end
+end

data/lib/relaton_un/hash_converter.rb

@@ -1,5 +1,33 @@
 module RelatonUn
-  class HashConverter < RelatonBib::HashConverter
+  class HashConverter < RelatonIsoBib::HashConverter
+    class << self
+      # @override RelatonIsoBib::HashConverter.hash_to_bib
+      # @param args [Hash]
+      # @param nested [TrueClass, FalseClass]
+      # @return [Hash]
+      def hash_to_bib(args, nested = false)
+        ret = super
+        return if ret.nil?
 
+        session_hash_to_bib ret
+        ret
+      end
+
+      private
+
+      # @param ret [Hash]
+      def session_hash_to_bib(ret)
+        ret[:session] = Session.new(ret[:session]) if ret[:session]
+      end
+
+      # @param ret [Hash]
+      def editorialgroup_hash_to_bib(ret)
+        eg = ret[:editorialgroup]
+        return unless eg
+
+        committee = eg.map { |e| e[:committee] }
+        ret[:editorialgroup] = EditorialGroup.new array(committee)
+      end
+    end
   end
 end

data/lib/relaton_un/hit.rb

@@ -3,6 +3,51 @@
 module RelatonUn
   # Hit.
   class Hit < RelatonBib::Hit
+    # rubocop:disable Layout/LineLength
+
+    # There is distribution PRO (A/47/PV.102/CORR.1, A/47/PV.54)
+    BODY = {
+      "A" => "General Assembly",
+      "E" => "Economic and Social Council",
+      "S" => "Security Council",
+      "T" => "Trusteeship Council",
+      "ACC" => "Administrative Committee on Coordination",
+      "AT" => "United Nations Administrative Tribunal",
+      "CAT" => "Committee against Torture",
+      "CCPR" => "Human Rights Committee",
+      "CD" => "Conference on Disarmament",
+      "CEDAW" => "Committee on the Elimination of All Forms of Discrimination against Women",
+      "CERD" => "Committee on the Elimination of Racial Discrimination",
+      "CRC" => "Committee on the Rights of the Child",
+      "DC" => "Disarmament Commission",
+      "DP" => "United Nations Development Programme",
+      "HS" => "United Nations Centre for Human Settlements (HABITAT)",
+      "TD" => "United Nations Conference on Trade and Development",
+      "UNEP" => "United Nations Environment Programme",
+      "TRADE" => "Committee on Trade",
+      "CEFACT" => "Centre for Trade Facilitation and Electronic Business",
+      "C.1" => "Disarmament and International Security Committee",
+      "C.2" => "Economic and Financial Committee",
+      "C.3" => "Social, Humanitarian & Cultural Issues",
+      "C.4" => "Special Political and Decolonization Committee",
+      "C.5" => "Administrative and Budgetary Committee",
+      "C.6" => "Sixth Committee (Legal)",
+      "PC" => "Preparatory Committee",
+      "AEC" => "Atomic Energy Commission",
+      "AGRI" => "Committee on Agriculture",
+      "AMCEN" => "African Ministerial Conference on the Environment",
+      "AMCOW" => "African Ministers’ Council on Water",
+      "ECA" => "Economic Commission for Africa",
+      "ESCAP" => "Economic and Social Commission for Asia and Pacific",
+      "ECE" => "Economic Commission for Europe",
+      "ECWA" => "Economic Commission for Western Asia",
+      "UNFF" => "United Nations Forum on Forests",
+      "ENERGY" => "Committee on Sustainable Energy",
+      "FAO" => "Food and Agriculture Organization",
+      "UNCTAD" => "United Nations Conference on Trade and Development",
+    }.freeze
+    # rubocop:enable Layout/LineLength
+
     # Parse page.
     # @return [RelatonUn::UnBibliographicItem]
     def fetch
@@ -11,48 +56,90 @@ module RelatonUn
 
     private
 
+    # rubocop:disable Metrics/MethodLength
+
+    # @return [RelatonUn::UnBibliographicItem]
     def un_bib_item
       UnBibliographicItem.new(
         type: "standard",
         fetched: Date.today.to_s,
-        docid: docid,
+        docid: fetch_docid,
         docnumber: hit[:ref],
         language: ["en"],
         script: ["Latn"],
-        title: title,
-        date: date,
-        link: link,
-        keyword: keyword
+        title: fetch_title,
+        date: fetch_date,
+        link: fetch_link,
+        keyword: fetch_keyword,
+        session: fetch_session,
+        distribution: fetch_distribution,
+        editorialgroup: fetch_editorialgroup,
       )
     end
+    # rubocop:enable Metrics/MethodLength
 
     # @return [Array<RelatonBib::DocumentIdentifier>]
-    def docid
-      [RelatonBib::DocumentIdentifier.new(id: hit[:ref], type: "UN")]
+    def fetch_docid
+      hit[:symbol].map do |s|
+        RelatonBib::DocumentIdentifier.new(id: s, type: "UN")
+      end
     end
 
     # @return [Array<RelatonBib::TypedTitleString>]
-    def title
-      fs = RelatonBib::FormattedString.new(content: hit[:title], language: "en", script: "Latn")
-      [RelatonBib::TypedTitleString.new(type: "main", title: fs)]
+    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" }]
     end
 
     # @return [Array<RelatonBib::BibliographicDate>]
-    def date
+    def fetch_date
       d = []
-      d << RelatonBib::BibliographicDate.new(type: "published", on: hit[:date_pub]) if hit[:date_pub]
-      d << RelatonBib::BibliographicDate.new(type: "issued", on: hit[:date_rel]) if hit[:date_rel]
+      d << bibdate("published", hit[:date_pub]) if hit[:date_pub]
+      d << bibdate("issued", hit[:date_rel]) if hit[:date_rel]
       d
     end
 
+    # @param type [String]
+    # @param on [String]
+    # @return [RelatonBib::BibliographicDate]
+    def bibdate(type, on)
+      RelatonBib::BibliographicDate.new type: type, on: on
+    end
+
     # @return [Array<RelatonBib::TypedUri>]
-    def link
+    def fetch_link
       hit[:link].map { |l| RelatonBib::TypedUri.new l }
     end
 
     # @return [Array<String>]
-    def keyword
+    def fetch_keyword
       hit[:keyword].split(", ")
     end
+
+    # @return [RelatonUn::Session]
+    def fetch_session
+      Session.new(session_number: hit[:session], agenda_id: hit[:agenda])
+    end
+
+    # @return [String]
+    def fetch_distribution
+      UnBibliographicItem::DISTRIBUTIONS[hit[:distribution]]
+    end
+
+    # @return [RelatonUn::EditorialGroup, NilClass]
+    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
+        else m
+        end
+      end.uniq
+      return unless tc.any?
+
+      RelatonUn::EditorialGroup.new tc
+    end
   end
 end

data/lib/relaton_un/hit_collection.rb

@@ -6,7 +6,8 @@ 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_3) "\
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36"
     DOMAIN = "https://documents.un.org"
     BOUNDARY = "----WebKitFormBoundary6hkaBvITDck8dHCn"
 
@@ -17,52 +18,10 @@ module RelatonUn
       @jar = HTTP::CookieJar.new
       @http = Net::HTTP.new @uri.host, @uri.port
       @http.use_ssl = true
+      @http.read_timeout = 120
       if (form_resp = get_page)
-        form = Nokogiri::HTML form_resp.body
-        form_data = form.xpath(
-          "//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:cbType" then "FP"
-              when "view:_id1:_id2:cbSort" then "R"
-              when "$$xspsubmitid" then "view:_id1:_id2:_id130"
-              when "$$xspsubmitscroll" then "0|167"
-              else i[:value]
-              end
-          m << %{--#{BOUNDARY}}
-          m << %{Content-Disposition: form-data; name="#{i[:name]}"\r\n\r\n#{v}}
-        end
-        form_data << %{--#{BOUNDARY}--\r\n}
-        req = Net::HTTP::Post.new form.at("//form")[:action]
-        set_headers req
-        req["Content-Type"] = "multipart/form-data, boundary=#{BOUNDARY}"
-        req.body = form_data.join("\r\n")
-        resp = @http.request req
-        page_resp = get_page URI.parse(resp["location"]).request_uri
-        doc = Nokogiri::HTML page_resp.body
-        @array = doc.css("div.viewHover").map do |item|
-          ref = item.at("div/div/a")&.text&.sub "\u00A0", ""
-          title = item.at("div/div/span")&.text
-          keyword = item.at("div[3]/div[5]/span")&.text
-          date_pub = item.at("//label[.='Publication Date: ']/following-sibling::span")&.text
-          en = item.at("//span[.='ENGLISH']/../..")
-          date_rel = en.at("./following-sibling::span[contains(@id, 'cfRelDateE')]").text
-          link = en.xpath("//a[contains(@title, 'Open')]").map do |l|
-            { content: l[:href], type: l[:title].match(/PDF|Word/).to_s.downcase }
-          end
-          Hit.new({
-            ref: ref,
-            title: title,
-            keyword: keyword,
-            date_pub: date_pub,
-            date_rel: date_rel,
-            link: link
-          }, self)
-        end
+        doc = Nokogiri::HTML page_resp(form_resp, text).body
+        @array = doc.css("div.viewHover").map { |item| hit item }
       end
     end
 
@@ -84,9 +43,125 @@ module RelatonUn
       get_page request_uri, deep + 1
     end
 
+    # rubocop:disable Metrics/MethodLength
+
+    # @param form [Nokogiri::HTML::Document]
+    # @param text [String]
+    # @return [Array<String>]
+    def form_data(form, text)
+      fd = form.xpath(
+        "//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:cbType" then "FP"
+            when "view:_id1:_id2:cbSort" then "R"
+            when "$$xspsubmitid" then "view:_id1:_id2:_id130"
+            when "$$xspsubmitscroll" then "0|167"
+            else i[:value]
+            end
+        m << %{--#{BOUNDARY}}
+        m << %{Content-Disposition: form-data; name="#{i[:name]}"\r\n\r\n#{v}}
+      end
+      fd << %{--#{BOUNDARY}--\r\n}
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    # @param form_resp [Net::HTTPOK]
+    # @param text [String]
+    # @return [Net::HTTPOK]
+    def page_resp(form_resp, text)
+      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.body = form_data(form, text).join("\r\n")
+      resp = @http.request req
+      get_page URI.parse(resp["location"]).request_uri
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [RelatonUn::Hit]
+    def hit(item)
+      Hit.new(hit_data(item), self)
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [Hash]
+    def hit_data(item)
+      en = item.at("//span[.='ENGLISH']/../..")
+      {
+        ref: item.at("div/div/a")&.text&.sub("\u00A0", ""),
+        symbol: symbol(item),
+        title: item.at("div/div/span")&.text,
+        keyword: item.at("div[3]/div[5]/span")&.text,
+        date_pub: date_pub(item),
+        date_rel: date_rel(en),
+        link: link(en),
+        session: session(item),
+        agenda: agenda(item),
+        distribution: distribution(item)
+      }
+    end
+
+    # @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
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [String]
+    def date_pub(item)
+      item.at("//label[.='Publication Date: ']/following-sibling::span")&.text
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [String]
+    def date_rel(item)
+      item.at("./following-sibling::span[contains(@id, 'cfRelDateE')]")&.text
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [Array<Hash>]
+    def link(item)
+      item.xpath("//a[contains(@title, 'Open')]").map do |l|
+        {
+          content: l[:href],
+          type: l[:title].match(/PDF|Word/).to_s.downcase,
+        }
+      end
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [String]
+    def session(item)
+      item.at("//label[.='Session / Year:']/following-sibling::span")&.text
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [String]
+    def agenda(item)
+      item.at("//label[.='Agenda Item(s):']/following-sibling::span")&.text
+    end
+
+    # @param item [Nokogiri::XML::Element]
+    # @return [String]
+    def distribution(item)
+      item.at("//label[.='Distribution:']/following-sibling::span")&.text
+    end
+
+    # rubocop:disable Metrics/MethodLength
+
+    # @param req [Net::HTTP::Get, Net::HTTP::Post]
     def set_headers(req)
       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"
+      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"
       req["Accept-Encoding"] = "gzip, deflate, br"
       req["Cache-Control"] = "max-age=0"
       req["Connection"] = "keep-alive"
@@ -98,7 +173,9 @@ module RelatonUn
       req["Upgrade-Insecure-Requests"] = "1"
       req["User-Agent"] = AGENT
     end
+    # rubocop:enable Metrics/MethodLength
 
+    # @param req [Net::HTTP::Get, Net::HTTP::Post]
     def set_cookie(req)
       req["Cookie"] = HTTP::Cookie.cookie_value @jar.cookies(@uri)
     end

data/lib/relaton_un/session.rb

@@ -0,0 +1,65 @@
+module RelatonUn
+  class Session
+    include RelatonBib
+
+    # @return [String, NilClass]
+    attr_reader :session_number, :collaboration, :agenda_id, :item_footnote
+
+    # @return [Date, NilClass]
+    attr_reader :session_date
+
+    # @return [Array<String>]
+    attr_reader :item_number, :item_name, :subitem_name
+
+    # @param session_number [String]
+    # @param session_date [String]
+    # @param item_number [Array<String>]
+    # @pqrqm item_name [Array<String>]
+    # @pqrqm subitem_name [Array<String>]
+    # @param collaboration [String]
+    # @param agenda_id [String]
+    # @param item_footnote [String]
+    def initialize(**args)
+      @session_number = args[:session_number]
+      @session_date = Date.parse args[:session_date] if args[:session_date]
+      @item_number = args.fetch(:item_number, [])
+      @item_name = args.fetch(:item_name, [])
+      @subitem_name = args.fetch(:subitem_name, [])
+      @collaboration = args[:collaboration]
+      @agenda_id = args[:agenda_id]
+      @item_footnote = args[:item_footnote]
+    end
+
+    # rubocop:disable Metrics/AbcSize
+
+    # @param [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.session do |b|
+        b.number session_number if session_number
+        b.send "session-date", session_date.to_s if session_date
+        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.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
+    # @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?
+      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
+      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
+  end
+end

data/lib/relaton_un/un_bibliographic_item.rb

@@ -1,8 +1,44 @@
 module RelatonUn
-  class UnBibliographicItem < RelatonBib::BibliographicItem
+  class UnBibliographicItem < RelatonIsoBib::IsoBibliographicItem
     TYPES = %w[
       recommendation plenary addendum communication corrigendum reissue agenda
       budgetary sec-gen-notes expert-report resolution
     ].freeze
+
+    DISTRIBUTIONS = { "GEN" => "general", "LTD" => "limited",
+                      "DER" => "restricted" }.freeze
+
+    # @return [RelatonUn::Session, NilClass]
+    attr_reader :session
+
+    # @return [String, NilClass]
+    attr_reader :distribution
+
+    # @param session [RelatonUn::Session, NilClass]
+    # @param distribution [String]
+    def initialize(**args)
+      if args[:distribution] && !DISTRIBUTIONS.has_value?(args[:distribution])
+        warn "[relaton-un] WARNING: invalid distribution: #{args[:distribution]}"
+      end
+      @distribution = args.delete :distribution
+      @session = args.delete :session
+      super **args
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    # @param bibdata [TrueClasss, FalseClass, NilClass]
+    def to_xml(builder = nil, **opts)
+      super(builder, **opts) do |b|
+        b.distribution distribution if distribution
+        session&.to_xml b if session
+      end
+    end
+
+    # @return [Hash]
+    def to_hash
+      hash = super
+      hash["session"] = session.to_hash if session
+      hash
+    end
   end
 end

data/lib/relaton_un/un_bibliography.rb

@@ -9,9 +9,11 @@ module RelatonUn
       def search(text)
         HitCollection.new text
       rescue SocketError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-             OpenSSL::SSL::SSLError, Errno::ETIMEDOUT
-        raise RelatonBib::RequestError, "Could not access #{HitCollection::DOMAIN}"
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+             Net::ProtocolError, Net::ReadTimeout, OpenSSL::SSL::SSLError,
+             Errno::ETIMEDOUT => e
+        raise RelatonBib::RequestError,
+              "Could not access #{HitCollection::DOMAIN}: #{e.message}"
       end
 
       # @param ref [String] document reference
@@ -23,7 +25,8 @@ module RelatonUn
         /^(UN\s)?(?<code>.*)/ =~ ref
         result = isobib_search_filter(code)
         if result
-          warn "[relaton-un] (\"#{ref}\") found #{result.fetch.docidentifier.first.id}"
+          warn "[relaton-un] (\"#{ref}\") "\
+            "found #{result.fetch.docidentifier[0].id}"
           result.fetch
         end
       end
@@ -36,7 +39,7 @@ module RelatonUn
       # @return [RelatonUn::HitCollection]
       def isobib_search_filter(code)
         result = search(code)
-        result.select { |i| i.hit[:ref] == code }.first
+        result.select { |i| i.hit[:symbol].include? code }.first
       end
     end
   end

data/lib/relaton_un/version.rb

@@ -1,3 +1,3 @@
 module RelatonUn
-  VERSION = "0.2.0".freeze
+  VERSION = "0.2.1".freeze
 end

data/lib/relaton_un/xml_parser.rb

@@ -1,16 +1,61 @@
 module RelatonUn
-  class XMLParser < RelatonBib::XMLParser
+  class XMLParser < RelatonIsoBib::XMLParser
     class << self
+      # @param xml [String]
+      # @return [RelatonUn::UnBibliographicItem, NilClass]
       def from_xml(xml)
         doc = Nokogiri::XML xml
         doc.remove_namespaces!
-        titem = doc.at("/bibitem|/bibdata")
-        if titem
-          UnBibliographicItem.new(item_data(titem))
+        item = doc.at("/bibitem|/bibdata")
+        if item
+          UnBibliographicItem.new(item_data(item))
         else
-          warn "[relaton-un] can't find bibitem or bibdata element in the XML"
+          warn "[relaton-un] WARNING: can't find bibitem or bibdata element in"\
+          " the XML"
         end
       end
+
+      private
+
+      # @param item [Nokogiri::XML::Element]
+      # @return [Hash]
+      def item_data(item)
+        data = super
+        data[:session] = fetch_session item
+        data[:distribution] = item.at("distribution")&.text
+        data
+      end
+
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
+      # @param item [Nokogiri::XML::Element]
+      # @return [RelatonUn::Session]
+      def fetch_session(item)
+        session = item.at "./ext/session"
+        return unless 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,
+          agenda_id: session.at("agenda-id")&.text,
+          item_footnote: session.at("item-footnote")&.text,
+        )
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonUn::EditorialGroup]
+      def fetch_editorialgroup(ext)
+        eg = ext.at("./editorialgroup")
+        return unless eg
+
+        committee = eg&.xpath("committee")&.map &:text
+        EditorialGroup.new committee
+      end
     end
   end
 end

data/lib/relaton_un.rb

@@ -1,4 +1,4 @@
-require "relaton_bib"
+require "relaton_iso_bib"
 require "relaton_un/version"
 require "relaton_un/un_bibliographic_item"
 require "relaton_un/un_bibliography"
@@ -6,6 +6,8 @@ require "relaton_un/hit_collection"
 require "relaton_un/hit"
 require "relaton_un/hash_converter"
 require "relaton_un/xml_parser"
+require "relaton_un/session"
+require "relaton_un/editorialgroup"
 
 module RelatonUn
   class Error < StandardError; end

data/relaton_un.gemspec

@@ -1,31 +1,32 @@
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'relaton_un/version'
+require "relaton_un/version"
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = "relaton-un"
   spec.version       = RelatonUn::VERSION
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonIso: retrieve CC Standards for bibliographic use "\
-                       "using the IsoBibliographicItem model"
-  spec.description   = "RelatonIso: retrieve CC Standards for bibliographic use "\
-                       "using the IsoBibliographicItem model"
+  spec.summary       = "RelatonIso: retrieve CC Standards for bibliographic "\
+                       "use using the IsoBibliographicItem model"
+  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.4.0")
 
-  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
   spec.metadata["homepage_uri"] = spec.homepage
-  # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
+  spec.metadata["source_code_uri"] = spec.homepage
   # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -42,6 +43,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday"
   spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 0.9.0"
+  spec.add_dependency "relaton-iso-bib", ">= 0.9.2"
   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: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -151,19 +151,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement
@@ -205,10 +205,12 @@ files:
 - grammars/reqt.rng
 - grammars/un.rng
 - lib/relaton_un.rb
+- lib/relaton_un/editorialgroup.rb
 - lib/relaton_un/hash_converter.rb
 - lib/relaton_un/hit.rb
 - lib/relaton_un/hit_collection.rb
 - lib/relaton_un/processor.rb
+- lib/relaton_un/session.rb
 - lib/relaton_un/un_bibliographic_item.rb
 - lib/relaton_un/un_bibliography.rb
 - lib/relaton_un/version.rb
@@ -220,6 +222,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   homepage_uri: https://github.com/relaton/relaton-un
+  source_code_uri: https://github.com/relaton/relaton-un
 post_install_message: 
 rdoc_options: []
 require_paths: