relaton-ieee 1.16.3 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7048767fa74b6c8decd55108cf55dcd3e8547d37fb929b673f7b7721ed67f57
-  data.tar.gz: c04a8ba724bbd38e0de394b80a319d629f9f42045ac6133861ee1d4ae6247103
+  metadata.gz: 41489a776527ad2557741bb5ba6b8a0d8514932bb4e277ed3d03614e9f6f510b
+  data.tar.gz: 7e050cf0a1bc84f8deafab900409193b3da2b71287db6c357eeddb4352dc416a
 SHA512:
-  metadata.gz: 2384b71e26cbc6c95ad6fccff1852971d442c3c445578f26a2d380fbc54913665ed1e7c7240978da31dd567a5f327b8736485b03c6636ff25d7ffb67716963dc
-  data.tar.gz: 63d840ef41faaf02d8680f7dbb81a341e0e51dc681b284d8d07628fe5cdbce9529189f08561c79144d143632566e7473bab04ac34a6acc8ef87427e617f87a45
+  metadata.gz: b13f7c2d72ea184c77e030c14f59506c105852fb4834589fe97e5d2aa5165c6766cbfa1ea0682ba380f13f796e28ee3c12be8ed4f153ed3a0af6fe1c92ed6792
+  data.tar.gz: 1e4ba5189ee5ae4d5fde0f3cb05cf71bef9f505d5bb9ea6719c146ced9faa16808e3c4bbf4cc80dbe324decc55d668397faba131b62fda7f6c0760010c53c9e3

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_ieee/data_parser.rb

@@ -153,17 +153,25 @@ module RelatonIeee
       doc.xpath("./publicationinfo/publisher").map do |contrib|
         n = contrib.at("./publishername").text
         addr = contrib.xpath("./address").each_with_object([]) do |adr, ob|
-          city = adr.at("./city")
-          next unless city
+          city, country, state = parse_country_city adr
+          next unless city && country
 
-          ob << RelatonBib::Address.new(street: [], city: city.text,
-                                        country: adr.at("./country").text)
+          ob << RelatonBib::Address.new(street: [], city: city, state: state, country: country)
         end
         e = create_org n, addr
         RelatonBib::ContributionInfo.new entity: e, role: [type: "publisher"]
       end
     end
 
+    def parse_country_city(address)
+      city = address.at("./city")
+      return unless city
+
+      city, state = city.text.split(", ")
+      country = address.at("./country")&.text || "USA"
+      [city, country, state]
+    end
+
     #
     # Create organization
     #
@@ -335,7 +343,8 @@ module RelatonIeee
     # @return [String] doctype
     #
     def parse_doctype
-      parse_standard_modified == "Redline" ? "redline" : "standard"
+      type = parse_standard_modified == "Redline" ? "redline" : "standard"
+      DocumentType.new type: type
     end
   end
 end

data/lib/relaton_ieee/document_type.rb

@@ -0,0 +1,17 @@
+module RelatonIeee
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[guide recommended-practice standard witepaper redline other].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    def check_type(type)
+      unless DOCTYPES.include? type
+        Util.warn "Invalid doctype: `#{type}`. " \
+                  "It should be one of: `#{DOCTYPES.join('`, `')}`."
+      end
+    end
+  end
+end

data/lib/relaton_ieee/hash_converter.rb

@@ -1,40 +1,44 @@
 module RelatonIeee
-  class HashConverter < RelatonBib::HashConverter
-    class << self
-      # @param args [Hash]
-      # @param neated [TrueClas, FalseClass] default true
-      # @return [Hash]
-      def hash_to_bib(args)
-        hash = super
-        return unless hash.is_a?(Hash)
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+    # @param args [Hash]
+    # @param neated [TrueClas, FalseClass] default true
+    # @return [Hash]
+    def hash_to_bib(args)
+      hash = super
+      return unless hash.is_a?(Hash)
 
-        # editorialgroup_hash_to_bib hash
-        ext_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]
-      def bib_item(item_hash)
-        IeeeBibliographicItem.new(**item_hash)
-      end
+    # @param item_hash [Hash]
+    # @return [RelatonIeee::IeeeBibliographicItem]
+    def bib_item(item_hash)
+      IeeeBibliographicItem.new(**item_hash)
+    end
 
-      # @param hash [Hash]
-      def editorialgroup_hash_to_bib(hash)
-        return unless hash[:editorialgroup]
+    # @param hash [Hash]
+    def editorialgroup_hash_to_bib(hash)
+      return unless hash[:editorialgroup]
 
-        hash[:editorialgroup] = EditorialGroup.new(**hash[:editorialgroup])
-      end
+      hash[:editorialgroup] = EditorialGroup.new(**hash[:editorialgroup])
+    end
 
-      def ext_hash_to_bib(hash)
-        ext = hash.delete(:ext)
-        return unless ext
+    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
+      attrs = %i[standard_status standard_modified pubstatus holdstatus]
+      ext.select { |k, _| attrs.include? k }.each do |k, v|
+        hash[k] = v
       end
     end
+
+    def create_doctype(**args)
+      DocumentType.new(**args)
+    end
   end
 end

data/lib/relaton_ieee/ieee_bibliographic_item.rb

@@ -1,6 +1,5 @@
 module RelatonIeee
   class IeeeBibliographicItem < RelatonBib::BibliographicItem
-    DOCTYPES = %w[guide recommended-practice standard witepaper redline other].freeze
     SUBTYPES = %w[amendment corrigendum erratum].freeze
 
     # @return [RelatonIeee::EditorialGroup, nil]
@@ -24,10 +23,6 @@ module RelatonIeee
     # @option args [String, nil] :holdstatus Held, Publish
     #
     def initialize(**args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      if args[:doctype] && !DOCTYPES.include?(args[:doctype])
-        Util.warn "Invalid doctype: `#{args[:doctype]}`. " \
-                  "It should be one of: `#{DOCTYPES.join('`, `')}`."
-      end
       if args[:docsubtype] && !SUBTYPES.include?(args[:docsubtype])
         Util.warn "Invalid docsubtype: `#{args[:docsubtype]}`. " \
                   "It should be one of: `#{SUBTYPES.join('`, `')}`."
@@ -68,7 +63,7 @@ module RelatonIeee
         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
+            doctype&.to_xml b
             b.subdoctype subdoctype if subdoctype
             b.send :"trial-use", trialuse unless trialuse.nil?
             editorialgroup&.to_xml(b)

data/lib/relaton_ieee/version.rb

@@ -1,3 +1,3 @@
 module RelatonIeee
-  VERSION = "1.16.3".freeze
+  VERSION = "1.17.0".freeze
 end

data/lib/relaton_ieee.rb

@@ -6,6 +6,7 @@ require "relaton_bib"
 require "relaton_ieee/version"
 require "relaton_ieee/config"
 require "relaton_ieee/util"
+require "relaton_ieee/document_type"
 require "relaton_ieee/document_status"
 require "relaton_ieee/ieee_bibliography"
 require "relaton_ieee/ieee_bibliographic_item"

data/relaton_ieee.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", "~> 2.7.0"
   spec.add_dependency "mini_portile2", "~> 2.8.0"
-  spec.add_dependency "relaton-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-bib", "~> 1.17.0"
   spec.add_dependency "relaton-index", "~> 0.2.0"
   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.16.3
+  version: 1.17.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-index
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- 3185.zip
 - Gemfile
 - LICENSE.txt
 - README.adoc
@@ -112,6 +113,7 @@ files:
 - lib/relaton_ieee/data_fetcher.rb
 - lib/relaton_ieee/data_parser.rb
 - lib/relaton_ieee/document_status.rb
+- lib/relaton_ieee/document_type.rb
 - lib/relaton_ieee/editorial_group.rb
 - lib/relaton_ieee/hash_converter.rb
 - lib/relaton_ieee/ieee_bibliographic_item.rb