relaton-un 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8126ad17a8daeba18d98bf60b9b058cac2a7980d2bf9dc86135753c7c6d465f4
-  data.tar.gz: b69257fbdfb2688ccb6a093b5cfd19478c6663d7b894cad2943d493db013d3aa
+  metadata.gz: 4bd7b73723491abfe38ea7c1018dbb1844114f5c22160dd11af15cd6a858e899
+  data.tar.gz: ef0e87e1c151a3affb21b16d3257b7d5a025fbbe81354749f1b21897532b4b9c
 SHA512:
-  metadata.gz: 23647bafcdd4658c5b28fb522856428821814d477e47fbbc27367d5817a9d56048a8716cfd6312b4d81aa245a73409e3d831024f74cb667f73fa7b4489f2f9cb
-  data.tar.gz: 8ead46ec5d80a0a751dc4c39da26a07d2371358505f6eea8b442d4448459a225787e10d7af807e13283296dfd162d8353972dcbe1ec5821ef94116b9a383366f
+  metadata.gz: 8347b35ddab7041cf6c7478457731d9e76ae8e84acfb9bbe9d10e17fcec7cbe71aeb3f7ef2e35b979ceb544066c7c7a2ea302dde95796a092f1115391b97587c
+  data.tar.gz: 7b003c2eb2f8c3baa4110c01292d68d044a19359a30b297ee885080db0e979f587e59f7478733c15376de4dc4dad92a7c16d7292ef3fb92a76019808341210d9

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

@@ -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
 

data/lib/relaton_un/hit_collection.rb

@@ -103,7 +103,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,6 +156,10 @@ 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]

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,18 +14,23 @@ 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]}"
       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]
@@ -31,9 +38,13 @@ module RelatonUn
     def to_xml(builder = nil, **opts)
       super(builder, **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
@@ -41,7 +52,12 @@ module RelatonUn
     # @return [Hash]
     def to_hash
       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
   end

data/lib/relaton_un/version.rb

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

data/lib/relaton_un/xml_parser.rb

@@ -13,19 +13,22 @@ 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)
+        session = ext.at "./session"
         RelatonUn::Session.new(
           session_number: session.at("number")&.text,
           session_date: session.at("session-date")&.text,
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-un
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase