relaton-ieee 1.12.3 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6ce7435bdf251b1180ba075e3585f7075c289ab5ad58bbf7e26706d3fe10fe
-  data.tar.gz: b6475b2c93336560e490fea100879389d4323a7854180114d724443af0332e52
+  metadata.gz: 5d518d9c4d21f989941f871c62682bdb996e8d060997e1211fb6bca708cfbd32
+  data.tar.gz: 6b160e9ed08862a141fd4068ce70be0a2cf5ea97196013d87c8cf9af0a4ea133
 SHA512:
-  metadata.gz: 7a630fdfff66077109cbbbad786783488c79a687de9d60b75b1ed42b03a46ab98c11542abbdbb7497dbe3220183d1512f7457339edfad3b459591fe2a3c06676
-  data.tar.gz: f2027e366b04f6cc59c0e219526082d9f171d22fdbbf91c42077b07e0c37a8508a715f8fb9eb7ae55c50eaf8974970fff15b7f6ade8389438061aaceace766fc
+  metadata.gz: d8768c3e725410a80ccf1075e33491e1ff99b6c5051576e1441734d9ef31018ffc9077e3ec01ab0bcfb353efd43018a304aff0967beb2b9839a8271a0fdaaa9b
+  data.tar.gz: b79ca69d3aa30965fef5ce03b910739fa9e4f1816cbfe37b2d66ddb069b4134160f1c73ad2e603a69d214998e5a737819c7cf5949327491275767df25eab6835

data/lib/relaton_ieee/balloting_group.rb

@@ -0,0 +1,56 @@
+module RelatonIeee
+  class BallotingGroup
+    TYPES = %w[individual entity].freeze
+
+    # @return [String]
+    attr_reader :type, :content
+
+    #
+    # Initialize balloting group
+    #
+    # @param [String] type type
+    # @param [String] content content
+    #
+    def initialize(type:, content:)
+      unless TYPES.include?(type)
+        warn "[relaton-ieee] WARNING: type of Balloting group must be one of #{TYPES.join(', ')}"
+      end
+
+      @type = type
+      @content = content
+    end
+
+    #
+    # Render balloting group to XML
+    #
+    # @param [Nokogiri::XML::Builder] builder XML builder
+    #
+    def to_xml(builder)
+      builder.send :"balloting-group", content, type: type
+    end
+
+    #
+    # Render balloting group to Hash
+    #
+    # @return [Hash] balloting group as Hash
+    #
+    def to_hash
+      { "type" => type, "content" => content }
+    end
+
+    #
+    # Render balloting group to AsciiBib
+    #
+    # @param [String] prefix Prefix
+    #
+    # @return [String] AsciiBib
+    #
+    def to_asciibib(prefix = "")
+      pref = prefix.empty? ? prefix : "#{prefix}."
+      pref += "balloting-group"
+      out = "#{pref}.type:: #{type}\n"
+      out += "#{pref}.content:: #{content}\n"
+      out
+    end
+  end
+end

data/lib/relaton_ieee/data_parser.rb

@@ -35,6 +35,7 @@ module RelatonIeee
     #
     def parse # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
       args = {
+        fetched: Date.today.to_s,
         type: "standard",
         docnumber: docnumber,
         title: parse_title,
@@ -50,6 +51,7 @@ module RelatonIeee
         link: parse_link,
         keyword: parse_keyword,
         ics: parse_ics,
+        editorialgroup: parse_editorialgroup,
       }
       IeeeBibliographicItem.new(**args)
     end
@@ -113,8 +115,11 @@ module RelatonIeee
     #
     # @return [Array<RelatonBib::DocumentIdentifier>]
     #
-    def parse_docid
-      ids = [{ id: pubid.to_s, type: "IEEE", primary: true }]
+    def parse_docid # rubocop:disable Metrics/MethodLength
+      ids = [
+        { id: pubid.to_s, type: "IEEE", primary: true },
+        { id: pubid.to_s(trademark: true), scope: "trademark", type: "IEEE", primary: true },
+      ]
       isbn = doc.at("./publicationinfo/isbn")
       ids << { id: isbn.text, type: "ISBN" } if isbn
       doi = doc.at("./volume/article/articleinfo/articledoi")
@@ -124,6 +129,11 @@ module RelatonIeee
       end
     end
 
+    #
+    # Create PubID
+    #
+    # @return [RelatonIeee::RawbibIdParser] PubID
+    #
     def pubid
       @pubid ||= begin
         nt = doc.at("./normtitle").text
@@ -220,7 +230,7 @@ module RelatonIeee
     #
     def parse_status
       stage = doc.at("./publicationinfo/standard_status").text
-      RelatonBib::DocumentStatus.new stage: stage
+      DocumentStatus.new stage: stage
     end
 
     #
@@ -274,5 +284,17 @@ module RelatonIeee
         RelatonBib::ICS.new code: ics[:codenum], text: ics.text
       end
     end
+
+    #
+    # Parse editorialgroup
+    #
+    # @return [RelatonIeee::EditorialGroup, nil] editorialgroup or nil
+    #
+    def parse_editorialgroup
+      committee = doc.xpath(
+        "./publicationinfo/pubsponsoringcommitteeset/pubsponsoringcommittee",
+      ).map &:text
+      EditorialGroup.new committee: committee if committee.any?
+    end
   end
 end

data/lib/relaton_ieee/document_status.rb

@@ -0,0 +1,14 @@
+module RelatonIeee
+  class DocumentStatus < RelatonBib::DocumentStatus
+    class Stage < RelatonBib::DocumentStatus::Stage
+      STAGES = %w[developing active inactive].freeze
+
+      def initialize(value:, abbreviation: nil)
+        unless STAGES.include?(value.downcase)
+          warn "[relaton-ieee] Stage value must be one of #{STAGES.join(', ')}"
+        end
+        super
+      end
+    end
+  end
+end

data/lib/relaton_ieee/editorial_group.rb

@@ -0,0 +1,83 @@
+module RelatonIeee
+  class EditorialGroup
+    # @return [String]
+    attr_reader :society, :working_group
+    # @return [RelatonIeee::BallotingGroup] Balloting group
+    attr_reader :balloting_group
+    # @return [Array<String>] Committee
+    attr_reader :committee
+
+    #
+    # Initialize editorial group
+    #
+    # @param [Hash] **args Hash of arguments
+    # @option args [String] :society Society
+    # @option args [RelatonIeee::BallotingGroup, Hash] :balloting_group Balloting group
+    # @option args [String] :working_group Working group
+    # @option args [Array<String>] :committee Committee
+    #
+    def initialize(**args)
+      unless args[:committee].is_a?(Array) && args[:committee].any?
+        raise ArgumentError, ":committee is required"
+      end
+
+      @society = args[:society]
+      @balloting_group = if args[:balloting_group].is_a?(Hash)
+                           BallotingGroup.new(**args[:balloting_group])
+                         else args[:balloting_group]
+                         end
+      @working_group = args[:working_group]
+      @committee = args[:committee]
+    end
+
+    def presence?
+      true
+    end
+
+    #
+    # Render editorial group to XML
+    #
+    # @param [Nokogiri::XML::Builder] builder XML builder
+    #
+    def to_xml(builder)
+      builder.editorialgroup do |b|
+        b.society society if society
+        balloting_group&.to_xml(b)
+        b.send :"working-group", working_group if working_group
+        committee.each { |c| b.committee c }
+      end
+    end
+
+    #
+    # Render editorial group to Hash
+    #
+    # @return [Hash] editorial group as Hash
+    #
+    def to_hash
+      hash = {}
+      hash["society"] = society if society
+      hash["balloting_group"] = balloting_group.to_hash if balloting_group
+      hash["working_group"] = working_group if working_group
+      hash["committee"] = committee if committee
+      hash
+    end
+
+    #
+    # Render editorial group to AsciiBib
+    #
+    # @param [String] prefix Prefix
+    #
+    # @return [String] AsciiBib
+    #
+    def to_asciibib(prefix = "")
+      pref = prefix.empty? ? prefix : "#{prefix}."
+      pref += "editorialgroup"
+      out = ""
+      out += "#{pref}.society:: #{society}\n" if society
+      out += balloting_group.to_asciibib(pref) if balloting_group
+      out += "#{pref}.working-group:: #{working_group}\n" if working_group
+      committee.each { |c| out += "#{pref}.committee:: #{c}\n" }
+      out
+    end
+  end
+end

data/lib/relaton_ieee/hash_converter.rb

@@ -4,13 +4,13 @@ module RelatonIeee
       # @param args [Hash]
       # @param neated [TrueClas, FalseClass] default true
       # @return [Hash]
-      def hash_to_bib(args)
-        hash = super
-        return nil unless hash.is_a?(Hash)
+      # def hash_to_bib(args)
+      #   hash = super
+      #   return nil unless hash.is_a?(Hash)
 
-        committee_hash_to_bib hash
-        hash
-      end
+      #   editorialgroup_hash_to_bib hash
+      #   hash
+      # end
 
       # @param item_hash [Hash]
       # @return [RelatonIeee::IeeeBibliographicItem]
@@ -19,10 +19,10 @@ module RelatonIeee
       end
 
       # @param hash [Hash]
-      def committee_hash_to_bib(hash)
-        return unless hash[:committee]
+      def editorialgroup_hash_to_bib(hash)
+        return unless hash[:editorialgroup]
 
-        hash[:committee] = hash[:committee].map { |c| Committee.new(**c) }
+        hash[:editorialgroup] = EditorialGroup.new(**hash[:editorialgroup])
       end
     end
   end

data/lib/relaton_ieee/hit_collection.rb

@@ -4,37 +4,39 @@ require "fileutils"
 
 module RelatonIeee
   class HitCollection < RelatonBib::HitCollection
-    DOMAIN = "https://standards.ieee.org".freeze
-    # DATADIR = File.expand_path ".relaton/ogc/", Dir.home
-    # DATAFILE = File.expand_path "bibliography.json", DATADIR
-    # ETAGFILE = File.expand_path "etag.txt", DATADIR
+    # DOMAIN = "https://standards.ieee.org".freeze
+    GH_URL = "https://raw.githubusercontent.com/relaton/relaton-data-ieee/main/data/".freeze
 
     # @param reference [Strig]
     # @param opts [Hash]
     def initialize(reference) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       super
-      code1 = reference.sub(/^IEEE\s(Std\s)?/, "")
-      url = "#{DOMAIN}/wp-admin/admin-ajax.php"
-      query = reference.gsub("/", " ")
-      resp = Faraday.post url, { action: "ieee_cloudsearch", q: query }
-      json = JSON.parse resp.body
-      unless json["results"]
-        @array = []
-        return
-      end
+      ref = reference.gsub(/[\s,:\/]/, "_").squeeze("_").upcase
+      url = "#{GH_URL}#{ref}.yaml"
+      resp = Faraday.get url
+      hit = YAML.load resp.body
+      # code1 = reference.sub(/^IEEE\s(Std\s)?/, "")
+      # url = "#{DOMAIN}/wp-admin/admin-ajax.php"
+      # query = reference.gsub("/", " ")
+      # resp = Faraday.post url, { action: "ieee_cloudsearch", q: query }
+      # json = JSON.parse resp.body
+      # unless json["results"]
+      #   @array = []
+      #   return
+      # end
 
-      @array = json["results"]["hits"]["hit"].reduce([]) do |s, hit|
-        flds = hit["fields"]
-        /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ flds["meta_designation_l"]
-        next s unless code2 && code1 =~ %r{^#{code2}}
+      # @array = json["results"]["hits"]["hit"].reduce([]) do |s, hit|
+      #   flds = hit["fields"]
+      #   /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ flds["meta_designation_l"]
+      #   next s unless code2 && code1 =~ %r{^#{code2}}
 
-        hit_data = {
-          ref: flds["meta_designation_l"],
-          year: year.to_i,
-          url: flds["doc_id_l"],
-        }
-        s << Hit.new(hit_data, self)
-      end.sort_by { |h| h.hit[:year].to_s + h.hit[:url] }.reverse
+      #   hit_data = {
+      #     ref: flds["meta_designation_l"],
+      #     year: year.to_i,
+      #     url: flds["doc_id_l"],
+      #   }
+      #   s << Hit.new(hit_data, self)
+      # end.sort_by { |h| h.hit[:year].to_s + h.hit[:url] }.reverse
     end
   end
 end

data/lib/relaton_ieee/ieee_bibliographic_item.rb

@@ -1,12 +1,30 @@
 module RelatonIeee
   class IeeeBibliographicItem < RelatonBib::BibliographicItem
-    # @return [Array<RelatonIeee::Committee>]
-    attr_reader :committee
+    TYPES = %w[guide recommended-practice standard].freeze
+    SUBTYPES = %w[amendment corrigendum erratum].freeze
 
-    # @param committee [Array<RelatonIeee::Committee>]
+    # @return [RelatonIeee::EditorialGroup, nil]
+    attr_reader :editorialgroup
+
+    # @return [Boolean, nil] Trial use
+    attr_reader :trialuse
+
+    #
+    # @param [Hash] args
+    # @option args [Boolean, nil] :trialuse Trial use
+    # @option args [Array<RelatonIeee::EditorialGroup>] :editorialgroup Editorial group
+    #
     def initialize(**args)
-      @committee = args.delete(:committee) || []
+      if args[:doctype] && !TYPES.include?(args[:doctype])
+        warn "[relaton-ieee] doctype should be one of #{TYPES.join(', ')}"
+      end
+      if args[:docsubtype] && !SUBTYPES.include?(args[:docsubtype])
+        warn "[relaton-ieee] docsubtype should be one of #{SUBTYPES.join(', ')}"
+      end
+      eg = args.delete(:editorialgroup)
+      @trialuse = args.delete(:trialuse)
       super
+      @editorialgroup = eg
     end
 
     # @param hash [Hash]
@@ -21,11 +39,15 @@ module RelatonIeee
     # @option opts [Boolean] :bibdata
     # @option opts [String] :lang language
     # @return [String] XML
-    def to_xml(**opts)
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       super(**opts) do |bldr|
-        if opts[:bibdata] && committee.any?
+        if opts[:bibdata] && (doctype || subdoctype || !trialuse.nil? || editorialgroup || ics.any?)
           bldr.ext do |b|
-            committee.each { |c| c.to_xml b }
+            b.doctype doctype if doctype
+            b.subdoctype subdoctype if subdoctype
+            b.send :"trial-use", trialuse unless trialuse.nil?
+            editorialgroup&.to_xml(b)
+            ics.each { |ic| ic.to_xml(b) }
           end
         end
       end
@@ -34,7 +56,7 @@ module RelatonIeee
     # @return [Hash]
     def to_hash
       hash = super
-      hash["committee"] = committee.map &:to_hash if committee.any?
+      hash["trialuse"] = trialuse unless trialuse.nil?
       hash
     end
 
@@ -42,7 +64,7 @@ module RelatonIeee
     # @return [String]
     def to_asciibib(prefix = "")
       out = super
-      committee.each { |c| out += c.to_asciibib prefix, committee.size }
+      out += "#{prefix}.trialuse:: #{trialuse}\n" unless trialuse.nil?
       out
     end
   end

data/lib/relaton_ieee/ieee_bibliography.rb

@@ -1,12 +1,20 @@
 module RelatonIeee
   class IeeeBibliography
     class << self
-      # @param text [String]
+      GH_URL = "https://raw.githubusercontent.com/relaton/relaton-data-ieee/main/data/".freeze
+
+      # @param code [String]
       # @return [RelatonIeee::HitCollection]
-      def search(text)
-        HitCollection.new text
+      def search(code)
+        # HitCollection.new text
+        ref = code.sub(/Std\s/i, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
+        url = "#{GH_URL}#{ref}.yaml"
+        resp = Faraday.get url
+        return unless resp.status == 200
+
+        IeeeBibliographicItem.from_hash YAML.safe_load resp.body
       rescue Faraday::ConnectionFailed
-        raise RelatonBib::RequestError, "Could not access #{HitCollection::DOMAIN}"
+        raise RelatonBib::RequestError, "Could not access #{GH_URL}"
       end
 
       # @param code [String] the IEEE standard Code to look up (e..g "528-2019")
@@ -15,17 +23,17 @@ module RelatonIeee
       #
       # @return [Hash, NilClass] returns { ret: RelatonBib::BibliographicItem }
       #   if document is found else returns NilClass
-      def get(code, year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def get(code, _year = nil, _opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         warn "[relaton-ieee] (\"#{code}\") fetching..."
-        result = search(code) || (return nil)
-        year ||= code.match(/(?<=-)\d{4}/)&.to_s
-        ret = bib_results_filter(result, code, year)
-        if ret[:ret]
-          item = ret[:ret].fetch
+        item = search(code)
+        # year ||= code.match(/(?<=-)\d{4}/)&.to_s
+        # ret = bib_results_filter(result, code, year)
+        if item # ret[:ret]
+          # item = ret[:ret].fetch
           warn "[relaton-ieee] (\"#{code}\") found #{item.docidentifier.first.id}"
           item
-        else
-          fetch_ref_err(code, year, ret[:years])
+        # else
+        #   fetch_ref_err(code, year, ret[:years])
         end
       end
 
@@ -42,44 +50,44 @@ module RelatonIeee
       # @param opts [Hash] options
       #
       # @return [Hash]
-      def bib_results_filter(result, ref, year) # rubocop:disable Metrics/AbcSize
-        rp1 = ref_parts ref
-        missed_years = []
-        result.each do |hit|
-          rp2 = ref_parts hit.hit[:ref]
-          next if rp1[:code] != rp2[:code] || rp1[:corr] != rp2[:corr]
+      # def bib_results_filter(result, ref, year) # rubocop:disable Metrics/AbcSize
+      #   rp1 = ref_parts ref
+      #   missed_years = []
+      #   result.each do |hit|
+      #     rp2 = ref_parts hit.hit[:ref]
+      #     next if rp1[:code] != rp2[:code] || rp1[:corr] != rp2[:corr]
 
-          return { ret: hit } if !year
+      #     return { ret: hit } if !year
 
-          return { ret: hit } if year.to_i == hit.hit[:year]
+      #     return { ret: hit } if year.to_i == hit.hit[:year]
 
-          missed_years << hit.hit[:year]
-        end
-        { years: missed_years.uniq }
-      end
+      #     missed_years << hit.hit[:year]
+      #   end
+      #   { years: missed_years.uniq }
+      # end
 
-      def ref_parts(ref)
-        %r{
-          ^(?:IEEE\s(?:Std\s)?)?
-          (?<code>[^-/]+)
-          (?:-(?<year>\d{4}))?
-          (?:/(?<corr>\w+\s\d+-\d{4}))?
-        }x.match ref
-      end
+      # def ref_parts(ref)
+      #   %r{
+      #     ^(?:IEEE\s(?:Std\s)?)?
+      #     (?<code>[^-/]+)
+      #     (?:-(?<year>\d{4}))?
+      #     (?:/(?<corr>\w+\s\d+-\d{4}))?
+      #   }x.match ref
+      # end
 
       # @param code [Strig]
       # @param year [String]
       # @param missed_years [Array<Strig>]
-      def fetch_ref_err(code, year, missed_years)
-        id = year ? "#{code} year #{year}" : code
-        warn "[relaton-ieee] WARNING: no match found online for #{id}. "\
-          "The code must be exactly like it is on the standards website."
-        unless missed_years.empty?
-          warn "[relaton-ieee] (There was no match for #{year}, though there were matches "\
-            "found for #{missed_years.join(', ')}.)"
-        end
-        nil
-      end
+      # def fetch_ref_err(code, year, missed_years)
+      #   id = year ? "#{code} year #{year}" : code
+      #   warn "[relaton-ieee] WARNING: no match found online for #{id}. "\
+      #     "The code must be exactly like it is on the standards website."
+      #   unless missed_years.empty?
+      #     warn "[relaton-ieee] (There was no match for #{year}, though there were matches "\
+      #       "found for #{missed_years.join(', ')}.)"
+      #   end
+      #   nil
+      # end
     end
   end
 end

data/lib/relaton_ieee/pub_id.rb

@@ -48,15 +48,20 @@ module RelatonIeee
       #
       # PubId string representation
       #
+      # @param [Boolean] trademark if true, add trademark symbol
+      #
       # @return [String]
       #
-      def to_s # rubocop:disable Metrics/AbcSize
+      def to_s(trademark: false) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         out = number
         out = "#{stage} #{out}" if stage
         out = "#{approval} #{out}" if approval
         out = "#{status} #{out}" if status
         out = "#{publisher} #{out}" if publisher
         out += ".#{part}" if part
+        if trademark
+          out += out.match?(/^IEEE\s(Std\s)?(802|2030)/) ? "\u00AE" : "\u2122"
+        end
         out += edition_to_s + draft_to_s + rev_to_s + corr_to_s + amd_to_s
         out + year_to_s + month_to_s + redline_to_s
       end
@@ -120,10 +125,12 @@ module RelatonIeee
     #
     # PubId string representation
     #
+    # @param [Boolean] trademark if true, add trademark symbol
+    #
     # @return [String]
     #
-    def to_s
-      pubid.map(&:to_s).join("/")
+    def to_s(trademark: false)
+      pubid.map { |id| id.to_s(trademark: trademark) }.join("/")
     end
 
     #

data/lib/relaton_ieee/rawbib_id_parser.rb

@@ -309,7 +309,8 @@ module RelatonIeee
         PubId.new(publisher: $1, number: $2, stage: $3, year: $5, month: mn($4))
 
       # publisher, stage, number, part, draft
-      when /^([A-Z\/]+)[.-]([[:alnum:].-]+)[\/_]D([[:alnum:].]+)[\/_](#{STAGES})/o
+      when /^([A-Z\/]+)[.-]([[:alnum:].-]+)[\/_]D([[:alnum:].]+)[\/_](#{STAGES})/o,
+        /^(\w+)[.-]([[:alnum:].]+)[\/\s_]D([\d.]+)_(#{STAGES})/o
         PubId.new(publisher: "IEEE", number: $1, part: sp($2), draft: dn($3), stage: $4)
 
       # publisher, stage, number, year
@@ -471,9 +472,10 @@ module RelatonIeee
     def yn(year)
       return year if year.size == 4
 
+      y = Date.today.year.to_s[2..4].to_i + 1
       case year.to_i
-      when 0..25 then "20#{year}"
-      when 26..99 then "19#{year}"
+      when 0...y then "20#{year}"
+      when y..99 then "19#{year}"
       end
     end
 
@@ -496,7 +498,7 @@ module RelatonIeee
     #
     # @param [Strin] edition
     #
-    # @return [String]
+    # @return [String, Integer]
     #
     def en(edition)
       case edition

data/lib/relaton_ieee/scrapper.rb

@@ -18,7 +18,7 @@ module RelatonIeee
           language: ["en"],
           script: ["Latn"],
           date: fetch_date(doc),
-          committee: fetch_committee(doc),
+          editorialgroup: fetch_editorialgroup(doc),
           place: ["Piscataway, NJ, USA"],
         )
       end
@@ -40,8 +40,11 @@ module RelatonIeee
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(ref)
         args = { id: ref, type: "IEEE", primary: true }
-        args[:scope] = "trademark" if ref.match?(/^IEEE\s(?:Std\s)?(?:802|2030)/)
-        [RelatonBib::DocumentIdentifier.new(**args)]
+        ids = [RelatonBib::DocumentIdentifier.new(**args)]
+        args[:scope] = "trademark"
+        tm = ref.match?(/^IEEE\s(Std\s)?(802|2030)/) ? "\u00AE" : "\u2122"
+        args[:id] = ref.sub(/^(IEEE\s(?:Std\s)?[.\w]+)/) { |s| "#{s}#{tm}" }
+        ids << RelatonBib::DocumentIdentifier.new(**args)
       end
 
       # @param url [String]
@@ -56,7 +59,7 @@ module RelatonIeee
         stage = doc.at("//dd[@id='stnd-status']")
         return unless stage
 
-        RelatonBib::DocumentStatus.new(stage: stage.text.split.first)
+        DocumentStatus.new(stage: stage.text.split.first)
       end
 
       # @param identifier [String]
@@ -114,8 +117,6 @@ module RelatonIeee
       #   )
       # end
 
-      # rubocop:disable Metrics/MethodLength
-
       # @param date [Nokogiri::HTML::Document]
       # @return [Array<RelatonBib::BibliographicDate>]
       def fetch_date(doc)
@@ -131,33 +132,23 @@ module RelatonIeee
         dates
       end
 
-      # rubocop:disable Metrics/AbcSize
-
+      #
       # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<RelatonIeee::Committee>]
-      def fetch_committee(doc)
-        committees = []
-        sponsor = doc.at "//dd[@id='stnd-committee']/text()"
-        if sponsor
-          committees << Committee.new(type: "sponsor", name: sponsor.text.strip)
-        end
-        sponsor = doc.at "//td[.='Standards Committee']/following-sibling::td/div/a"
-        if sponsor
-          committees << Committee.new(type: "standard", name: sponsor.text)
-        end
-        working = doc.at "//dd[@id='stnd-working-group']/text()"
-        if working
-          chair = doc.at "//dd[@id='stnd-working-group-chair']"
-          committees << Committee.new(type: "working", name: working.text.strip,
-                                      chair: chair.text)
-        end
-        society = doc.at "//dd[@id='stnd-society']/text()"
-        if society
-          committees << Committee.new(type: "society", name: society.text.strip)
-        end
-        committees
+      #
+      # @return [RelatonIeee::EditorialGroup]
+      #
+      def fetch_editorialgroup(doc) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        committees = doc.xpath(
+          "//dd[@id='stnd-committee']/text()",
+          "//td[.='Standards Committee']/following-sibling::td/div/a",
+        ).map { |c| c.text.strip }
+        wg = doc.at("//dd[@id='stnd-working-group']/text()")&.text&.strip
+        # chair = doc.at "//dd[@id='stnd-working-group-chair']"
+        society = doc.at("//dd[@id='stnd-society']/text()")&.text&.strip
+        return unless committees.any? || wg || society
+
+        EditorialGroup.new(society: society, working_group: wg, committee: committees)
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
   end
 end

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.12.3".freeze
+  VERSION = "1.12.6".freeze
 end

data/lib/relaton_ieee/xml_parser.rb

@@ -11,18 +11,47 @@ module RelatonIeee
         ext = item.at "./ext"
         return data unless ext
 
-        data[:committee] = ext.xpath("./committee").map do |c|
-          Committee.new(
-            type: c[:type], name: c.at("name").text, chair: c.at("chair")&.text
-          )
-        end
+        data[:editorialgroup] = parse_editorialgroup(item)
         data
       end
 
       # @param item_hash [Hash]
       # @return [RelatonIeee::IeeeBibliographicItem]
       def bib_item(item_hash)
-        IeeeBibliographicItem.new **item_hash
+        IeeeBibliographicItem.new(**item_hash)
+      end
+
+      #
+      # Parse editorialgroup
+      #
+      # @param [Nokogiri::XML::Element] item XML element
+      #
+      # @return [RelatonIeee::EditorialGroup] Editorial group
+      #
+      def parse_editorialgroup(item)
+        eg = item.at "./ext/editorialgroup"
+        return unless eg
+
+        society = eg.at("./society")&.text
+        bg = parse_balloting_group(eg)
+        wg = eg.at("./working-group")&.text
+        committee = eg.xpath("./committee").map(&:text)
+        EditorialGroup.new(society: society, balloting_group: bg,
+                           working_group: wg, committee: committee)
+      end
+
+      #
+      # Parse balloting group
+      #
+      # @param [Nokogiri::XML::Element] editorialgroup XML element
+      #
+      # @return [RelatonIeee::BallotingGroup] Balloting group
+      #
+      def parse_balloting_group(editorialgroup)
+        bg = editorialgroup.at("./balloting-group")
+        return unless bg
+
+        BallotingGroup.new type: bg[:type], content: bg.text
       end
     end
   end

data/lib/relaton_ieee.rb

@@ -1,13 +1,14 @@
 require "digest/md5"
+require "faraday"
 require "yaml"
 require "relaton_bib"
 require "relaton_ieee/version"
+require "relaton_ieee/document_status"
 require "relaton_ieee/ieee_bibliography"
-require "relaton_ieee/hit_collection"
-require "relaton_ieee/hit"
-require "relaton_ieee/scrapper"
+# require "relaton_ieee/scrapper"
 require "relaton_ieee/ieee_bibliographic_item"
-require "relaton_ieee/committee"
+require "relaton_ieee/editorial_group"
+require "relaton_ieee/balloting_group"
 require "relaton_ieee/xml_parser"
 require "relaton_ieee/bibxml_parser"
 require "relaton_ieee/hash_converter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -146,10 +146,12 @@ files:
 - grammars/isodoc.rng
 - grammars/reqt.rng
 - lib/relaton_ieee.rb
+- lib/relaton_ieee/balloting_group.rb
 - lib/relaton_ieee/bibxml_parser.rb
-- lib/relaton_ieee/committee.rb
 - lib/relaton_ieee/data_fetcher.rb
 - lib/relaton_ieee/data_parser.rb
+- lib/relaton_ieee/document_status.rb
+- lib/relaton_ieee/editorial_group.rb
 - lib/relaton_ieee/hash_converter.rb
 - lib/relaton_ieee/hit.rb
 - lib/relaton_ieee/hit_collection.rb

data/lib/relaton_ieee/committee.rb

@@ -1,46 +0,0 @@
-module RelatonIeee
-  class Committee
-    # @return [String]
-    attr_reader :type, :name
-
-    # @return [String, NilClass]
-    attr_reader :chair
-
-    # @param type [String]
-    # @param name [String]
-    # @param chair [String, NilClass]
-    def initialize(type:, name:, chair: nil)
-      @type = type
-      @name = name
-      @chair = chair
-    end
-
-    # @param builder [Nokogiri::XML::Builder]
-    def to_xml(builder)
-      builder.committee type: type do |b|
-        b.name name
-        b.chair chair if chair
-      end
-    end
-
-    # @return [Hash]
-    def to_hash
-      hash = { "type" => type, "name" => name }
-      hash["chair"] = chair if chair
-      hash
-    end
-
-    # @param prefix [String]
-    # @param count [Integer]
-    # @return [String]
-    def to_asciibib(prefix, count)
-      pref = prefix.empty? ? prefix : prefix + "."
-      pref += "committee"
-      out = count > 1 ? "#{pref}::\n" : ""
-      out += "#{pref}.type:: #{type}\n"
-      out += "#{pref}.name:: #{name}\n"
-      out += "#{pref}.chair:: #{chair}\n" if chair
-      out
-    end
-  end
-end