relaton-ieee 1.12.1 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9ad7ed0600b55a10bf86c90d4e9a0bd0b7b7b39f15b4162456227e3a79dd44
-  data.tar.gz: 35070ebc17399869b94e03cfb6922b29b3c57ab3d9e08d81e495fa5e25cdf199
+  metadata.gz: e06d850cd175596e9f8a50c8a88000ecd646fb4e9059082e26248269fb045380
+  data.tar.gz: a34c8e7e8ab5f4bcb95903ef2cdbc4185e97ab391f55aefb403bffeb39071e3c
 SHA512:
-  metadata.gz: 76541d16ef2c5b0e167f819306a4bcdf7ccc2d253eec34e8b442f70a27a3090b04722d3dd01e9d7b05d39408b2dc3b2cda7a9f4a81b77883ce289fb6929395ca
-  data.tar.gz: 1dad051905cc2721348fb90bd5ae758093b16aca56c5f435661bdfdeda05456ee198eb66fa0d46c49993d95e0ec5b798c50aef49d9104b553ff192f28fede4c0
+  metadata.gz: 8edfef0c1e20620b4a79afb43657f96d7cc4d783b34b3f0d66aa18aff07cf7fa1b358c4079e899ac1dc57ef082c146d4f1abac87de3cab3a2ba5ef7b6d4b5572
+  data.tar.gz: 32c965caf76d0e5b99e2390cbd3cff57c5dddd14a78c49bae54ec37f4968d735e73b8a67dda45f91f1569d452282ad727f9fea9f8048ce4bf8499a4fb6c75019

data/README.adoc

@@ -170,7 +170,7 @@ hash = YAML.load_file 'spec/fixtures/ieee_528_2019.yaml'
 
 === Fetch data
 
-There is an IEEE dataset https://github.com/ietf-ribose/ieee-rawbib which can be converted into BibXML/BibYAML formats. The dataset needs to be placed into local directiory.
+There is an IEEE dataset https://github.com/relaton/ieee-rawbib which can be converted into BibXML/BibYAML formats. The dataset needs to be placed into local directiory.
 
 The method `RelatonIeee::DataFetcher.fetch(output: "data", format: "yaml")` converts all the documents from the local `ieee-rawbib` directory and save them to the `./data` folder in YAML format.
 Arguments:

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

@@ -28,7 +28,7 @@ module RelatonIeee
       # @option args [String] :year
       # @option args [String] :month
       #
-      def initialize(number:, **args) # rubocop:disable Metrics/MethodLength
+      def initialize(number:, **args) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         @publisher = args[:publisher]
         @stage = args[:stage]
         @number = number
@@ -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
+        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
@@ -82,7 +87,7 @@ module RelatonIeee
       end
 
       def year_to_s
-        year ? ".#{year}" : ""
+        year ? "-#{year}" : ""
       end
 
       def month_to_s
@@ -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

@@ -458,7 +458,7 @@ module RelatonIeee
     #
     # @return [String]
     def sp(parts)
-      parts.gsub ".", "-"
+      parts # .gsub ".", "-"
     end
 
     #
@@ -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

@@ -39,7 +39,12 @@ module RelatonIeee
       # @param ref [String]
       # @return [Array<RelatonBib::DocumentIdentifier>]
       def fetch_docid(ref)
-        [RelatonBib::DocumentIdentifier.new(id: ref, type: "IEEE", primary: true)]
+        args = { id: ref, type: "IEEE", primary: true }
+        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.1".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.1
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml