pubid-iso 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f3adc0da212bf94d36e4cf03a2c0df042faec56fd9c218d2ffad51fa63dfb0e
-  data.tar.gz: a0daec7e03a71688ebb1959531415d4c842b75dd1e0c8ed7b48f8399148e5848
+  metadata.gz: fc8335f48f32190dc97e33a697eb6c4e4c167dde7439ed9ea7c86f993b63851e
+  data.tar.gz: 761131f2e57b70c3c7cc1544cd916c262f4fc747910e36f015280d17367e14d6
 SHA512:
-  metadata.gz: 48d74a1e76b6ee3c7e064c56ce7c6623533f584e85b4c227ea9e0e68993a82c98fb2d30e4e19c5ed61670ce9160503bcfcc6142c277c66812b3cd3bffb51d0ee
-  data.tar.gz: 0764db7a06d34fdf687f577663f3b03b1e2181a38444f03eba5f3ec8678c787ad01e83aadf27baebd9bdf3f72a1d90edaa7817683173ed271a93c7379c12e00f
+  metadata.gz: fb15a0823609ccf7b45858407d2bf9ebb3bf64eb47cbac1d0c3295b7bd6db5d702ba46ece8908aa4ed326eb219f0d3d35dc4eb33158e5fc48a68a35e7689e53e
+  data.tar.gz: cf0520e2b7ce394218c1a3cfd898d7b562eec3c55f4ddbf0ccdfa3ff933aa32ce53c69b6835e9254e59a9966c988b933bddc047a27a52de8863556f362bfb5c2

data/README.adoc

@@ -1,5 +1,7 @@
 = ISO publication identifiers ("ISO PubID")
 
+image:https://badge.fury.io/rb/pubid-iso.svg["Gem Version", link="https://badge.fury.io/rb/pubid-iso"]
+
 == Purpose
 
 This gem implements a mechanism to parse and utilize ISO publication
@@ -349,12 +351,19 @@ final draft International Standards (FDIS) and International Standards`",
 distinguished by a numerical suffix (.2, .3, etc.).
 ____
 
-The stage iteration number is assigned accordingly for all stages, which is
-patterned as:
+[example]
+====
+ISO/CD TR 10064-2.2
+ISO/IEC CD 23264-2.4
+ISO/DIS 80369-3.2
+====
+
+In an ISO PubID, the stage iteration number is applied to the standard
+number, patterned as:
 
-* `{document stage}` (no suffix if iteration is 1); or
-* `{document stage}.{iteration number}`
-  (suffix including iteration number after 1).
+* `{document stage} {document number}` (if iteration is 1); or
+* `{document stage} {document number}.{iteration number}`
+  (if iteration is larger than 1).
 
 Once the document is published (stage 60 substage 60), no status abbreviation is
 given.

data/lib/pubid/iso/identifier/addendum.rb

@@ -0,0 +1,24 @@
+require_relative "../renderer/addendum"
+
+module Pubid::Iso
+  module Identifier
+    class Addendum < Supplement
+      def_delegators 'Pubid::Iso::Identifier::Addendum', :type
+
+      TYPED_STAGES = {
+        dad: {
+          abbr: "DAD",
+          name: "Draft Addendum",
+          harmonized_stages: %w[],
+        },
+      }.freeze
+      def self.type
+        { key: :add, title: "Addendum" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Addendum
+      end
+    end
+  end
+end

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

@@ -186,6 +186,13 @@ module Pubid::Iso
             )
           end
 
+          if identifier_params[:extract]
+            base_parameters = params.reject { |k, _| k == :extract }
+
+            return Identifier.create(base: Identifier.create(**base_parameters),
+                                     type: :ext, **identifier_params[:extract])
+          end
+
           Identifier.create(**identifier_params)
         end
 

data/lib/pubid/iso/identifier/extract.rb

@@ -0,0 +1,19 @@
+require_relative "../renderer/extract"
+
+module Pubid::Iso
+  module Identifier
+    class Extract < Base
+      def_delegators 'Pubid::Iso::Identifier::Extract', :type
+
+      TYPED_STAGES = {}.freeze
+
+      def self.type
+        { key: :ext, title: "Extract" }
+      end
+
+      def self.get_renderer_class
+        Renderer::Extract
+      end
+    end
+  end
+end

data/lib/pubid/iso/identifier/international_standard.rb

@@ -4,6 +4,11 @@ module Pubid::Iso
       def_delegators 'Pubid::Iso::Identifier::InternationalStandard', :type
 
       TYPED_STAGES = {
+        dp: {
+          abbr: "DP",
+          name: "Draft Proposal",
+          harmonized_stages: %w[],
+        },
         dis: {
           abbr: "DIS",
           name: "Draft International Standard",

data/lib/pubid/iso/parser.rb

@@ -3,7 +3,7 @@ require_relative "renderer/base"
 
 module Pubid::Iso
   class Parser < Pubid::Core::Parser
-    STAGES = %w[NP NWIP WD CD PRF AWI PWI FPD].freeze
+    STAGES = %w[NP NWIP WD CD FCD PRF AWI PWI FPD].freeze
     TYPES = %w[DATA ISP IWA R TTA TS TR IS PAS Guide GUIDE DIR].freeze
     # TYPED_STAGES = %w[DIS FDIS DPAS FDTR FDTS DTS DTR PDTR PDTS].freeze
     SUPPLEMENTS = %w[Amd Cor AMD COR Suppl].freeze
@@ -18,13 +18,17 @@ module Pubid::Iso
       end.flatten +
       %w[pDCOR PDAM]
 
+    STAGED_ADDENDA = Pubid::Iso::Identifier::Addendum::TYPED_STAGES.map do |_, v|
+      v[:abbr]
+    end
+
     DIR_SUPPLEMENTS = %w[Supplement SUP].freeze
 
-    TYPED_STAGES = Identifier.config.types.map do |type|
+    TYPED_STAGES = (Identifier.config.types.map do |type|
       type::TYPED_STAGES.map do |_, v|
         v.key?(:legacy_abbr) ? (v[:legacy_abbr] + [v[:abbr]]) : v[:abbr]
       end
-    end.flatten - STAGED_SUPPLEMENTS + %w[PDTR PDTS]
+    end.flatten - STAGED_SUPPLEMENTS + %w[PDTR PDTS]).sort_by(&:length).reverse
 
     TCTYPES = ["TC", "JTC", "PC", "IT", "CAB", "CASCO", "COPOLCO",
       "COUNCIL", "CPSG", "CS", "DEVCO", "GA", "GAAB", "INFCO",
@@ -40,6 +44,10 @@ module Pubid::Iso
       "CSC/SP", "CSC/FIN", "JAG"].freeze
 
     ORGANIZATIONS = %w[IEC IEEE CIW SAE CIE ASME ASTM OECD ISO HL7 CEI].freeze
+    rule(:dash) do
+      str("-") | str("‑") | str("‐")
+    end
+
     rule(:stage) do
       array_to_str(Pubid::Iso::Renderer::Base::TRANSLATION[:russian][:stage].values) | array_to_str(STAGES)
     end
@@ -60,6 +68,10 @@ module Pubid::Iso
       (array_to_str(Pubid::Iso::Renderer::Base::TRANSLATION[:russian][:type].values) | array_to_str(TYPES)).as(:type)
     end
 
+    rule(:staged_addenda) do
+      array_to_str(STAGED_ADDENDA)
+    end
+
     rule(:tctype) do
       # tc-types
       array_to_str(TCTYPES)
@@ -82,11 +94,12 @@ module Pubid::Iso
 
     rule(:part_matcher) do
       year_digits.absent? >>
-        (str("Amd") | str("Cor")).absent? >> ((roman_numerals >> digits.absent?) | match['[\dA-Z]'].repeat(1)).as(:part)
+        supplements.absent? >>
+        staged_addenda.absent? >> ((roman_numerals >> digits.absent?) | match['[\dA-Z]'].repeat(1)).as(:part)
     end
 
     rule(:part) do
-      (str("/") | str("-")) >> space? >> part_matcher >> (str("-") >> part_matcher).repeat
+      (str("/") | dash) >> space? >> part_matcher >> (dash >> part_matcher).repeat
     end
 
     rule(:organization) do
@@ -109,13 +122,19 @@ module Pubid::Iso
         (space | str(".")).repeat(1).maybe >>
         digits.as(:number).maybe >>
         (str(".") >> digits.as(:iteration)).maybe >>
-        ((str(":") | str("-")) >> digits.as(:year)).maybe).repeat(1).as(:supplements)
+        ((str(":") | dash) >> digits.as(:year)).maybe).repeat(1).as(:supplements)
     end
 
     rule(:addendum) do
       (
-        ((str("/") >> (str("Add") | str("ADD"))) | (str(" — Addendum"))) >> space >> digits.as(:number) >> ((str(":")) >> digits.as(:year)).maybe
-      ).as(:addendum)
+        (((str("/") >> (str("Add") | str("ADD")).as(:type)) | (str(" — ") >> str("Addendum").as(:type))) |
+         (str("/") >> staged_addenda.as(:typed_stage))) >>
+          space >> digits.as(:number) >> ((str(":")) >> digits.as(:year)).maybe
+      ).repeat(1).as(:supplements)
+    end
+
+    rule(:extract) do
+      str("/") >> str("Ext") >> space >> (digits.as(:number) >> str(":") >> digits.as(:year)).as(:extract)
     end
 
     rule(:language) do
@@ -157,15 +176,16 @@ module Pubid::Iso
     end
 
     rule(:std_document_body) do
-      (type | stage.as(:stage)).maybe >>
+      (type | (stage.as(:stage) >> digits.as(:iteration).maybe)).maybe >>
         # for ISO/IEC WD TS 25025
         space? >> ((stage.as(:stage) | typed_stage.as(:stage) | type) >> space).maybe >>
         digits.as(:number) >>
         # for identifiers like ISO 5537/IDF 26
         (str("|") >> (str("IDF").as(:publisher) >> space >> digits.as(:number)).as(:joint_document)).maybe >>
         part.maybe >> iteration.maybe >>
-        (space? >> (str(":") | str("-")) >> year).maybe >>
+        (space? >> (str(":") | dash) >> year).maybe >>
         supplement.maybe >>
+        extract.maybe >>
         addendum.maybe >>
         edition.maybe >>
         language.maybe

data/lib/pubid/iso/renderer/addendum.rb

@@ -0,0 +1,7 @@
+require_relative "supplement"
+
+module Pubid::Iso::Renderer
+  class Addendum < Supplement
+    TYPE = "Add".freeze
+  end
+end

data/lib/pubid/iso/renderer/extract.rb

@@ -0,0 +1,9 @@
+require_relative "base"
+
+module Pubid::Iso::Renderer
+  class Extract < Supplement
+    def render_identifier(params, opts)
+      "/Ext%{number}%{year}" % params
+    end
+  end
+end

data/lib/pubid/iso/transformer.rb

@@ -29,7 +29,12 @@ module Pubid::Iso
               end
             )
           else
-            supplement
+            case supplement[:type]
+            when "Addendum"
+              supplement.merge({ type: "Add" })
+            else
+              supplement
+            end
           end
         end
       context

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.5.2".freeze
+    VERSION = "0.5.3".freeze
   end
 end

data/lib/pubid/iso.rb

@@ -28,6 +28,8 @@ require_relative "iso/identifier/guide"
 require_relative "iso/identifier/recommendation"
 require_relative "iso/identifier/technology_trends_assessments"
 require_relative "iso/identifier/international_workshop_agreement"
+require_relative "iso/identifier/extract"
+require_relative "iso/identifier/addendum"
 
 config = Pubid::Core::Configuration.new
 config.stages = YAML.load_file(File.join(File.dirname(__FILE__), "../../stages.yaml"))
@@ -46,7 +48,9 @@ config.types = [Pubid::Iso::Identifier::InternationalStandard,
                 Pubid::Iso::Identifier::TechnicalReport,
                 Pubid::Iso::Identifier::TechnicalSpecification,
                 Pubid::Iso::Identifier::TechnologyTrendsAssessments,
-                Pubid::Iso::Identifier::Guide]
+                Pubid::Iso::Identifier::Guide,
+                Pubid::Iso::Identifier::Extract,
+                Pubid::Iso::Identifier::Addendum]
 config.type_names = { tr: {
                         long: "Technical Report",
                         short: "TR",

data/stages.yaml

@@ -4,6 +4,7 @@ abbreviations:
   AWI: ["20.00", "10.99"]
   WD: ["20.20", "20.60", "20.98", "20.99"]
   CD: ["30.00", "30.20", "30.60", "30.92", "30.98", "30.99"]
+  FCD: ["40.00", "40.20", "40.60", "40.92", "40.98", "40.99"]
   PRF: ["50.00", "50.20", "50.60", "50.92", "50.98", "50.99"]
 
 names:
@@ -11,6 +12,7 @@ names:
   PWI: Preliminary Work Item
   NP: New Proposal
   CD: Committee Draft
+  FCD: Final Committee Draft
   PRF: Proof of a new
 
 codes_description:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,10 +123,12 @@ files:
 - lib/pubid/iso.rb
 - lib/pubid/iso/errors.rb
 - lib/pubid/iso/identifier.rb
+- lib/pubid/iso/identifier/addendum.rb
 - lib/pubid/iso/identifier/amendment.rb
 - lib/pubid/iso/identifier/base.rb
 - lib/pubid/iso/identifier/corrigendum.rb
 - lib/pubid/iso/identifier/directives.rb
+- lib/pubid/iso/identifier/extract.rb
 - lib/pubid/iso/identifier/guide.rb
 - lib/pubid/iso/identifier/international_standard.rb
 - lib/pubid/iso/identifier/international_standardized_profile.rb
@@ -139,10 +141,12 @@ files:
 - lib/pubid/iso/identifier/technical_specification.rb
 - lib/pubid/iso/identifier/technology_trends_assessments.rb
 - lib/pubid/iso/parser.rb
+- lib/pubid/iso/renderer/addendum.rb
 - lib/pubid/iso/renderer/amendment.rb
 - lib/pubid/iso/renderer/base.rb
 - lib/pubid/iso/renderer/corrigendum.rb
 - lib/pubid/iso/renderer/dir.rb
+- lib/pubid/iso/renderer/extract.rb
 - lib/pubid/iso/renderer/guide.rb
 - lib/pubid/iso/renderer/international_standard.rb
 - lib/pubid/iso/renderer/international_standardized_profile.rb