pubid-ieee 0.2.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c39ac43789fb576d032ed8907c5c130c99a4efc3c1a3d25d24e697b89814aba
-  data.tar.gz: 0e7094c52ca4117f48e350e35e0bdfacb84d7256a75766a2da0d1a0728a91bdf
+  metadata.gz: 54475d8eda5cb1c2a1b5963b81fed10c0e9c140f26c2ae9cc87fc8fdccb53b91
+  data.tar.gz: 0621c17ab7a6c3d0954fd8bb7cab835bb6bdf722c0045c7f53c5f6dd9aa39153
 SHA512:
-  metadata.gz: 5de60ef5c6a3c5220eefeb989c183a508e5db312c983eab114d4771702d5bd5a4ee01028d93499036916ea38ea1062e45ad7f9b1999093b3fbf8ba037c372f1f
-  data.tar.gz: a55911eebc7b2a4964f6a8be5955ad0c0f750c5f6047daa0bd392d35b19aa719d30a4c42c29b1c75a0ddb0f3d6999597a583d8416c09c47a3e74cc2eaa47b835
+  metadata.gz: be58ef300b8821a14c19a5d8659513952e352bd8686a454f17bf1d358179c825645839dbb14d23d5fd034bf7ffafe288e10432fcdec32e170c4d699a7d2c8eb7
+  data.tar.gz: 63b336a44c3b1927dd59c651a4c21bf6d358212fe29c99f19f81f43d14111d162b910a0934e061ae38198b1a062f3c98c28f1779f86d5b68bfe1a36ba8f45b1f

data/lib/pubid/ieee/errors.rb

@@ -1,6 +1,5 @@
 module Pubid::Ieee
   module Errors
-    class ParseError < StandardError; end
     class ParseTypeError < StandardError; end
   end
 end

data/lib/pubid/ieee/identifier/base.rb

@@ -10,7 +10,7 @@ module Pubid::Ieee
                     :draft_status, :revision, :adoption_year, :amendment, :supersedes,
                     :corrigendum, :corrigendum_comment, :reaffirmed, :incorporates,
                     :supplement, :proposal, :iso_identifier, :iso_amendment,
-                    :iteration, :includes, :adoption
+                    :iteration, :includes, :adoption, :day
 
       def initialize(publisher: "IEEE", number: nil, stage: nil, subpart: nil, edition: nil,
                      draft: nil, redline: nil, month: nil, revision: nil,
@@ -19,20 +19,12 @@ module Pubid::Ieee
                      amendment: nil, supersedes: nil, corrigendum: nil,
                      corrigendum_comment: nil, reaffirmed: nil,
                      incorporates: nil, supplement: nil, proposal: nil,
-                     iso_amendment: nil, iteration: nil, includes: nil, adoption: nil, **opts)
+                     iso_amendment: nil, iteration: nil, includes: nil, adoption: nil,
+                     year: nil, day: nil, **opts)
 
         super(**opts.merge(number: number, publisher: publisher))#.merge(amendments: amendments, corrigendums: corrigendums))
 
-        if edition
-          @edition = edition.update(edition) do |key, value|
-            case key
-            when :year, :month
-              value.to_i
-            else
-              value
-            end
-          end
-        end
+        @edition = edition if edition
 
         @proposal = @number.to_s[0] == "P"
         @revision = revision
@@ -71,6 +63,8 @@ module Pubid::Ieee
         @iteration = iteration
         @includes = includes
         @adoption = adoption
+        @year = year.is_a?(Array) ? year.first.to_i : year.to_i if year
+        @day = day.to_i if day
       end
 
       def self.type
@@ -94,26 +88,65 @@ module Pubid::Ieee
       end
 
 
-      def self.parse(code)
-        parsed = Parser.new.parse(update_old_code(code))
-        transform(parsed)
+      def self.transform_parameters(params)
+        return params if params == ""
+
+        if params[:iso_identifier]
+          if params[:iso_identifier].is_a?(Array)
+            params[:iso_identifier] = array_to_hash(params[:iso_identifier])
+          end
+
+          if params[:iso_identifier][:month]
+            params[:month] = params[:iso_identifier][:month]
+            params[:year] = params[:iso_identifier][:year]
+            params[:iso_identifier].delete(:year)
+            params[:iso_identifier].delete(:month)
+          end
+        end
 
-      rescue Parslet::ParseFailed => failure
-        raise Pubid::Ieee::Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
+        params.map do |k, v|
+          case k
+          when :parameters, :draft, :alternative
+            v = Identifier.merge_parameters(v) if k == :draft
+            # apply transformer for each separate item when array provided
+            if v.is_a?(Array)
+              get_transformer_class.new.apply(k => v.map { |vv| transform_parameters(vv) })
+            else
+              get_transformer_class.new.apply(k => transform_parameters(v))
+            end
+          when :iso_identifier
+            v = Identifier.merge_parameters(v)
+            result = get_transformer_class.new.apply(k => v)
+            # apply transformation when output was transformed to IEEE
+            result.key?(:iso_identifier) ? result : transform_parameters(result)
+          else
+            get_transformer_class.new.apply(k => v)
+          end
+        end.inject({}, :merge)
       end
 
       def self.transform(params)
-        identifier_params = params.map do |k, v|
-          get_transformer_class.new.apply(k => v)
-        end.inject({}, :merge)
+        # transform inside parameters
+
+        identifier_params = transform_parameters(
+          Identifier.convert_parser_parameters(**params),
+        )
+
+        if identifier_params.key?(:draft) && identifier_params[:draft].key?(:year)
+          identifier_params[:year] = identifier_params[:draft][:year]
+          identifier_params[:month] = identifier_params[:draft][:month]
+          identifier_params[:day] = identifier_params[:draft][:day]
+          identifier_params[:draft].delete(:year)
+          identifier_params[:draft].delete(:month)
+        end
 
-        Identifier.create(**Identifier.convert_parser_parameters(**identifier_params))
+        Identifier.create(**identifier_params)
       end
 
       # @param [:short, :full] format
       def to_s(format = :short, with_trademark: false)
         opts = { format: format, with_trademark: with_trademark }
-        (@iso_identifier ? @iso_identifier.to_s(format: :ref_num_short) : "") +
+        (@iso_identifier ? @iso_identifier.to_s(format: :ref_num_short, with_edition: true) : "") +
           self.class.get_renderer_class.new(to_h(deep: false)).render(**opts) +
           (with_trademark ? trademark(@number) : "")
       end
@@ -130,6 +163,10 @@ module Pubid::Ieee
         def get_transformer_class
           Transformer
         end
+
+        def get_parser_class
+          Parser
+        end
       end
     end
   end

data/lib/pubid/ieee/identifier.rb

@@ -43,7 +43,7 @@ module Pubid::Ieee
       end
 
       def has_stage?(stage)
-        Pubid::Iso::Identifier.has_stage?(stage)
+        Pubid::Iso::Identifier.has_stage?(stage) || Pubid::Iso::Parser::TYPED_STAGES.include?(stage)
       end
     end
   end

data/lib/pubid/ieee/parser.rb

@@ -16,7 +16,7 @@ module Pubid::Ieee
     rule(:words_digits) { match('[\dA-Za-z]').repeat(1) }
     rule(:words) { match("[A-Za-z]").repeat(1) }
     rule(:words?) { words.maybe }
-    rule(:year_digits) { (str("19") | str("20")) >> match('\d').repeat(2, 2) }
+    rule(:year_digits) { (str("19") | str("20")) >> match('\d').repeat(2, 2) >> digits.absent? }
 
     rule(:month_digits) do
       match('\d').repeat(2, 2)
@@ -32,11 +32,11 @@ module Pubid::Ieee
 
     rule(:organization) do
       str("IEEE") | str("AIEE") | str("ANSI") | str("ASA") | str("NCTA") |
-        str("IEC") | str("ISO") | str("ASTM") | str("NACE") | str("NSF")
+        str("IEC") | str("ISO") | str("ASTM") | str("NACE") | str("NSF") | str("ASHRAE")
     end
 
     rule(:number) do
-      str("D").absent? >> ((digits | match("[A-Z]")).repeat(1) >> match("[a-z]").maybe).as(:number)
+      str("D").absent? >> (str("P").maybe >> (digits | match("[A-Z]")).repeat(1) >> match("[a-z]").maybe).as(:number)
     end
 
     rule(:type) do
@@ -49,7 +49,7 @@ module Pubid::Ieee
 
     rule(:edition) do
       (comma >> year_digits.as(:year) >> str(" Edition")) |
-        ((space | dash) >> str("Edition ") >> (digits >> dot >> digits).as(:version) >> (str(" - ") | space) >>
+        ((space | dash) >> str("Edition ") >> (digits >> dot >> digits).as(:edition) >> (str(" - ") | space) >>
         year_digits.as(:year) >> (dash >>
           month_digits.as(:month)).maybe) |
         #, February 2018 (E)
@@ -57,7 +57,7 @@ module Pubid::Ieee
         # (comma_month_year >> space? >> str("(E)")) |
         # comma_month_year |
         # First edition 2002-11-01
-        space >> str("First").as(:version) >>
+        space >> str("First").as(:edition) >>
         str(" edition ") >>
           year_digits.as(:year) >> dash >>
           month_digits.as(:month) >> (dash >>
@@ -74,7 +74,7 @@ module Pubid::Ieee
     end
 
     rule(:draft_date) do
-      ((space? >> comma | space) >> words.as(:month)).maybe >>
+      ((space? >> str(",") >> space? | space) >> words.as(:month)).maybe >>
         (
           ((space >> digits.as(:day)).maybe >> comma >> year_digits.as(:year)) |
             (comma_space >> match('\d').repeat(2, 4).as(:year))
@@ -86,14 +86,15 @@ module Pubid::Ieee
       (str("D") >> digits.as(:version)).repeat(2) |
       # for DD3, D3Q
       # don't parse "DIS" as draft
-      (str("D") >> str("IS").absent? >> words_digits.as(:version)).repeat(1, 1)
+      # "-d" suffix for IEEE Unapproved Draft Std P336/D2009-d, Jul 2009
+      (str("D") >> str("IS").absent? >> str("-").maybe >> (words_digits >> str("-d").maybe).as(:version)).repeat(1, 1)
     end
 
     rule(:draft) do
       # /D14, April 2020
       # /D7 November, 2019
       (draft_prefix >> draft_version >>
-        ((dot | str("r")) >> (digits >> words?).as(:revision)).maybe >>
+        ((dot | str("r")) >> (digits >> words? >> (dot >> digits).maybe).as(:revision)).maybe >>
         draft_date.maybe).as(:draft)
     end
 
@@ -102,7 +103,7 @@ module Pubid::Ieee
     end
 
     rule(:subpart) do
-      (dot | dash) >> ((str("REV") | str("Rev")).maybe >> match('[\da-z]').repeat(1) | (str("REV") | str("Rev")))
+      (dot | dash | str("_")) >> ((str("REV") | str("Rev")).maybe >> match('[\da-z]').repeat(1) >> (dot >> digits).maybe | (str("REV") | str("Rev")))
     end
 
     rule(:part_subpart_year) do
@@ -119,7 +120,7 @@ module Pubid::Ieee
         # C57.19.101
         (part >> subpart.as(:subpart)) |
         # IEC 62525-Edition 1.0 - 2007
-        edition.as(:edition) |
+        edition |
         # IEEE P11073-10101
         # IEEE P11073-10420/D4D5
         # IEEE Unapproved Draft Std P11073-20601a/D13, Jan 2010
@@ -146,9 +147,9 @@ module Pubid::Ieee
     rule(:dual_pubid_without_parameters) do
       space? >>
         (
-          (str("(") >> (iso_identifier >> iso_parameters).as(:alternative) >> str(")") |
-            str("(") >> (identifier_no_params.as(:alternative) >> str(", ").maybe).repeat(1) >> str(")"))# |
-          #identifier_no_params.as(:alternative)
+          (str("(") >> (identifier_no_params.as(:alternative) >> str(", ").maybe).repeat(1) >> str(")") |
+            str("(") >> (iso_identifier >> iso_parameters).as(:alternative) >> str(")")
+            )
         )
     end
 
@@ -231,9 +232,9 @@ module Pubid::Ieee
         (
           # IEEE P2410-D4, July 2019
           (draft |
-            part_subpart_year.maybe >> corrigendum.maybe >> draft.maybe >> iso_amendment.maybe
+            part_subpart_year.maybe >> edition.maybe >> corrigendum.maybe >> draft.maybe >> iso_amendment.maybe
           ) >>
-            # iso_stage_part_iteration.maybe >>
+            iso_stage_part_iteration.repeat >>
             # ((str("-") | str("/") | str("_")) >> (str("D") >> digits).absent? >>
             #   (iso_parser.typed_stage.as(:stage) | iso_parser.stage.as(:stage))) >> digits.as(:iteration).maybe >>
             if skip_parameters
@@ -244,7 +245,7 @@ module Pubid::Ieee
             if skip_parameters
               str("")
             else
-              edition.as(:edition).maybe
+              edition.maybe
             end >>
             # dual-PubIDs
             ((without_dual_pubids && str("")) || dual_pubids.maybe) >>
@@ -357,19 +358,21 @@ module Pubid::Ieee
         (str("P").maybe >> iso_parser.digits).as(:number) >> iso_parser.iteration.maybe >>
       # for identifiers like ISO 5537/IDF 26
       (str("|") >> (str("IDF") >> str(" ") >> digits).as(:joint_document)).maybe >>
+        (str(":") >> iso_parser.year).maybe >>
         iso_part_stage_iteration_matcher.maybe >>
       (str(" ").maybe >> str(":") >> iso_parser.year).maybe >>
       # stage before amendment
-      (
-      # stage before corrigendum
-      iso_parser.supplement.maybe) >>
+      iso_amendment.maybe >>
+      corrigendum.maybe >>
+      iso_parser.supplement.maybe >>
+        (edition | iso_parser.edition ).maybe >>
         iso_parser.language.maybe).as(:iso_identifier)
     end
 
     rule(:iso_parameters) do
       iso_amendment.maybe >> (dual_pubid_without_parameters.maybe >>
         (publication_date >> space? >> str("(E)").maybe).maybe >>
-        edition.as(:edition).maybe >> draft.maybe >> additional_parameters).as(:parameters)
+        edition.maybe >> draft.maybe >> additional_parameters).as(:parameters)
     end
 
     rule(:identifier_before_edition) do

data/lib/pubid/ieee/renderer/base.rb

@@ -4,11 +4,19 @@ module Pubid::Ieee::Renderer
       if params[:iso_identifier].to_s != "" && params[:number] != ""
         " (%{publisher}%{stage}%{draft_status}%{type}%{number}%{iteration}%{part}%{subpart}%{month}%{year}%{corrigendum_comment}"\
         "%{corrigendum}%{draft}%{edition})%{alternative}%{supersedes}%{reaffirmed}%{incorporates}%{supplement}"\
-        "%{revision}%{iso_amendment}%{amendment}%{includes}%{redline}%{adoption}" % params
+        "%{revision}%{iso_amendment}%{amendment}%{edition}%{includes}%{redline}%{adoption}" % params
       else
-        "%{publisher}%{stage}%{draft_status}%{type}%{number}%{iteration}%{part}%{subpart}%{month}%{year}%{corrigendum_comment}"\
-        "%{corrigendum}%{draft}%{edition}%{alternative}%{supersedes}%{reaffirmed}%{incorporates}%{supplement}"\
-        "%{revision}%{iso_amendment}%{amendment}%{includes}%{redline}%{adoption}" % params
+        if params[:day].empty? && params[:month].empty?
+          # if only year - edition and draft after year
+          "%{publisher}%{draft_status}%{type}%{number}%{part}%{subpart}%{stage}"\
+          "%{year}%{edition}%{corrigendum_comment}%{corrigendum}%{draft}%{alternative}%{supersedes}%{reaffirmed}%{incorporates}%{supplement}"\
+          "%{revision}%{iso_amendment}%{amendment}%{includes}%{redline}%{adoption}" % params
+        else
+          # if year and month - edition and draft before
+          "%{publisher}%{draft_status}%{type}%{number}%{part}%{subpart}%{edition}%{stage}"\
+          "%{corrigendum_comment}%{corrigendum}%{draft}%{month}%{day}%{year}%{alternative}%{supersedes}%{reaffirmed}%{incorporates}%{supplement}"\
+          "%{revision}%{iso_amendment}%{amendment}%{includes}%{redline}%{adoption}" % params
+        end
       end
     end
 
@@ -22,18 +30,30 @@ module Pubid::Ieee::Renderer
     end
 
     def render_type(type, opts, params)
-      result = type.to_s(params[:publisher] == "IEEE" ? opts[:format] : :alternative)
+      result = if params[:publisher] == "IEEE" ||
+                 (params[:copublisher].is_a?(Array) && params[:copublisher].include?("IEEE") || params[:copublisher] == "IEEE")
+                 type.to_s(opts[:format])
+               else
+                 type.to_s(:alternative)
+               end
 
       " #{result}" unless result.empty?
-      #" #{type}"
     end
 
     def render_part(part, _opts, _params)
-      "#{part}"
+      (part =~ /^[-.]/ ? "" : "-") + part
     end
 
-    def render_month(month, _opts, _params)
-      ", #{month}"
+    def render_day(day, _opts, params)
+      # month = Date.parse(params[:month]).month
+      # " %s-%s-%02d" % [params[:year], month, day]
+      " #{day}"
+    end
+
+    def render_month(month, _opts, params)
+      # return if params[:day]
+
+      ", #{Date::MONTHNAMES[month]}"
     end
 
     def render_corrigendum_comment(corrigendum_comment, _opts, params)
@@ -41,7 +61,10 @@ module Pubid::Ieee::Renderer
     end
 
     def render_year(year, _opts, params)
-      return " #{year}" if params[:month]
+      # return if params[:day]
+
+      # add comma when day appears before year
+      return (params[:day] ? "," : "") + " #{year}" if params[:month]
 
       if params[:corrigendum_comment]
         "-#{params[:corrigendum_comment].year}"
@@ -61,26 +84,27 @@ module Pubid::Ieee::Renderer
     end
 
     def render_edition(edition, _opts, _params)
-      result = ""
-      if edition[:version]
-        result += edition[:version] == "First" ? " Edition 1.0 " : " Edition #{edition[:version]} "
-      end
-
-      if edition[:year]
-        result += if edition[:version]
-                    "#{edition[:year]}"
-                  else
-                    " #{edition[:year]} Edition"
-                  end
-      end
+      edition == "First" ? " Edition 1.0" : " Edition #{edition}"
+      # result = ""
+      # if edition[:version]
+      #   result +=
+      # end
 
-      if edition[:month]
-        month = edition[:month]
-        month = Date.parse(edition[:month]).month if month.to_i.zero?
-        result += "-#{sprintf('%02d', month)}"
-      end
-      result += "-#{edition[:day]}" if edition[:day]
-      result
+      # if edition[:year]
+      #   result += if edition[:version]
+      #               " #{edition[:year]}"
+      #             else
+      #               " #{edition[:year]} Edition"
+      #             end
+      # end
+      #
+      # if edition[:month]
+      #   month = edition[:month]
+      #   month = Date.parse(edition[:month]).month if month.to_i.zero?
+      #   result += "-#{sprintf('%02d', month)}"
+      # end
+      # result += "-#{edition[:day]}" if edition[:day]
+      # result
     end
 
     def render_alternative(alternative, _opts, _params)
@@ -91,14 +115,19 @@ module Pubid::Ieee::Renderer
       end
     end
 
-    def render_draft(draft, _opts, _params)
+    def render_draft(draft, _opts, params)
       draft = Pubid::Ieee::Identifier.merge_parameters(draft) if draft.is_a?(Array)
 
-      result = "/D#{draft[:version].is_a?(Array) ? draft[:version].join('D') : draft[:version]}"
+      result = if draft[:version].is_a?(Array)
+                 "/D#{draft[:version].join('D')}"
+               else
+                 "/#{draft[:version].to_s.match?(/^\d/) ? 'D' : ''}#{draft[:version]}"
+               end
+      result += "#{params[:iteration]}" if params[:iteration]
       result += ".#{draft[:revision]}" if draft[:revision]
-      result += ", #{draft[:month]}" if draft[:month]
-      result += " #{draft[:day]}," if draft[:day]
-      result += " #{draft[:year]}" if draft[:year]
+      # result += ", #{draft[:month]}" if draft[:month]
+      # result += " #{draft[:day]}," if draft[:day]
+      # result += " #{draft[:year]}" if draft[:year]
       result
     end
 
@@ -180,5 +209,9 @@ module Pubid::Ieee::Renderer
     def render_adoption(adoption, opts, _params)
       " (Adoption of #{Pubid::Ieee::Identifier::Base.transform(**adoption)})"
     end
+
+    def render_stage(stage, _opts, _params)
+      "/#{stage}"
+    end
   end
 end

data/lib/pubid/ieee/transformer.rb

@@ -1,11 +1,11 @@
 module Pubid::Ieee
   class Transformer < Parslet::Transform
-    rule(month: simple(:month), year: simple(:year)) do |date|
-      update_month_year(date[:month], date[:year])
+    rule(month: simple(:month)) do |month|
+      { month: update_month(month[:month]) }
     end
 
-    rule(month: simple(:month), year: simple(:year), day: simple(:day)) do |date|
-      update_month_year(date[:month], date[:year]).merge({ day: date[:day] })
+    rule(year: subtree(:year)) do |data|
+      { year: update_year(data[:year].is_a?(Array) ? data[:year].first : data[:year]) }
     end
 
     rule(identifier: subtree(:identifier)) do |data|
@@ -16,16 +16,72 @@ module Pubid::Ieee
       end
     end
 
+    rule(iso_identifier: subtree(:iso_identifier)) do |data|
+      # apply transformer to :iso_identifier => :month
+      if data[:iso_identifier].key?(:month)
+        data[:iso_identifier][:month] = update_month(data[:iso_identifier][:month])
+      end
+      # keep identifier in ISO format if it have ISO format Amendment in "supplements"
+      if (data[:iso_identifier][:publisher] == "IEEE" ||
+        (data[:iso_identifier][:copublisher].is_a?(Array) && data[:iso_identifier][:copublisher].include?("IEEE") ||
+          data[:iso_identifier][:copublisher] == "IEEE")) && !data[:iso_identifier].key?(:supplements) &&
+          !data[:iso_identifier].key?(:type)
+        if data[:iso_identifier].key?(:stage)
+          data[:iso_identifier][:draft] = { version: data[:iso_identifier][:stage] }
+          data[:iso_identifier][:stage] = nil
+        end
+        data[:iso_identifier]
+      else
+        if data[:iso_identifier][:corrigendum]
+          corrigendum = data[:iso_identifier][:corrigendum]
+          data[:iso_identifier][:supplements] = [
+            { type: "cor",
+              year: corrigendum[:year],
+              number: corrigendum[:version] },
+          ]
+          data[:iso_identifier].delete(:corrigendum)
+        end
+
+        # type status cannot be rendered in pubid-iso
+        data[:iso_identifier].delete(:type_status)
+        data
+      end
+    end
+
+    rule(stage: simple(:stage)) do |data|
+      { draft: { version: data[:stage] } }
+    end
+
+    rule(stage: simple(:stage), iteration: simple(:iteration)) do |data|
+      { draft: { version: data[:stage] }, iteration: data[:iteration] }
+    end
+
+    rule(stage: simple(:stage), iteration: simple(:iteration),
+         part: simple(:part)) do |data|
+      { draft: { version: data[:stage] }, iteration: data[:iteration] }.merge(part: data[:part])
+    end
+
+    def self.update_year(year)
+      if year.length == 2
+        case year.to_i
+        when 0..25 then "20#{year}"
+        when 26..99 then "19#{year}"
+        end
+      else
+        year
+      end
+    end
+
+    def self.update_month(month)
+      return month if month.is_a?(Integer)
+
+      # add year when only month digits provided to avoid parsing digits as year
+      Date.parse("1999/#{month}").month
+    end
+
     def self.update_month_year(month, year)
-      { year: if year.length == 2
-                case year.to_i
-                when 0..25 then "20#{year}"
-                when 26..99 then "19#{year}"
-                end
-              else
-                year
-              end,
-        month: Date.parse(month).strftime("%B") }
+      { year: update_year(year),
+        month: update_month(month) }
     end
 
     rule(type: simple(:type)) do

data/lib/pubid/ieee/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Ieee
-    VERSION = "0.2.1".freeze
+    VERSION = "1.15.0".freeze
   end
 end

data/update_codes.yaml

@@ -54,8 +54,51 @@ IEEE 1023-2020 (Revision of IEEE Std 1023-2004): IEEE No 1023-2020 (Revision of
 # Remove Unapproved Draft Std for ISO style identifiers with iso stage
 # using "[A-Z]{2,}" to exclude /D12 (drafts) from match
 # IEEE Unapproved Draft Std P15026.2/FCD -> IEEE P15026.2/FCD
-/(IEEE )(?:Unapproved )?(?:Draft )?Std (P[\d.]+[_/][A-Z]{2,}\d?)/: \1\2
+#/(IEEE )(?:Unapproved )?(?:Draft )?Std (P[\d.]+[_/][A-Z]{2,}\d?)/: \1\2
 IEEE P90003-2014, April 2015: IEEE P90003, April 2015
 # Add space between year and month for dates without space, e.g. "Jul2014" -> "Jul 2014"
 /, (\w{3,4})(\d{4,4})$/: ", \\1 \\2"
 IEC/IEEE P61886-1_D2_May2020: IEC/IEEE P61886-1_D2, May 2020
+IEEE Unapproved P1076.1/D-3.3-07-Feb20: IEEE Unapproved P1076.1/D-3.3-2007-02
+IEEE Unapproved P11073.10407/D-09-08-Sep20: IEEE Unapproved P11073.10407/D-09-2008-09
+IEEE Unapproved P1597.2/D-7.1-09-Oct20: IEEE Unapproved P1597.2/D7.1-2009-10
+IEEE Unapproved P7.4.3.2/D-3-2010-01: IEEE Unapproved P7-4.3.2/D-3-2010-01
+IEEE Unapproved P802.11k/D-13.0_Mar-08-20: IEEE Unapproved P802.11k/D-13.0-2008-03
+IEEE Unapproved P802.16g/D-8-07-Feb20: IEEE Unapproved P802.16g/D-8-2007-02
+#IEEE Unapproved P802.16_Rev2/D-2-2007: IEEE Unapproved P802.16Rev2/D-2-2007
+IEEE Unapproved P802.1ah/D-4.-2008-02: IEEE Unapproved P802.1ah/D-4-2008-02
+IEEE Unapproved P802.20.2/D-2.0-09-Oct20: IEEE Unapproved P802.20.2/D-2.0-2009-10
+IEEE Unapproved P802.3/D-D1.1/Cor1-2009: IEEE Unapproved P802.3/D1.1/Cor1-2009
+IEEE Unapproved Std PC57.129_D9, Mar07: IEEE Unapproved Std PC57.129_D9, Mar 07
+IEEE Unapproved Draft Std PC62.21_D3, Sep07: IEEE Unapproved Draft Std PC62.21_D3, Sep 07
+IEEE Unapproved Draft Std P2600.2/D41b, Jan09: IEEE Unapproved Draft Std P2600.2/D41b, Jan 09
+IEEE Active Unapproved Draft Std IEEE PC37.06/D8.3, July 2007: IEEE Active Unapproved Draft Std PC37.06/D8.3, July 2007
+IEEE Unapproved Draft Std PC57.21/D14, Dec. 2007: IEEE Unapproved Draft Std PC57.21/D14, Dec 2007
+IEEE Unapproved Draft Std P802.1AB/REVD2.2, Dec 2007: IEEE Unapproved Draft Std P802.1AB/D2.2, Dec 2007
+IEEE Unapproved Draft Std PC37.301/D3 R1, Feb 2008: IEEE Unapproved Draft Std PC37.301/D3.1, Feb 2008
+IEEE Unapproved Draft Std PC37.27/D16_Dec 2007: IEEE Unapproved Draft Std PC37.27/D16, Dec 2007
+IEEE Unapproved Draft Std PC37.13 / D21, Dec 2007: IEEE Unapproved Draft Std PC37.13/D21, Dec 2007
+IEEE Unapproved Draft Std P802.1ah/D4., Feb 2008: IEEE Unapproved Draft Std P802.1ah/D4, Feb 2008
+IEEE Unapproved Draft Std P802.11k_D13.0_Mar 2008: IEEE Unapproved Draft Std P802.11k_D13.0, Mar 2008
+IEEE Unapproved Draft Std P1776/D9b, Feb. 2008: IEEE Unapproved Draft Std P1776/D9b, Feb 2008
+IEEE Unapproved Draft Std PC62.21-2003-Cor_1/D5, Mar 2008: IEEE Unapproved Draft Std PC62.21-2003-Cor1/D5, Mar 2008
+IEEE Unapproved Draft Std P1003.1 Draft 5.1, May 2008: IEEE Unapproved Draft Std P1003.1/D5.1, May 2008
+IEEE Unapproved Draft Std P802-1Qay/D5-0, Jan 09: IEEE Unapproved Draft Std P802-1Qay/D5.0, Jan 09
+IEEE Unapproved Draft Std P1775/1.9.7, Mar 2009: IEEE Unapproved Draft Std P1775/D1.9.7, Mar 2009
+IEEE Unapproved Draft Std P1044/D00005, Aug-2009: IEEE Unapproved Draft Std P1044/D5, Aug 2009
+IEEE Unapproved Draft Std P1584b/ D2, Jul 2009: IEEE Unapproved Draft Std P1584b/D2, Jul 2009
+IEEE Unapproved Draft Std P11073-10421, D6, Oct 2009: IEEE Unapproved Draft Std P11073-10421/D6, Oct 2009
+IEEE Unapproved Draft Std PC37.13.1a/D3. Nov 2009: IEEE Unapproved Draft Std PC37.13.1a/D3, Nov 2009
+IEEE Unapproved Draft Std PC37.082_IEC62271-113/D2, Jan 2010: IEEE Unapproved Draft Std PC37.082/D2, Jan 2010 (IEC 62271-113)
+IEEE Unapproved Draft Std PC37.20.7-2001 Cor 1/D3, Aug 2009: IEEE Unapproved Draft Std PC37.20.7-2001/Cor 1/D3, Aug 2009
+IEEE Unapproved Draft Std PC37.20.7-2007 Cor 1/D4: IEEE Unapproved Draft Std PC37.20.7-2007/Cor 1/D4
+IEEE Unapproved Draft Std P802.3-2008 (P802.3bb)/Cor 1/D1.1, Jan 2009: IEEE Unapproved Draft Std P802.3-2008/Cor 1/D1.1, Jan 2009 (IEEE P802.3bb)
+IEEE Unapproved Draft Std P802.3-2008 (P802.3bb)/Cor 1/D2.0, Jul 2009: IEEE Unapproved Draft Std P802.3-2008/Cor 1/D2.0, Jul 2009 (IEEE P802.3bb)
+IEEE Unapproved Draft Std P16326:2008/CD2, Sep 2008: IEEE P16326:2008/CD2, Sep 2008
+IEEE Unapproved Draft Std 16326:2009: IEEE 16326:2009
+IEEE Unapproved Draft Std PC37.082_IEC62271-113/D2, Jan 2010: IEEE Unapproved Draft Std PC37.082/D2, Jan 2010 (IEC 62271-113)
+Unapproved Draft Std ISO/IEC FDIS 15288:2007(E) IEEE P15288/D3: IEEE Unapproved Draft Std P15288/D3 (ISO/IEC FDIS 15288:2007(E))
+IEEE Unapproved Draft Std P1635/ASHRAE 21_D4, Jan 2010: IEEE Unapproved Draft Std P1635/D4, January 2010 (ASHRAE 21)
+IEC/IEEE 62582-1:2011 Edition 1.0 2011-08: IEC/IEEE 62582-1-2011 Edition 1.0 2011-08
+ISO/IEC/IEEE CD P26513/D1, August 2015: ISO/IEC/IEEE P26513/D1, August 2015
+/C37.0I0d-1984/: C37.010d-1984

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pubid-ieee
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2025-06-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +28,16 @@ dependencies:
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 1.15.0
 description: Library to generate, parse and manipulate IEEE PubID.
 email:
 - open.source@ribose.com
@@ -92,7 +64,7 @@ homepage: https://github.com/metanorma/pubid-ieee
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +79,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Library to generate, parse and manipulate IEEE PubID.
 test_files: []