relaton-un 1.0.1 → 1.4.0

data/lib/relaton_un/version.rb

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

data/lib/relaton_un/xml_parser.rb

@@ -1,48 +1,43 @@
 module RelatonUn
-  class XMLParser < RelatonIsoBib::XMLParser
+  class XMLParser < RelatonBib::XMLParser
     class << self
-      # @param xml [String]
-      # @return [RelatonUn::UnBibliographicItem, NilClass]
-      def from_xml(xml)
-        doc = Nokogiri::XML xml
-        doc.remove_namespaces!
-        item = doc.at("/bibitem|/bibdata")
-        if item
-          UnBibliographicItem.new(item_data(item))
-        else
-          warn "[relaton-un] WARNING: can't find bibitem or bibdata element in"\
-          " the XML"
-        end
-      end
-
       private
 
+      # @param item_hash [Hash]
+      # @return [RelatonBib::BibliographicItem]
+      def bib_item(item_hash)
+        UnBibliographicItem.new item_hash
+      end
+
       # @param item [Nokogiri::XML::Element]
       # @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
@@ -53,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-iso-bib", ">= 1.0.1"
+  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.0.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-09-18 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-iso-bib
+  name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        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'