relaton-iho 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77ecf973a90c8af2ae4a0f67edc3f313f850afe7a2d99385923bf8e84cd05c6b
-  data.tar.gz: fd1ad0bd00a7cd28dcc5e1a44cf2dc1a71ffbfce90893f526bb0a80552bb4208
+  metadata.gz: a6a255a7706913443c4114b78fb417b67de9955f843cd434959c9ef6eb4009f6
+  data.tar.gz: 0d367ff3ad8c25f6873223bbc846c95c92e21c9dfdd5df6034abbb5f59b7cb40
 SHA512:
-  metadata.gz: 6ccb427bc61bf0b5550baad8cf0511086bc0c0ae5407ca60062f191edb31630a706f1b59d4d07c7564c550849fa9e83b627c70a76eda6c065003c6301ffa1f35
-  data.tar.gz: '08a06a4eff69ace8c8437916d8cd916cd7e48fdcd2208a47d0dc6fa2dc75db752d175d0d60b5df7003bb35e1bc65871a97c9e65b30031dfc4f82bf8bead3d52d'
+  metadata.gz: 4c1f2e6df7dece59c0efdfd2e1605475045f2d6c9305ad9b0650ff68db17a76513412061ffb6663a0c370f2751e4dcae31a12e9acca34878a99378c546f2f846
+  data.tar.gz: 4fe6fad0a66d7b15c898ca52b420926f3232ec0db93e49590870dc9c2dc8062b1d5aa187219b0bd7f837967822fe798b6780ec5a15ae5ee7efafe5ed0e35a9f3

data/lib/relaton_iho.rb

@@ -5,6 +5,7 @@ require "relaton_iho/iho_bibliography"
 require "relaton_iho/hash_converter"
 require "relaton_iho/xml_parser"
 require "relaton_iho/editorial_group"
+require "relaton_iho/iho_group"
 require "relaton_iho/comment_periond"
 require "relaton_iho/iho_bibliographic_item"
 

data/lib/relaton_iho/editorial_group.rb

@@ -1,7 +1,6 @@
 module RelatonIho
   class EditorialGroupCollection
     extend Forwardable
-    include RelatonBib
 
     def_delegators :@collection, :first, :any?
 
@@ -18,9 +17,9 @@ module RelatonIho
       collection.each { |eg| eg.to_xml builder }
     end
 
-    # @return [Hash]
+    # @return [Hash, Array<Hash>]
     def to_hash
-      single_element_array collection
+      collection.map &:to_hash
     end
 
     # @param prefix [String]
@@ -36,35 +35,28 @@ module RelatonIho
   end
 
   class EditorialGroup
-    # @return [String]
-    attr_reader :committee
+    include RelatonBib
 
-    # @return [String, nil]
-    attr_reader :workgroup
+    # @return [Array<RelatonIho::Committee, RelatonIho::Commission,
+    #          RelatonIho::Workgroup>]
+    attr_accessor :workgroup
 
-    # @parma committee [String]
-    # @param workgroup [String, nil]
-    def initialize(committee:, workgroup: nil)
-      unless %[hssc ircc council ihr bureau imo msc dcdb].include? committee.downcase
-        warn "[relaton-iho] WARNING: invalid committee: #{committee}"
-      end
-      @committee = committee
+    # @param workgroup [Array<RelatonIho::Committee, RelatonIho::Commission,
+    #                   RelatonIho::Workgroup>]
+    def initialize(workgroup)
       @workgroup = workgroup
     end
 
     # @param builder [Nokogiro::XML::Builder]
     def to_xml(builder)
       builder.editorialgroup do
-        builder.committee committee
-        builder.workgroup workgroup if workgroup
+        workgroup.each { |wg| wg.to_xml builder }
       end
     end
 
-    # @return [Hash]
+    # @return [Hash, Array<Hash>]
     def to_hash
-      hash = { "committee" => committee }
-      hash["workgroup"] = workgroup if workgroup
-      hash
+      single_element_array workgroup
     end
 
     # @param prefix [String]
@@ -74,8 +66,7 @@ module RelatonIho
       pref = prefix.empty? ? prefix : prefix + "."
       pref += "editorialgroup"
       out = count > 1 ? "#{pref}::\n" : ""
-      out += "#{pref}.committee:: #{committee}\n"
-      out += "#{pref}.workgroup:: #{workgroup}\n" if workgroup
+      workgroup.each { |wg| out += wg.to_asciibib pref, workgroup.size }
       out
     end
   end

data/lib/relaton_iho/eg.yml

@@ -0,0 +1,191 @@
+HSSC:
+  previously: CHRIS
+  name: Hydrographic Services and Standards Committee
+  class: Committee
+  subgroup:
+    S-100WG: 
+      name: S-100 Working Group
+      class: Workgroup
+    ENCWG:
+      name: ENC STANDARDS MAINTENANCE WORKING GROUP
+      class: Workgroup
+    NCWG:
+      previously: CSPCWG
+      name: NAUTICAL CARTOGRAPHY WORKING GROUP
+      class: Workgroup
+    NIPWG:
+      name: NAUTICAL INFORMATION PROVISION WORKING GROUP
+      class: Workgroup
+    DQWG:
+      name: DATA QUALITY WORKING GROUP
+      class: Workgroup
+    TWCWG:
+      name: Tides, Water Level and Currents Working Group
+      class: Workgroup
+    HDWG:
+      name: Hydrographic Dictionary Working Group
+      class: Workgroup
+    ABLOS:
+      name: Advisory Board on Law of the Sea
+      class: Workgroup
+    HSPT:
+      name: Project Team on Standards for Hydrographic Surveys
+      class: Workgroup
+    CPRNW:
+      name: Commission for the Promulgation of Radio Navigation Warnings
+      class: Commission
+    TSMAD:
+      name: Transfer Standard Maintenance and Application Development Working Group
+      class: Workgroup
+IRCC:
+  name: Inter-Regional Coordination Committee
+  class: Committee
+  subgroup:
+    RHCs:
+      name: Regional Hydrographic Commissions
+      class: Commission
+      subgroup:
+        NHC:
+          name: Nordic HC
+          class: Commission
+        NSHC:
+          name: North Sea HC
+          class: Commission
+        MBSHC:
+          name: Mediterranean and Black Seas HC
+          class: Commission
+          subgroup:
+            BASWG:
+              name: Black and Azov Seas Working Group
+              class: Workgroup
+        ARHC:
+          name: Arctic RHC
+          class: Commission
+        BHSC:
+          name: Baltic Sea HC
+          class: Commission
+        USCHC:
+          name: US / Canada HC
+          class: Commission
+        EAHS:
+          name: East Asia HC
+          class: Commission
+        EAtHC:
+          name: Eastern Atlantic HC
+          class: Commission
+        SEPRHC:
+          name: South-East Pacific RHC
+          class: Commission
+        SWPHC:
+          name: South-West Pacific HC
+          class: Commission
+          subgroup:
+            ICCWG:
+              name: International Charting Coordination Working Group
+              class: Workgroup
+        MACHC:
+          name: Meso American & Caribbean Sea HC
+          class: Commission
+        SAIHC:
+          name: Southern African and Islands HC
+          class: Commission
+        NIOHC:
+          name: North Indian Ocean HC
+          class: Commission
+        RSAHC:
+          name: ROPME Sea Area HC
+          class: Commission
+          subgroup:
+            ICCWG:
+              name: International Charting Coordination Working Group
+              class: Workgroup
+        SWAtHC:
+          name: South West Atlantic HC
+          class: Commission
+    HCA:
+      name: Hydrographic Commission on Antarctica
+      class: Commission
+      subgroup:
+        HPWG:
+          name: HCA Hydrography Priorities Working Group
+          class: Workgroup
+    WWNWS:
+      name: World-Wide Navigational Warning Service
+      class: Committee
+      subgroup:
+        S-124PT:
+          name: S-124 Project Team
+          class: Workgroup
+    CBSC:
+      name: CAPACITY BUILDING SUB-COMMITTEE
+      class: Committee
+    WENDWG:
+      name: WORLDWIDE ENC DATABASE WORKING GROUP
+      class: Workgroup
+    MSDIWG:
+      name: MARINE SPATIAL DATA INFRASTRUCTURES WORKING GROUP
+      class: Workgroup
+    EC-IHO:
+      name: IENWG & EC - IHO Cooperation WG
+      class: Workgroup
+      subgroup:
+        IENWG:
+          name: COOPERATION BETWEEN THE EUROPEAN COMMISSION (EC) AND THE IHO
+          class: Workgroup
+    CSBWG:
+      name: CROWDSOURCED BATHYMETRY WORKING GROUP
+      class: Workgroup
+    IBSC:
+      name: FIG/IHO/ICA INTERNATIONAL BOARD ON STANDARDS OF COMPETENCE FOR HYDROGRAPHIC SURVEYORS AND NAUTICAL CARTOGRAPHERS
+      class: Committee
+    DCDB:
+      name: IHO Data Centre for Digital Bathymetry
+      class: Committee
+    GEBCO:
+      name: JOINT IHO-IOC GUIDING COMMITTEE FOR THE GENERAL BATHYMETRIC CHART OF THE OCEANS
+      class: Committee
+      subgroup:
+        GGC:
+          name: GEBCO Guiding Committee
+          class: Committee
+        SCUFN:
+          name: GEBCO SUB-COMMITTEE ON UNDERSEA FEATURE NAMES
+          class: Committee
+        TSCOM:
+          name: GEBCO TECHNICAL SUB-COMMITTEE ON OCEAN MAPPING
+          class: Committee
+        SCRUM:
+          name: SUB-COMMITTEE ON REGIONAL UNDERSEA MAPPING
+          class: Committee
+        SCOPE:
+          name: SUB-COMMITTEE ON COMMUNICATIONS, OUTREACH AND PUBLIC ENGAGEMENT
+          class: Committee
+Council:
+  class: Committee
+  subgroup:
+    SPRWG:
+      name: Strategic Plan Review Working Group
+      class: Workgroup
+IHR:
+  name: International Hydrography Review
+  class: Committee
+  subgroup:
+    IHR:
+      name: International Hydrography Review
+      class: Committee
+    IHREB:
+      name: International Hydrography Review Editorial Board
+      class: Committee
+BUREAU:
+  name: International Hydrography Bureau
+  class: Committee
+IMO MSC:
+  name: Maritime Safety Committee
+  class: Committee
+  subgroup:
+    NCSR:
+      name: Sub-Committee on Navigation, Communications and Search and Rescue
+      class: Committee
+DCDB:
+  name: IHO Data Centre for Digital Bathymetry
+  class: Committee

data/lib/relaton_iho/hash_converter.rb

@@ -25,9 +25,25 @@ module RelatonIho
         eg = ret[:editorialgroup]
         return unless eg.is_a?(Hash) || eg&.any?
 
-        collection = array(eg).map { |g| EditorialGroup.new g }
+        collection = array(eg).map do |g|
+          EditorialGroup.new(array(g).map { |wg| iho_workgroup wg })
+        end
         ret[:editorialgroup] = EditorialGroupCollection.new collection
       end
+
+      # @param ihowg [Hash]
+      # @return [RelatonIho::Committee, RelatonIho::Workgroup,
+      #          RelatonIho::Commission]
+      def iho_workgroup(ihowg)
+        key, value = ihowg&.first
+        return unless key && value.is_a?(Hash)
+
+        klass = Object.const_get "RelatonIho::#{key.capitalize}"
+        subwg = value.select do |k, _|
+          %i[committee workgroup commission].include? k
+        end
+        klass.new value[:abbreviation], value[:name], iho_workgroup(subwg)
+      end
     end
   end
 end

data/lib/relaton_iho/iho_bibliographic_item.rb

@@ -15,7 +15,7 @@ module RelatonIho
 
     # @param builder [Nokogiri::XML::Builder]
     # @param bibdata [TrueClasss, FalseClass, NilClass]
-    def to_xml(builer = nil, **opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+    def to_xml(builer = nil, **opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       opts[:ext] = !commentperiod.nil?
       super do |b|
         if opts[:bibdata] && (doctype || editorialgroup&.presence? ||

data/lib/relaton_iho/iho_bibliography.rb

@@ -1,3 +1,5 @@
+require "net/http"
+
 module RelatonIho
   class IhoBibliography
     ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-iho/"\
@@ -6,7 +8,7 @@ module RelatonIho
     class << self
       # @param text [String]
       # @return [RelatonIho::IhoBibliographicItem]
-      def search(text, _year = nil, _opts = {})
+      def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         warn "[relaton-iho] (\"#{text}\") fetching..."
         ref = text.sub(/^IHO\s/, "").downcase
         uri = URI("#{ENDPOINT}#{ref}.yaml")

data/lib/relaton_iho/iho_group.rb

@@ -0,0 +1,146 @@
+module RelatonIho
+  class IHOGroup
+    # @return [String]
+    attr_reader :abbreviation
+
+    # @return [String, nil]
+    attr_reader :name
+
+    # @return [RelatonIho::Committee, RelatonIho::Workgroup,
+    #          RelatonIho::Commission, nil]
+    attr_reader :subgroup
+
+    # @param abbreviation [String]
+    # @param name [String, nil]
+    # @param subgroup [RelatonIho::Committee, RelatonIho::Workgroup,
+    #                  RelatonIho::Commission, nil]
+    def initialize(abbreviation, name = nil, subgroup = nil)
+      @abbreviation = abbreviation
+      @name = name
+      @subgroup = subgroup
+    end
+
+    class << self
+      # @param abbr [String]
+      # @return [RelatonIho::EditorialGroup]
+      def expand(abbr)
+        struct = YAML.load_file File.expand_path("eg.yml", __dir__)
+        from_abbr abbr.upcase, struct
+      end
+
+      private
+
+      # @param abbr [String]
+      # @param struct [Hash]
+      # @return [RelatonIho::Committee, RelatonIho::Commission,
+      #          RelatonIho::Workgroup]
+      def from_abbr(abbr, struct)
+        return unless struct
+
+        gr = struct.detect { |k, v| k == abbr || v["previously"] == abbr }
+        return klass(gr[1]["class"]).new abbr, gr[1]["name"] if gr
+
+        expand_from_abbr abbr, struct
+      end
+
+      # @param abbr [String]
+      # @param struct [Hash]
+      # @return [RelatonIho::Committee, RelatonIho::Commission,
+      #          RelatonIho::Workgroup]
+      def expand_from_abbr(abbr, struct)
+        struct.each do |k, g|
+          wg = from_abbr abbr, g["subgroup"]
+          return klass(g["class"]).new k, g["name"], wg if wg
+        end
+        nil
+      end
+
+      def klass(name)
+        Object.const_get "RelatonIho::" + name
+      end
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.name name if name
+      builder.abbreviation abbreviation
+      subgroup&.to_xml builder
+    end
+
+    # @return [Hash]
+    def to_hash
+      hash = { "abbreviation" => abbreviation }
+      hash["name"] = name if name
+      hash.merge! subgroup.to_hash if subgroup
+      hash
+    end
+
+    # @param prefix [String]
+    # @param count [Integer]
+    # @return [Strin]
+    def to_asciibib(prefix, count = 1)
+      out = count > 1 ? "#{prefix}::\n" : ""
+      out += "#{prefix}.abbreviation:: #{abbreviation}\n"
+      out += "#{prefix}.name:: #{name}\n" if name
+      out += subgroup.to_asciibib prefix if subgroup
+      out
+    end
+  end
+
+  class Committee < IHOGroup
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.committee { |b| super b }
+    end
+
+    # @return [Hash]
+    def to_hash
+      { "committee" => super }
+    end
+
+    # @param prefix [String]
+    # @param count [Integer]
+    # @return [Strin]
+    def to_asciibib(prefix, count = 1)
+      super prefix + ".committee", count
+    end
+  end
+
+  class Workgroup < IHOGroup
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.workgroup { |b| super b }
+    end
+
+    # @return [Hash]
+    def to_hash
+      { "workgroup" => super }
+    end
+
+    # @param prefix [String]
+    # @param count [Integer]
+    # @return [Strin]
+    def to_asciibib(prefix, count = 1)
+      super prefix + ".workgroup", count
+    end
+  end
+
+  class Commission < IHOGroup
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.commisstion { |b| super b }
+    end
+
+    # @return [Hash]
+    def to_hash
+      { "commission" => super }
+    end
+
+    # @param prefix [String]
+    # @param count [Integer]
+    # @return [Strin]
+    def to_asciibib(prefix, count = 1)
+      super prefix + ".commission", count
+    end
+  end
+end

data/lib/relaton_iho/version.rb

@@ -1,3 +1,3 @@
 module RelatonIho
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.1".freeze
 end

data/lib/relaton_iho/xml_parser.rb

@@ -27,12 +27,25 @@ module RelatonIho
         return unless ext
 
         egs = ext.xpath("editorialgroup").map do |eg|
-          EditorialGroup.new(committee: eg.at("committee")&.text,
-                             workgroup: eg.at("workgroup")&.text)
+          grps = eg.xpath("committee|workgroup|commission").map do |ig|
+            iho_group ig
+          end
+          EditorialGroup.new grps
         end
         EditorialGroupCollection.new egs if egs.any?
       end
 
+      # @param ext [Nokogiri::XML::Element. nil]
+      # @return [RelatonIho::Committee, RelatonIho::Commission,
+      #   RelatonIho::Workgroup, nil]
+      def iho_group(ihgrp)
+        return unless ihgrp
+
+        klass = Object.const_get "RelatonIho::" + ihgrp.name.capitalize
+        subg = iho_group ihgrp.at("./committee|./workgroup|./commission")
+        klass.new ihgrp.at("abbreviation").text, ihgrp.at("name")&.text, subg
+      end
+
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIho::CommentPeriod, nil]
       def fetch_commentperiond(ext)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -190,10 +190,12 @@ files:
 - lib/relaton_iho.rb
 - lib/relaton_iho/comment_periond.rb
 - lib/relaton_iho/editorial_group.rb
+- lib/relaton_iho/eg.yml
 - lib/relaton_iho/hash_converter.rb
 - lib/relaton_iho/hit_collection.rb
 - lib/relaton_iho/iho_bibliographic_item.rb
 - lib/relaton_iho/iho_bibliography.rb
+- lib/relaton_iho/iho_group.rb
 - lib/relaton_iho/processor.rb
 - lib/relaton_iho/version.rb
 - lib/relaton_iho/xml_parser.rb
@@ -202,7 +204,7 @@ homepage: https://github.com/relaton/relaton-iho
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem
   model'