relaton-un 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bd7b73723491abfe38ea7c1018dbb1844114f5c22160dd11af15cd6a858e899
-  data.tar.gz: ef0e87e1c151a3affb21b16d3257b7d5a025fbbe81354749f1b21897532b4b9c
+  metadata.gz: 613a9a82547cda0760295b57949e565c868f3fd2b660a7f7d813ba6e224a00b8
+  data.tar.gz: 5aa7797780314ab7887b540fb84105a0dccab4a36f1c5fabcf5f814e70d4b2e8
 SHA512:
-  metadata.gz: 8347b35ddab7041cf6c7478457731d9e76ae8e84acfb9bbe9d10e17fcec7cbe71aeb3f7ef2e35b979ceb544066c7c7a2ea302dde95796a092f1115391b97587c
-  data.tar.gz: 7b003c2eb2f8c3baa4110c01292d68d044a19359a30b297ee885080db0e979f587e59f7478733c15376de4dc4dad92a7c16d7292ef3fb92a76019808341210d9
+  metadata.gz: 4bf072e67d014ac53bc8a95650a87fcd079420cf93fe2b47ab051a6c41b406b5e75d45127b5d6ba8bab3a6c9279604aee9a059b620c4bc167659f19eb502fcbf
+  data.tar.gz: 8d17af6fa62c494921521a3a4ce417f0fd604ce560949a587d1b37db1230d8a889cfdb831fcd0cef78bdbc676b594680abc51a75e06f67befb464b81756c1d8e

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/lib/relaton_un/editorialgroup.rb

@@ -21,5 +21,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/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,7 +75,7 @@ module RelatonUn
         distribution: fetch_distribution,
         editorialgroup: fetch_editorialgroup,
         classification: fetch_classification,
-        job_number: hit[:job_number],
+        job_number: hit[:job_number]
       )
     end
     # rubocop:enable Metrics/MethodLength
@@ -131,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

@@ -48,12 +48,12 @@ 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",
+        "//textarea"
       ).reduce([]) do |m, i|
         v = case i[:name]
             when "view:_id1:_id2:txtSymbol" then text
@@ -91,7 +91,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", ""),

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

@@ -24,7 +24,8 @@ module RelatonUn
     # @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
@@ -35,7 +36,7 @@ module RelatonUn
 
     # @param builder [Nokogiri::XML::Builder]
     # @param bibdata [TrueClasss, FalseClass, NilClass]
-    def to_xml(builder = nil, **opts)
+    def to_xml(builder = nil, **opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
       super(builder, **opts) do |b|
         b.ext do
           b.doctype doctype if doctype
@@ -60,5 +61,19 @@ module RelatonUn
       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.1".freeze
+  VERSION = "1.3.0".freeze
 end

data/lib/relaton_un/xml_parser.rb

@@ -27,7 +27,7 @@ module RelatonUn
 
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonUn::Session]
-      def fetch_session(ext)
+      def fetch_session(ext) # rubocop:disable Metrics/CyclomaticComplexity
         session = ext.at "./session"
         RelatonUn::Session.new(
           session_number: session.at("number")&.text,
@@ -35,9 +35,9 @@ module RelatonUn
           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

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.3.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.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-08-21 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.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: unf_ext
   requirement: !ruby/object:Gem::Requirement