pubid-ieee 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9302100f8fc58e3b1c356d866a982f830a8c3331257ee7069e9c1160d347abe7
-  data.tar.gz: bd327f07a78a631284ea36d0962ff6ecbbe3dbb917e25152643b43e6882202a3
+  metadata.gz: 8c39ac43789fb576d032ed8907c5c130c99a4efc3c1a3d25d24e697b89814aba
+  data.tar.gz: 0e7094c52ca4117f48e350e35e0bdfacb84d7256a75766a2da0d1a0728a91bdf
 SHA512:
-  metadata.gz: 24de2e26b1e31b1547f0f557cbc3ddc0414a7a5dc37bc0c8ca31e697cfb11a214372e9923c23e26f2221822752a0556be5183e097ee79ba3ce6b2d614cd55c5b
-  data.tar.gz: 828523c08cd2bcca2229e00120f2c309cae15281f9984123574b0e8eb575c988bc0dfc2d91711a33c8e6234023f3313e2c2b5ce21ced35d9c8b810052c5e4f7f
+  metadata.gz: 5de60ef5c6a3c5220eefeb989c183a508e5db312c983eab114d4771702d5bd5a4ee01028d93499036916ea38ea1062e45ad7f9b1999093b3fbf8ba037c372f1f
+  data.tar.gz: a55911eebc7b2a4964f6a8be5955ad0c0f750c5f6047daa0bd392d35b19aa719d30a4c42c29b1c75a0ddb0f3d6999597a583d8416c09c47a3e74cc2eaa47b835

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

@@ -1,26 +1,38 @@
 require 'date'
 require "yaml"
 
-UPDATE_CODES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../../update_codes.yaml"))
-
 module Pubid::Ieee
+  UPDATE_CODES = YAML.load_file(File.join(File.dirname(__FILE__), "../../../../update_codes.yaml"))
+
   module Identifier
     class Base < Pubid::Core::Identifier::Base
-      attr_accessor :number, :publisher, :copublisher, :stage, :part, :subpart,
-                    :edition, :draft, :redline, :year, :month, :type, :alternative,
+      attr_accessor :subpart, :edition, :draft, :redline, :month, :alternative,
                     :draft_status, :revision, :adoption_year, :amendment, :supersedes,
                     :corrigendum, :corrigendum_comment, :reaffirmed, :incorporates,
-                    :supplement, :proposal, :iso_identifier, :iso_amendment
+                    :supplement, :proposal, :iso_identifier, :iso_amendment,
+                    :iteration, :includes, :adoption
 
       def initialize(publisher: "IEEE", number: nil, stage: nil, subpart: nil, edition: nil,
                      draft: nil, redline: nil, month: nil, revision: nil,
-                     iso_identifier: nil, type: :std, alternative: nil, draft_status: nil, adoption_year: nil,
-                     amendment: nil, supersedes: nil, corrigendum: nil, corrigendum_comment: nil, reaffirmed: nil,
-                     incorporates: nil, supplement: nil, proposal: nil, iso_amendment: nil, **opts)
+                     iso_identifier: nil, type: :std, alternative: nil,
+                     draft_status: nil, adoption_year: nil,
+                     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)
 
         super(**opts.merge(number: number, publisher: publisher))#.merge(amendments: amendments, corrigendums: corrigendums))
 
-        @edition = edition if edition
+        if edition
+          @edition = edition.update(edition) do |key, value|
+            case key
+            when :year, :month
+              value.to_i
+            else
+              value
+            end
+          end
+        end
 
         @proposal = @number.to_s[0] == "P"
         @revision = revision
@@ -56,6 +68,9 @@ module Pubid::Ieee
         @supplement = supplement
         @proposal = proposal
         @iso_amendment = iso_amendment
+        @iteration = iteration
+        @includes = includes
+        @adoption = adoption
       end
 
       def self.type
@@ -95,217 +110,27 @@ module Pubid::Ieee
         Identifier.create(**Identifier.convert_parser_parameters(**identifier_params))
       end
 
-      def self.get_transformer_class
-        Transformer
-      end
-
       # @param [:short, :full] format
       def to_s(format = :short, with_trademark: false)
-        if @iso_identifier
-          "#{@iso_identifier.to_s(format: :ref_num_short)}#{iso_amendment}#{dual_identifier}"
-        else
-          "#{identifier(format)}#{with_trademark ? trademark(@number) : ''}#{parameters}#{adoption}"
-        end
+        opts = { format: format, with_trademark: with_trademark }
+        (@iso_identifier ? @iso_identifier.to_s(format: :ref_num_short) : "") +
+          self.class.get_renderer_class.new(to_h(deep: false)).render(**opts) +
+          (with_trademark ? trademark(@number) : "")
       end
 
       def trademark(number)
         %w(802 2030).include?(number.to_s) ? "\u00AE" : "\u2122"
       end
 
-      def iso_amendment
-
-      end
-
-      def dual_identifier
-        @number ? " (#{identifier})#{parameters}" : "#{identifier}#{parameters}"
-      end
-
-      def publisher
-        "#{@publisher}#{copublisher} " if @publisher && @number
-      end
-
-      def identifier(format = :short)
-        "#{publisher}#{draft_status(format)}#{type(format)}#{number}#{part}"\
-          "#{subpart}#{year}#{revision_date}"
-      end
-
-      def parameters
-        "#{corrigendum}#{draft}#{edition}#{alternative}#{supersedes}"\
-        "#{reaffirmed}#{incorporates}#{supplement}#{revision}#{amendment}#{redline}"
-      end
-
-      def copublisher
-        return "" unless @copublisher
-
-        if @copublisher.is_a?(Array)
-          @copublisher&.map { |c| "/#{c}" }&.join
-        else
-          "/#{@copublisher}"
-        end
-      end
-
-      def part
-        "#{@part}" if @part
-      end
-
-      def subpart
-        @subpart if @subpart && !@subpart.to_s.empty?
-      end
-
-      def type(format)
-        return unless @type
-
-        @type.to_s(@publisher != "IEEE" ? :alternative : format)
-      end
-
-      def year
-        return "" if @month
-        return "" unless @year
-
-        if @corrigendum_comment
-          @corrigendum_comment.year
-        elsif @reaffirmed && @reaffirmed.key?(:reaffirmation_of)
-          @reaffirmed[:reaffirmation_of].year
-        else
-          "-#{@year}"
-        end
-      end
-
-      def alternative
-        if @alternative
-          if @alternative.is_a?(Array)
-            " (#{@alternative.map { |a| self.class.new(**Identifier.convert_parser_parameters(**a)) }.join(', ')})"
-          else
-            " (#{self.class.new(**Identifier.convert_parser_parameters(**@alternative))})"
-          end
-        end
-      end
-
-      def edition
-        return "" unless @edition
-
-        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
-
-        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 draft
-        return "" unless @draft
-
-        @draft = Identifier.merge_parameters(@draft) if @draft.is_a?(Array)
-
-        result = "/D#{@draft[:version].is_a?(Array) ? @draft[:version].join('D') : @draft[:version]}"
-        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
-      end
-
-      def draft_status(format)
-        "#{@draft_status} " if @draft_status && format == :full
-      end
-
-      def revision
-        " (Revision of #{@revision.join(' and ')})" if @revision
-      end
-
-      def revision_date
-        return nil unless @month
-        ", #{@month} #{@year}"
-      end
-
-      def amendment
-        return unless @amendment || @iso_amendment
-
-        if @iso_amendment
-          if @iso_amendment[:year]
-            return "/Amd#{@iso_amendment[:version]}-#{@iso_amendment[:year]}"
-          else
-            return "/Amd#{@iso_amendment[:version]}"
-          end
-        end
-
-        return " (Amendment to #{@amendment})" unless @amendment.is_a?(Array)
-
-        result = " (Amendment to #{@amendment.first} as amended by "
-        result += if @amendment.length > 2
-                    "#{@amendment[1..-2].map(&:to_s).join(', ')}, and #{@amendment[-1]}"
-                  else
-                    @amendment.last.to_s
-                  end
-
-        "#{result})"
-      end
-
-      def redline
-        " - Redline" if @redline
-      end
-
-      def adoption
-        if @adoption_year
-          adoption_id = dup
-          adoption_id.year = @adoption_year
-          " (Adoption of #{adoption_id.identifier})"
+      class << self
+        def get_renderer_class
+          Renderer::Base
         end
-      end
-
-      def supersedes
-        return unless @supersedes
 
-        if @supersedes.length > 2
-          " (Supersedes #{@supersedes.join(', ')})"
-        else
-          " (Supersedes #{@supersedes.join(' and ')})"
-        end
-      end
-
-      def corrigendum
-        if @corrigendum.nil?
-          (@year && @corrigendum_comment && "/Cor 1-#{@year}") || ""
-        else
-          if @corrigendum[:year]
-            "/Cor #{@corrigendum[:version]}-#{@corrigendum[:year]}"
-          else
-            "/Cor #{@corrigendum[:version]}"
-          end
+        def get_transformer_class
+          Transformer
         end
       end
-
-      def reaffirmed
-        return unless @reaffirmed
-
-        return " (Reaffirmed #{@year})" if @reaffirmed.key?(:reaffirmation_of)
-
-        " (Reaffirmed #{@reaffirmed[:year]})" if @reaffirmed[:year]
-      end
-
-      def incorporates
-        # " (Supersedes #{@supersedes.join(', ')})"
-
-        " (Incorporates #{@incorporates.join(', and ')})" if @incorporates
-      end
-
-      def supplement
-        " (Supplement to #{@supplement})" if @supplement
-      end
     end
   end
 end

data/lib/pubid/ieee/identifier.rb

@@ -41,6 +41,10 @@ module Pubid::Ieee
         end
         result
       end
+
+      def has_stage?(stage)
+        Pubid::Iso::Identifier.has_stage?(stage)
+      end
     end
   end
 end

data/lib/pubid/ieee/parser.rb

@@ -27,9 +27,7 @@ module Pubid::Ieee
     end
 
     rule(:year) do
-      # -2014, April 2015
-      dash >> year_digits.as(:adoption_year) >> publication_date |
-        (dot | dash) >> year_digits.as(:year) >> str("(E)").maybe
+      (dot | dash) >> year_digits.as(:year) >> str("(E)").maybe
     end
 
     rule(:organization) do
@@ -68,7 +66,7 @@ module Pubid::Ieee
     end
 
     rule(:draft_status) do
-      (str("Active Unapproved") | str("Unapproved") | str("Approved")).as(:draft_status)
+      (str("Active Unapproved") | str("Unapproved") | str("Approved"))
     end
 
     rule(:draft_prefix) do
@@ -87,7 +85,8 @@ module Pubid::Ieee
       # for D1D2
       (str("D") >> digits.as(:version)).repeat(2) |
       # for DD3, D3Q
-      (str("D") >> words_digits.as(:version)).repeat(1, 1)
+      # don't parse "DIS" as draft
+      (str("D") >> str("IS").absent? >> words_digits.as(:version)).repeat(1, 1)
     end
 
     rule(:draft) do
@@ -99,11 +98,11 @@ module Pubid::Ieee
     end
 
     rule(:part) do
-      ((dot | dash) >> words_digits).as(:part)
+      ((dot | dash) >> iso_stage_iteration.absent? >> words_digits).as(:part)
     end
 
     rule(:subpart) do
-      (dot | dash) >> match('[\da-z]').repeat(1)
+      (dot | dash) >> ((str("REV") | str("Rev")).maybe >> match('[\da-z]').repeat(1) | (str("REV") | str("Rev")))
     end
 
     rule(:part_subpart_year) do
@@ -159,6 +158,10 @@ module Pubid::Ieee
       ).as(:revision)
     end
 
+    rule(:adoption) do
+      str("Adoption of ") >> identifier_without_dual_pubids.as(:adoption)
+    end
+
     rule(:previous_amendments) do
       # IEEE P802.3bp/D3.4, April 2016 (Amendment of IEEE Std 802.3-2015 as amended by IEEE Std 802.3bw-2015,
       # IEEE Std 802.3by-201X, and IEEE Std 802.3bq-201X)
@@ -205,9 +208,15 @@ module Pubid::Ieee
       (str("Supplement") >> str("s").maybe >> str(" to ") >> identifier_without_dual_pubids.as(:identifier)).as(:supplement)
     end
 
+    rule(:includes) do
+      (str("Includes ") >>
+        ((str("Supplement ") >> identifier_without_dual_pubids.as(:identifier)).as(:supplement) | identifier_without_dual_pubids.as(:identifier))).as(:includes)
+    end
+
     rule(:additional_parameters) do
       (space? >> str("(") >> (
-        (reaffirmed | revision | amendment | supersedes | corrigendum_comment| incorporates | supplement) >>
+        (reaffirmed | revision | amendment | supersedes |
+          corrigendum_comment| incorporates | supplement | includes | adoption) >>
           ((str("/") | str(",")) >> space?).maybe).repeat >> str(")").maybe
       ).repeat >> redline.maybe
     end
@@ -216,7 +225,7 @@ module Pubid::Ieee
     # otherwise extra identifiers parsed as dual PubIDs to the main identifier
     def parameters(atom, without_dual_pubids: false, skip_parameters: false)
       atom >>
-        ((draft_status >> space).maybe >> (str("Draft ").maybe >>
+        ((draft_status.as(:draft_status) >> space).maybe >> (str("Draft ").maybe >>
           type.as(:type) >> space.maybe).maybe).as(:type_status) >>
         number_prefix >> number >>
         (
@@ -224,6 +233,9 @@ module Pubid::Ieee
           (draft |
             part_subpart_year.maybe >> corrigendum.maybe >> draft.maybe >> iso_amendment.maybe
           ) >>
+            # iso_stage_part_iteration.maybe >>
+            # ((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
               str("")
             else
@@ -302,14 +314,13 @@ module Pubid::Ieee
     end
 
     rule(:iso_part_stage_iteration) do
-      iso_part >>
-      (str("-") >> iso_parser.typed_stage.as(:stage)) >> iso_parser.iteration.maybe
+      iso_part >> (str("-") | str("/") | str("_")) >> iso_stage_iteration >> iso_parser.iteration.maybe
     end
 
     rule(:iso_stage_part_iteration) do
       # don't consume draft from IEEE format
-      ((str("-") | str("/")) >> (str("D") >> digits).absent? >> (iso_parser.typed_stage.as(:stage) | iso_parser.stage.as(:stage))) >>
-        iso_part.maybe >> iso_parser.iteration.maybe
+      (str("-") | str("/") | str("_") | space) >> (str("D") >> digits).absent? >>
+        iso_stage_iteration >> iso_part.maybe >> iso_parser.iteration.maybe
     end
 
     # add rule when don't have stage
@@ -318,12 +329,16 @@ module Pubid::Ieee
       iso_part >> iso_parser.iteration.maybe
     end
 
+    rule(:iso_stage_iteration) do
+      (iso_parser.typed_stage | iso_parser.stage).as(:stage) >> digits.as(:iteration).maybe
+    end
+
     rule(:iso_part_stage_iteration_matcher) do
       # consumes "/"
-      iso_stage_part_iteration |
       iso_part_stage_iteration |
-      iso_part_iteration
-
+      iso_stage_part_iteration |
+      iso_part_iteration# |
+      # iso_stage_iteration
     end
 
     rule(:iso_identifier) do
@@ -335,9 +350,11 @@ module Pubid::Ieee
         iso_parser.originator >> ((str(" ") | str("/")) >>
       # for ISO/FDIS
       (iso_parser.type | iso_parser.typed_stage.as(:stage))).maybe >>
+      # draft std
+      # (space >> (draft_status >> space).maybe >> (str("Draft ").maybe >> type >> space.maybe)).maybe >>
       # for ISO/IEC WD TS 25025
       str(" ").maybe >> ((iso_parser.typed_stage.as(:stage) | iso_parser.stage.as(:stage) | iso_parser.type) >> str(" ")).maybe >>
-        (str("P").maybe >> iso_parser.digits).as(:number) >>
+        (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 >>
         iso_part_stage_iteration_matcher.maybe >>
@@ -371,10 +388,12 @@ module Pubid::Ieee
 
     rule(:iso_or_ieee_identifier) do
       ieee_without_prefix |
+        parameters((organizations >> space).maybe) |
         (iso_identifier >> iso_parameters) |
         # (iso identifier) >> space >> (ieee identifier) ?
-        iso_identifier >> space >> parameters((organizations >> space).maybe) | iso_identifier |
-        parameters((organizations >> space).maybe)
+        iso_identifier >> space >> parameters((organizations >> space).maybe) | iso_identifier
+
+      # iso_identifier >> iso_parameters
     end
 
     rule(:parameters_with_optional_organizations) do
@@ -382,7 +401,7 @@ module Pubid::Ieee
     end
 
     rule(:identifier_without_dual_pubids) do
-      iso_identifier >> iso_parameters |
+      (iso_identifier >> iso_parameters) |
       parameters((organizations >> space).maybe, without_dual_pubids: true)
     end
 

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

@@ -0,0 +1,184 @@
+module Pubid::Ieee::Renderer
+  class Base < Pubid::Core::Renderer::Base
+    def render_identifier(params)
+      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
+      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
+      end
+    end
+
+    def render_number(number, _opts, _params)
+      " #{number}"
+    end
+
+    def render_publisher(publisher, opts, params)
+      # don't render publisher if no number assigned
+      super if params[:number]
+    end
+
+    def render_type(type, opts, params)
+      result = type.to_s(params[:publisher] == "IEEE" ? opts[:format] : :alternative)
+
+      " #{result}" unless result.empty?
+      #" #{type}"
+    end
+
+    def render_part(part, _opts, _params)
+      "#{part}"
+    end
+
+    def render_month(month, _opts, _params)
+      ", #{month}"
+    end
+
+    def render_corrigendum_comment(corrigendum_comment, _opts, params)
+      "/Cor 1-#{params[:year]}" if params[:year]
+    end
+
+    def render_year(year, _opts, params)
+      return " #{year}" if params[:month]
+
+      if params[:corrigendum_comment]
+        "-#{params[:corrigendum_comment].year}"
+      elsif params[:reaffirmed] && params[:reaffirmed].key?(:reaffirmation_of)
+        "-#{params[:reaffirmed][:reaffirmation_of].year}"
+      else
+        "-#{year}"
+      end
+    end
+
+    def render_includes(includes, _opts, _params)
+      if includes.is_a?(Hash) && includes[:supplement]
+        return " (Includes Supplement #{includes[:supplement]})"
+      end
+
+      " (Includes #{includes})"
+    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
+
+      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)
+      if alternative.is_a?(Array)
+        " (#{alternative.map { |a| Pubid::Ieee::Identifier::Base.new(**Pubid::Ieee::Identifier.convert_parser_parameters(**a)) }.join(', ')})"
+      else
+        " (#{Pubid::Ieee::Identifier::Base.new(**Pubid::Ieee::Identifier.convert_parser_parameters(**alternative))})"
+      end
+    end
+
+    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 += ".#{draft[:revision]}" if draft[:revision]
+      result += ", #{draft[:month]}" if draft[:month]
+      result += " #{draft[:day]}," if draft[:day]
+      result += " #{draft[:year]}" if draft[:year]
+      result
+    end
+
+    def render_draft_status(draft_status, opts, _params)
+      " #{draft_status}" if opts[:format] == :full
+    end
+
+    def render_revision(revision, _opts, _params)
+      " (Revision of #{revision.join(' and ')})" if revision
+    end
+
+    def render_redline(_redline, _opts, _params)
+      " - Redline"
+    end
+
+
+    def render_amendment(amendment, _opts, _params)
+      return " (Amendment to #{amendment})" unless amendment.is_a?(Array)
+
+      result = " (Amendment to #{amendment.first} as amended by "
+      result += if amendment.length > 2
+                  "#{amendment[1..-2].map(&:to_s).join(', ')}, and #{amendment[-1]}"
+                else
+                  amendment.last.to_s
+                end
+
+      "#{result})"
+    end
+
+    def render_corrigendum(corrigendum, _opts, params)
+      # if corrigendum.nil?
+      #   (params[:year] && corrigendum_comment && "/Cor 1-#{params[:year]}") || ""
+      # else
+      if corrigendum[:year]
+        "/Cor #{corrigendum[:version]}-#{corrigendum[:year]}"
+      else
+        "/Cor #{corrigendum[:version]}"
+      end
+      # end
+    end
+
+    def render_supersedes(supersedes, _opts, _params)
+      if supersedes.length > 2
+        " (Supersedes #{supersedes.join(', ')})"
+      else
+        " (Supersedes #{supersedes.join(' and ')})"
+      end
+    end
+
+    def render_reaffirmed(reaffirmed, _opts, params)
+      return " (Reaffirmed #{params[:year]})" if reaffirmed.key?(:reaffirmation_of)
+
+      " (Reaffirmed #{reaffirmed[:year]})" if reaffirmed[:year]
+    end
+
+    def render_incorporates(incorporates, _opts, _params)
+      " (Incorporates #{incorporates.join(', and ')})"
+    end
+
+    def render_supplement(supplement, _opts, _params)
+      " (Supplement to #{supplement})" if supplement
+    end
+
+    def render_adoption_year(adoption_year, _opts, _params)
+      adoption_id = dup
+      adoption_id.year = adoption_year
+      " (Adoption of #{adoption_id.identifier})"
+    end
+
+    def render_adoption(adoption, _opts, _params)
+      adoption
+    end
+
+    def render_iso_amendment(iso_amendment, _opts, _params)
+      "/Amd#{iso_amendment[:version]}" +
+        (iso_amendment[:year] ? "-#{iso_amendment[:year]}" : "")
+    end
+
+    def render_adoption(adoption, opts, _params)
+      " (Adoption of #{Pubid::Ieee::Identifier::Base.transform(**adoption)})"
+    end
+  end
+end

data/lib/pubid/ieee/type.rb

@@ -5,16 +5,16 @@ module Pubid::Ieee
     TYPE_NAMES = {
       std: {
         long: "Standard",
-        full: "Std ",
-        short: "Std ",
+        full: "Std",
+        short: "Std",
         match: %w[STD Std Standard],
         alternative: "",
       },
       draft: {
-        full: "Draft Std ",
-        short: "Draft Std ",
+        full: "Draft Std",
+        short: "Draft Std",
         match: %w[Draft],
-        alternative: "Draft ",
+        alternative: "Draft",
       },
     }.freeze
 

data/lib/pubid/ieee/version.rb

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

data/lib/pubid/ieee.rb

@@ -10,6 +10,7 @@ require_relative "ieee/errors"
 require_relative "ieee/parser"
 require_relative "ieee/transformer"
 require_relative "ieee/type"
+require_relative "ieee/renderer/base"
 require_relative "ieee/identifier"
 require_relative "ieee/identifier/base"
 

data/update_codes.yaml

@@ -51,3 +51,11 @@ IEEE 278-1967: IEEE No 278-1967
 IEEE 730-1989: IEEE No 730-1989
 IEEE 751-1991: IEEE No 751-1991
 IEEE 1023-2020 (Revision of IEEE Std 1023-2004): IEEE No 1023-2020 (Revision of IEEE Std 1023-2004)
+# 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 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-ieee
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,76 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: lightly
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pubid-iso
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0.7'
 description: Library to generate, parse and manipulate IEEE PubID.
 email:
 - open.source@ribose.com
@@ -125,6 +83,7 @@ files:
 - lib/pubid/ieee/identifier.rb
 - lib/pubid/ieee/identifier/base.rb
 - lib/pubid/ieee/parser.rb
+- lib/pubid/ieee/renderer/base.rb
 - lib/pubid/ieee/transformer.rb
 - lib/pubid/ieee/type.rb
 - lib/pubid/ieee/version.rb
@@ -148,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Library to generate, parse and manipulate IEEE PubID.