relaton-un 0.1.1 → 1.1.0

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", "PRO" => "provisional" }.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.1.1".freeze
+  VERSION = "1.1.0".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/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) }
@@ -40,8 +41,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "unf_ext", ">= 0.0.7.7"
   spec.add_dependency "faraday"
   spec.add_dependency "http-cookie"
-  spec.add_dependency "relaton-bib", "~> 0.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.1.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: 0.1.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -123,21 +123,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: unf_ext
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.7.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: http-cookie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,33 +151,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http-cookie
+  name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: relaton-bib
+  name: unf_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.0.7.7
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -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: