relaton-ieee 1.9.3 → 1.10.2

data/grammars/reqt.rng

@@ -58,15 +58,23 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -100,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +153,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -164,6 +185,14 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_ieee/bibxml_parser.rb

@@ -3,12 +3,21 @@ module RelatonIeee
     extend RelatonBib::BibXMLParser
     extend BibXMLParser
 
-    FLAVOR = "IEEE".freeze
-
     # @param attrs [Hash]
     # @return [RelatonBib::IetfBibliographicItem]
     def bib_item(**attrs)
       IeeeBibliographicItem.new(**attrs)
     end
+
+    #
+    # Return PubID type
+    #
+    # @param [String] _ docidentifier
+    #
+    # @return [String] type
+    #
+    def pubid_type(_)
+      "IEEE"
+    end
   end
 end

data/lib/relaton_ieee/data_parser.rb

@@ -57,11 +57,15 @@ module RelatonIeee
     #
     # Parse title
     #
-    # @return [RelatonBib::TypedTitleStringCollection]
+    # @return [Array<RelatonBib::TypedTitleString>]
     #
     def parse_title
-      t = doc.at("./volume/article/title").text
-      RelatonBib::TypedTitleString.from_string t
+      t = []
+      content = doc.at("./volume/article/title").text
+      if content =~ /\A(.+)\s-\sredline\z/i
+        t << RelatonBib::TypedTitleString.new(content: $1, type: "title-main")
+      end
+      t << RelatonBib::TypedTitleString.new(content: content, type: "main")
     end
 
     #
@@ -110,7 +114,7 @@ module RelatonIeee
     # @return [Array<RelatonBib::DocumentIdentifier>]
     #
     def parse_docid
-      ids = [{ id: pubid.to_s, type: "IEEE" }]
+      ids = [{ id: pubid.to_s, type: "IEEE", primary: true }]
       isbn = doc.at("./publicationinfo/isbn")
       ids << { id: isbn.text, type: "ISBN" } if isbn
       doi = doc.at("./volume/article/articleinfo/articledoi")

data/lib/relaton_ieee/hit_collection.rb

@@ -11,23 +11,24 @@ module RelatonIeee
 
     # rubocop:disable Metrics/AbcSize
 
-    # @param ref [Strig]
+    # @param reference [Strig]
     # @param opts [Hash]
-    def initialize(ref) # rubocop:disable Metrics/MethodLength
+    def initialize(reference) # rubocop:disable Metrics/MethodLength
       super
-      code = ref.sub(/^IEEE\s(Std\s)?/, "")
-      search = CGI.escape({ data: { searchTerm: code } }.to_json)
-      url = "#{DOMAIN}/bin/standards/search?data=#{search}"
-      resp = Faraday.get url
-      resp_json = JSON.parse resp.body
-      json = JSON.parse resp_json["message"]
-      @array = json["response"]["searchResults"]["resultsMapList"]
-        .reduce([]) do |s, hit|
-          /^(?:\w+\s)?(?<id>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ hit["record"]["recordTitle"]
-          next s unless id && code =~ %r{^#{id}}
+      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
+      html = Nokogiri::HTML json["html"]
+      @array = html.xpath("//h4/a").reduce([]) do |s, hit|
+        ref = hit.text.strip
+        /^(?:\w+\s)?(?<code2>[A-Z\d.]+)(?:-(?<year>\d{4}))?/ =~ ref
+        next s unless code2 && code1 =~ %r{^#{code2}}
 
-          s << Hit.new(hit["record"].merge(code: id, year: year.to_i), self)
-        end.sort_by { |h| h.hit[:year].to_s + h.hit["recordURL"] }.reverse
+        hit_data = { ref: ref, year: year.to_i, url: hit[:href] }
+        s << Hit.new(hit_data, self)
+      end.sort_by { |h| h.hit[:year].to_s + h.hit[:url] }.reverse
     end
     # rubocop:enable Metrics/AbcSize
   end

data/lib/relaton_ieee/ieee_bibliography.rb

@@ -15,7 +15,7 @@ module RelatonIeee
       #
       # @return [Hash, NilClass] returns { ret: RelatonBib::BibliographicItem }
       #   if document is found else returns NilClass
-      def get(code, year = nil, _opts = {})
+      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
@@ -42,11 +42,11 @@ module RelatonIeee
       # @param opts [Hash] options
       #
       # @return [Hash]
-      def bib_results_filter(result, ref, year)
+      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["recordTitle"]
+          rp2 = ref_parts hit.hit[:ref]
           next if rp1[:code] != rp2[:code] || rp1[:corr] != rp2[:corr]
 
           return { ret: hit } if !year

data/lib/relaton_ieee/scrapper.rb

@@ -6,40 +6,40 @@ module RelatonIeee
       # papam hit [Hash]
       # @return [RelatonOgc::OrcBibliographicItem]
       def parse_page(hit)
-        doc = Nokogiri::HTML Faraday.get(hit["recordURL"]).body
+        doc = Nokogiri::HTML Faraday.get(hit[:url]).body
         IeeeBibliographicItem.new(
           fetched: Date.today.to_s,
-          title: fetch_title(hit["recordTitle"]),
-          docid: fetch_docid(hit["recordTitle"]),
-          link: fetch_link(hit["recordURL"]),
+          title: fetch_title(doc),
+          docid: fetch_docid(hit[:ref]),
+          link: fetch_link(hit[:url]),
           docstatus: fetch_status(doc),
           abstract: fetch_abstract(doc),
           contributor: fetch_contributor(doc),
           language: ["en"],
           script: ["Latn"],
           date: fetch_date(doc),
-          committee: fetch_committee(doc)
+          committee: fetch_committee(doc),
+          place: ["Piscataway, NJ, USA"],
         )
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
       private
 
-      # @param title [String]
+      # @param doc [String] Nokogiri::HTML4::Document
       # @return [Array<RelatonBib::TypedTitleString>]
-      def fetch_title(title)
-        [
+      def fetch_title(doc)
+        doc.xpath("//h2[@id='stnd-title']").map do |t|
           RelatonBib::TypedTitleString.new(
-            type: "main", content: title, language: "en", script: "Latn"
-          ),
-        ]
+            type: "main", content: t.text, language: "en", script: "Latn",
+          )
+        end
       end
 
-      # @param title [String]
+      # @param ref [String]
       # @return [Array<RelatonBib::DocumentIdentifier>]
-      def fetch_docid(title)
-        /^(?<identifier>(?:\w+\s)?\S+)/ =~ title
-        [RelatonBib::DocumentIdentifier.new(id: identifier, type: "IEEE")]
+      def fetch_docid(ref)
+        [RelatonBib::DocumentIdentifier.new(id: ref, type: "IEEE", primary: true)]
       end
 
       # @param url [String]
@@ -51,10 +51,10 @@ module RelatonIeee
       # @param doc [Nokogiri::HTML::Document]
       # @return [RelatonBib::DocumentStatus, NilClass]
       def fetch_status(doc)
-        stage = doc.at("//td[.='Status']/following-sibling::td/div")
+        stage = doc.at("//dd[@id='stnd-status']")
         return unless stage
 
-        RelatonBib::DocumentStatus.new(stage: stage.text)
+        RelatonBib::DocumentStatus.new(stage: stage.text.split.first)
       end
 
       # @param identifier [String]
@@ -67,33 +67,39 @@ module RelatonIeee
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<RelatonBib::FormattedString>]
       def fetch_abstract(doc)
-        content = doc.at("//div[@class='description']")
-        return [] unless content
-
-        [RelatonBib::FormattedString.new(content: content.text, language: "en",
-                                         script: "Latn")]
+        doc.xpath("//div[@id='stnd-description']").map do |a|
+          RelatonBib::FormattedString.new(
+            content: a.text.strip, language: "en", script: "Latn",
+          )
+        end
       end
 
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<RelatonBib::ContributionInfo>]
-      def fetch_contributor(doc)
-        name = doc.at(
-          "//td[.='IEEE Program Manager']/following-sibling::td/div/a"
+      def fetch_contributor(doc) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        address = RelatonBib::Address.new(
+          street: ["445 Hoes Lane"], postcode: "08854-4141", city: "Piscataway",
+          state: "NJ", country: "USA"
         )
-        return [] unless name
-
-        [personn_contrib(name.text)]
+        org = RelatonBib::Organization.new(
+          name: "Institute of Electrical and Electronics Engineers",
+          abbreviation: "IEEE", contact: [address]
+        )
+        contrib = RelatonBib::ContributionInfo.new(entity: org, role: [type: "publisher"])
+        doc.xpath("//dd[@id='stnd-staff-liaison']/text()").map do |name|
+          person_contrib(name.text.strip)
+        end << contrib
       end
 
       # @param name [String]
       # @return [RelatonBib::ContributionInfo]
-      def personn_contrib(name)
+      def person_contrib(name)
         fname = RelatonBib::FullName.new(
-          completename: RelatonBib::LocalizedString.new(name)
+          completename: RelatonBib::LocalizedString.new(name),
         )
         entity = RelatonBib::Person.new(name: fname)
         RelatonBib::ContributionInfo.new(
-          entity: entity, role: [type: "author"]
+          entity: entity, role: [type: "author"],
         )
       end
 
@@ -112,16 +118,13 @@ module RelatonIeee
       # @return [Array<RelatonBib::BibliographicDate>]
       def fetch_date(doc)
         dates = []
-        issued = doc.at "//td[.='Board Approval']/following-sibling::td/div"
-        if issued
-          dates << RelatonBib::BibliographicDate.new(type: "issued",
-                                                     on: issued.text)
+        id = doc.at "//dd[@id='stnd-approval-date']"
+        if id
+          dates << RelatonBib::BibliographicDate.new(type: "issued", on: id.text)
         end
-        published = doc.at("//td[.='History']/following-sibling::td/div")
-          &.text&.match(/(?<=Published Date:)[\d-]+/)&.to_s
-        if published
-          dates << RelatonBib::BibliographicDate.new(type: "published",
-                                                     on: published)
+        pd = doc.at("//dd[@id='stnd-published-date']")
+        if pd
+          dates << RelatonBib::BibliographicDate.new(type: "published", on: pd.text)
         end
         dates
       end
@@ -132,23 +135,23 @@ module RelatonIeee
       # @return [Array<RelatonIeee::Committee>]
       def fetch_committee(doc)
         committees = []
-        sponsor = doc.at "//td[.='Sponsor Committee']/following-sibling::td/div"
+        sponsor = doc.at "//dd[@id='stnd-committee']/text()"
         if sponsor
-          committees << Committee.new(type: "sponsor", name: sponsor.text)
+          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 "//td[.='Working Group']/following-sibling::td/div"
-        chair = doc.at "//td[.='Working Group Chair']/following-sibling::td/div"
+        working = doc.at "//dd[@id='stnd-working-group']/text()"
         if working
-          committees << Committee.new(type: "working", name: working.text,
+          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 "//td[.='Society']/following-sibling::td/div"
+        society = doc.at "//dd[@id='stnd-society']/text()"
         if society
-          committees << Committee.new(type: "society", name: society.text)
+          committees << Committee.new(type: "society", name: society.text.strip)
         end
         committees
       end

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.9.3".freeze
+  VERSION = "1.10.2".freeze
 end

data/relaton_ieee.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.1"
-  spec.add_dependency "relaton-bib", ">= 1.9.5"
+  spec.add_dependency "relaton-bib", "~> 1.10.1"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -98,16 +98,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.5
+        version: 1.10.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement