relaton-ieee 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6ce7435bdf251b1180ba075e3585f7075c289ab5ad58bbf7e26706d3fe10fe
-  data.tar.gz: b6475b2c93336560e490fea100879389d4323a7854180114d724443af0332e52
+  metadata.gz: e06d850cd175596e9f8a50c8a88000ecd646fb4e9059082e26248269fb045380
+  data.tar.gz: a34c8e7e8ab5f4bcb95903ef2cdbc4185e97ab391f55aefb403bffeb39071e3c
 SHA512:
-  metadata.gz: 7a630fdfff66077109cbbbad786783488c79a687de9d60b75b1ed42b03a46ab98c11542abbdbb7497dbe3220183d1512f7457339edfad3b459591fe2a3c06676
-  data.tar.gz: f2027e366b04f6cc59c0e219526082d9f171d22fdbbf91c42077b07e0c37a8508a715f8fb9eb7ae55c50eaf8974970fff15b7f6ade8389438061aaceace766fc
+  metadata.gz: 8edfef0c1e20620b4a79afb43657f96d7cc4d783b34b3f0d66aa18aff07cf7fa1b358c4079e899ac1dc57ef082c146d4f1abac87de3cab3a2ba5ef7b6d4b5572
+  data.tar.gz: 32c965caf76d0e5b99e2390cbd3cff57c5dddd14a78c49bae54ec37f4968d735e73b8a67dda45f91f1569d452282ad727f9fea9f8048ce4bf8499a4fb6c75019

data/lib/relaton_ieee/data_parser.rb

@@ -113,8 +113,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")

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

@@ -471,9 +471,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 +497,7 @@ module RelatonIeee
     #
     # @param [Strin] edition
     #
-    # @return [String]
+    # @return [String, Integer]
     #
     def en(edition)
       case edition

data/lib/relaton_ieee/scrapper.rb

@@ -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]

data/lib/relaton_ieee/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ieee
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml