relaton-ieee 1.14.4 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae3fb426f6edd0288108dfa8f04d185703edad1cc448e16194dbe11b3a168a5
-  data.tar.gz: 1671092867f6bb46fd019b508548684be0d59b9623aef2a99f9d877404fce901
+  metadata.gz: 8d8765c1fbcffbcaa1100c86bf97e9dc3704aae3dea2617c839b00db5822dc47
+  data.tar.gz: 74577930c19049f0ee094ef155b8e6125c286b61592d69b89fdb1afc2c68f925
 SHA512:
-  metadata.gz: 55a135e2ce29c648f475b82b9eac47bf80ca36e03262ffc3caf5de49c39e3c8fb39f349e1f37826cbebaf7a3bcc52219ab842b8d54f66f4c179ebdd9d40b8f22
-  data.tar.gz: d4698b5437a3d4a93b2a51908dd2e2f936b76caafd6209bdb8fab3dd241e3e4232aae35fa0551692006c22b19228306241775ae5b4854c6272717a00acf527a1
+  metadata.gz: ba4821384d2c1f45ccf4328c40063e690422366320a138d06e02a65b5dc7e74c9ec7ab04467907eb4f67b1616977fa09605db45f6a3c2db07eab97cae113cd46
+  data.tar.gz: 80de43ec9e466351f04751e6d9347766258a1ba82e581e24914204219e1ac6eb21949b07be654f99564621578f4e6ab1e791dd64d1c7cc623cc729506b54e66e

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/relaton_ieee/data_fetcher.rb

@@ -97,13 +97,8 @@ module RelatonIeee
         return
       end
       stdid = doc.at("./publicationinfo/standard_id")&.text
-      if stdid == "0"
-        # nt = doc&.at("./normtitle")&.text
-        # ntid = @normtitles.index nt
-        # @normtitles << nt if nt && !ntid
-        # warn "Zero standard_id in #{filename}"
-        return
-      end
+      return if stdid == "0"
+
       bib = DataParser.parse doc, self
       if bib.docnumber.nil?
         nt = doc&.at("./normtitle")&.text

data/lib/relaton_ieee/data_parser.rb

@@ -2,6 +2,11 @@ module RelatonIeee
   class DataParser
     DATETYPES = { "OriginalPub" => "created", "ePub" => "published",
                   "LastInspecUpd" => "updated" }.freeze
+    ATTRS = %i[
+      docnumber title date docid contributor abstract copyright docstatus
+      relation link keyword ics editorialgroup standard_status standard_modified
+      pubstatus holdstatus doctype
+    ].freeze
 
     attr_reader :doc, :fetcher
 
@@ -33,25 +38,9 @@ module RelatonIeee
     #
     # @return [RelatonIeee::IeeeBibliographicItem]
     #
-    def parse # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
-      args = {
-        type: "standard",
-        docnumber: docnumber,
-        title: parse_title,
-        date: parse_date,
-        docid: parse_docid,
-        contributor: parse_contributor,
-        abstract: parse_abstract,
-        copyright: parse_copyright,
-        language: ["en"],
-        script: ["Latn"],
-        docstatus: parse_status,
-        relation: parse_relation,
-        link: parse_link,
-        keyword: parse_keyword,
-        ics: parse_ics,
-        editorialgroup: parse_editorialgroup,
-      }
+    def parse
+      args = { type: "standard", language: ["en"], script: ["Latn"] }
+      ATTRS.each { |attr| args[attr] = send("parse_#{attr}") }
       IeeeBibliographicItem.new(**args)
     end
 
@@ -142,6 +131,10 @@ module RelatonIeee
       end
     end
 
+    def parse_docnumber
+      docnumber
+    end
+
     #
     # Parse docnumber
     #
@@ -227,16 +220,13 @@ module RelatonIeee
     #
     # Parse status
     #
-    # @return [RelatonBib::DocumentStatus]
+    # @return [RelatonIee::DocumentStatus, nil]
     #
-    def parse_status
-      st = doc.at("./publicationinfo/standard_status").text.downcase
-      stage = case st
-              when "active" then "approved"
-              when "inactive" then "withdrawn"
-              else st
-              end
-      DocumentStatus.new stage: stage
+    def parse_docstatus
+      st = parse_standard_modified
+      return unless %w[Draft Approved Superseded Withdrawn].include?(st)
+
+      DocumentStatus.new stage: st.downcase
     end
 
     #
@@ -250,7 +240,7 @@ module RelatonIeee
         if (ref = fetcher.backrefs[r.text])
           rel = fetcher.create_relation(r[:type], ref)
           rels << rel if rel
-        elsif !/Inactive Date/.match?(r) && docnumber
+        elsif !"Inactive Date".include?(r) && docnumber
           fetcher.add_crossref(docnumber, r)
         end
       end
@@ -302,5 +292,50 @@ module RelatonIeee
       ).map &:text
       EditorialGroup.new committee: committee if committee.any?
     end
+
+    #
+    # Parse standard status
+    #
+    # @return [String, nil] standard status or nil
+    #
+    def parse_standard_status
+      doc.at("./publicationinfo/standard_status")&.text
+    end
+
+    #
+    # Parse standard modifier
+    #
+    # @return [String, nil] standard modifier or nil
+    #
+    def parse_standard_modified
+      doc.at("./publicationinfo/standardmodifierset/standard_modifier")&.text
+    end
+
+    #
+    # Parse pubstatus
+    #
+    # @return [String, nil] pubstatus or nil
+    #
+    def parse_pubstatus
+      doc.at("./publicationinfo/pubstatus")&.text
+    end
+
+    #
+    # Pasrse holdstatus
+    #
+    # @return [String, nil] holdstatus or nil
+    #
+    def parse_holdstatus
+      doc.at("./publicationinfo/holdstatus")&.text
+    end
+
+    #
+    # Parse doctype
+    #
+    # @return [String] doctype
+    #
+    def parse_doctype
+      parse_standard_modified == "Redline" ? "redline" : "standard"
+    end
   end
 end

data/lib/relaton_ieee/hash_converter.rb

@@ -4,13 +4,14 @@ 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 unless hash.is_a?(Hash)
 
-      #   editorialgroup_hash_to_bib hash
-      #   hash
-      # end
+        # editorialgroup_hash_to_bib hash
+        ext_hash_to_bib hash
+        hash
+      end
 
       # @param item_hash [Hash]
       # @return [RelatonIeee::IeeeBibliographicItem]
@@ -24,6 +25,16 @@ module RelatonIeee
 
         hash[:editorialgroup] = EditorialGroup.new(**hash[:editorialgroup])
       end
+
+      def ext_hash_to_bib(hash)
+        ext = hash.delete(:ext)
+        return unless ext
+
+        attrs = %i[standard_status standard_modified pubstatus holdstatus]
+        ext.select { |k, _| attrs.include? k }.each do |k, v|
+          hash[k] = v
+        end
+      end
     end
   end
 end

data/lib/relaton_ieee/ieee_bibliographic_item.rb

@@ -1,6 +1,6 @@
 module RelatonIeee
   class IeeeBibliographicItem < RelatonBib::BibliographicItem
-    TYPES = %w[guide recommended-practice standard].freeze
+    DOCTYPES = %w[guide recommended-practice standard witepaper redline other].freeze
     SUBTYPES = %w[amendment corrigendum erratum].freeze
 
     # @return [RelatonIeee::EditorialGroup, nil]
@@ -9,16 +9,24 @@ module RelatonIeee
     # @return [Boolean, nil] Trial use
     attr_reader :trialuse
 
+    # @return [String, nil]
+    attr_reader :standard_status, :standard_modified, :pubstatus, :holdstatus
+
     #
     # @param [Hash] args
     # @option args [Boolean, nil] :trialuse Trial use
     # @option args [Array<RelatonIeee::EditorialGroup>] :editorialgroup
     #   Editorial group
+    # @option args [String, nil] :standard_status Active, Inactive, Superseded
+    # @option args [String, nil] :standard_modified Draft, Withdrawn, Suspended,
+    #   Approved, Reserved, Redline
+    # @option args [String, nil] :pubstatus Active, Inactive
+    # @option args [String, nil] :holdstatus Held, Publish
     #
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      if args[:doctype] && !TYPES.include?(args[:doctype])
+      if args[:doctype] && !DOCTYPES.include?(args[:doctype])
         warn "[relaton-ieee] invalid doctype \"#{args[:doctype]}\". " \
-             "It should be one of: #{TYPES.join(', ')}."
+             "It should be one of: #{DOCTYPES.join(', ')}."
       end
       if args[:docsubtype] && !SUBTYPES.include?(args[:docsubtype])
         warn "[relaton-ieee] invalid docsubtype \"#{args[:docsubtype]}\". " \
@@ -26,6 +34,10 @@ module RelatonIeee
       end
       eg = args.delete(:editorialgroup)
       @trialuse = args.delete(:trialuse)
+      @standard_status = args.delete(:standard_status)
+      @standard_modified = args.delete(:standard_modified)
+      @pubstatus = args.delete(:pubstatus)
+      @holdstatus = args.delete(:holdstatus)
       super
       @editorialgroup = eg
     end
@@ -53,13 +65,18 @@ module RelatonIeee
     # @return [String] XML
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       super(**opts) do |bldr|
-        if opts[:bibdata] && (doctype || subdoctype || !trialuse.nil? || editorialgroup || ics.any?)
+        if opts[:bibdata] && (doctype || subdoctype || !trialuse.nil? || editorialgroup ||
+           ics.any? || standard_status || standard_modified || pubstatus || holdstatus)
           ext = bldr.ext do |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) }
+            b.standard_status standard_status if standard_status
+            b.standard_modified standard_modified if standard_modified
+            b.pubstatus pubstatus if pubstatus
+            b.holdstatus holdstatus if holdstatus
           end
           ext["schema-version"] = ext_schema unless opts[:embedded]
         end
@@ -73,9 +90,13 @@ module RelatonIeee
     #
     # @return [Hash]
     #
-    def to_hash(embedded: false)
+    def to_hash(embedded: false) # rubocop:disable Metrics/AbcSize
       hash = super
       hash["trialuse"] = trialuse unless trialuse.nil?
+      hash["ext"]["standard_status"] = standard_status unless standard_status.nil?
+      hash["ext"]["standard_modified"] = standard_modified unless standard_modified.nil?
+      hash["ext"]["pubstatus"] = pubstatus unless pubstatus.nil?
+      hash["ext"]["holdstatus"] = holdstatus unless holdstatus.nil?
       hash
     end
 

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.14.4".freeze
+  VERSION = "1.14.6".freeze
 end

data/lib/relaton_ieee/xml_parser.rb

@@ -6,12 +6,16 @@ module RelatonIeee
       # Override RelatonBib::XMLParser.item_data method.
       # @param item [Nokogiri::XML::Element]
       # @returtn [Hash]
-      def item_data(item)
+      def item_data(item) # rubocop:disable Metrics/AbcSize
         data = super
         ext = item.at "./ext"
         return data unless ext
 
         data[:editorialgroup] = parse_editorialgroup(item)
+        data[:standard_status] = ext.at("./standard_status")&.text
+        data[:standard_modified] = ext.at("./standard_modified")&.text
+        data[:pubstatus] = ext.at("./pubstatus")&.text
+        data[:holdstatus] = ext.at("./holdstatus")&.text
         data
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.14.4
+  version: 1.14.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-17 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml