pubid-iso 0.1.2 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b3d52e0c0c000893b1ed556782f8ad349a54c2d70fe2e1f81942b4699e67a9
-  data.tar.gz: 3d82f5403447fe7a816a4913efd3fea16c37cc7c3e20ea8168ef21ab415996b2
+  metadata.gz: d0daa77a77b864f2c4799226d5a5d458a3a852ba5321bf243f5415082ca66d52
+  data.tar.gz: 2efd25c20e35d80cd14a2f286e435eab2d017a295b08fb16f7c05ff079fe8986
 SHA512:
-  metadata.gz: ad4e1d604590a74fe504b7b5036cfe3bfe2696a7a145486470011ddfc148ca41265d79d8c2c0b171d9b26f8a0fb20186648a40d749ab9470afcf2f32cc9bb98d
-  data.tar.gz: 62b3e37a7b82df4fdd5ca160e71380c15e4c28999b26b5eb6699cc1abdd1611182d38f66841d4cb0980bf21e25feefe4059e7c5860e773cbbcd312eb536ab317
+  metadata.gz: e740022023d24557f1650de284b22411176ac4fb09d6ecac8bb8c3a69a328dcaeeb79aadc0c3a5644840fadd1167699a010039dbedd5f5412f82387a7566c88c
+  data.tar.gz: 3d7437f44ed7e4fc6496b315d30940ea79bb3e4e275ea1bb1f973fe2a7927c339ec57758a90494a27afcba71c266dae4bf1d9cd61a7002a4e9bdb515e9ca6a49

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

@@ -3,7 +3,7 @@ module Pubid::Iso
     def identifier(with_date, with_language_code)
       if @type == "Guide"
         "Guide #{originator}#{stage} #{number}#{part}#{iteration}"\
-          "#{with_date && year || ''}#{edition}#{supplements}#{language(with_language_code)}"
+          "#{with_date && rendered_year || ''}#{edition}#{supplements}#{language(with_language_code)}"
       else
         super
       end

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

@@ -20,7 +20,7 @@ module Pubid::Iso
     def identifier(with_date, with_language_code)
       if @type == "Guide"
         "Руководство #{originator}#{stage} #{number}#{part}#{iteration}"\
-          "#{with_date && year || ''}#{edition}#{supplements}#{language(with_language_code)}"
+          "#{with_date && rendered_year || ''}#{edition}#{supplements}#{language(with_language_code)}"
       else
         super
       end

data/lib/pubid/iso/identifier.rb

@@ -4,7 +4,9 @@ module Pubid::Iso
                   :type, :year, :edition, :iteration, :supplements, :language,
                   :amendment, :amendment_version, :amendment_number,
                   :corrigendum, :corrigendum_version, :corrigendum_number,
-                  :amendment_stage, :corrigendum_stage, :joint_document
+                  :amendment_stage, :corrigendum_stage, :joint_document,
+                  :tctype, :sctype, :wgtype, :tcnumber, :scnumber, :wgnumber,
+                  :urn_stage
 
     LANGUAGES = {
       "ru" => "R",
@@ -67,8 +69,40 @@ module Pubid::Iso
     end
 
     def identifier(with_date, with_language_code)
-      "#{originator}#{type}#{stage} #{number}#{part}#{iteration}"\
-        "#{with_date && year || ''}#{edition}#{supplements}#{language(with_language_code)}"
+      if @tctype
+        "#{originator} #{tctype} #{tcnumber}#{sctype}#{wgtype} N#{number}"
+      else
+        "#{originator}#{type}#{stage} #{number}#{part}#{iteration}"\
+        "#{with_date && rendered_year || ''}#{edition}#{supplements}#{language(with_language_code)}"
+      end
+    end
+
+    def tctype
+      return @tctype.join("/") if @tctype.is_a?(Array)
+
+      @tctype
+    end
+
+    # TC 184/SC/WG 4 - no wg number
+    # TC 184/SC 4/WG 12 - separate sc and wg number
+    def sctype
+      return unless @sctype
+
+      if @wgnumber || !@wgtype
+        "/#{@sctype} #{@scnumber}"
+      else
+        "/#{@sctype}"
+      end
+    end
+
+    def wgtype
+      return unless @wgtype
+
+      if @wgnumber
+        "/#{@wgtype} #{@wgnumber}"
+        else
+        "/#{@wgtype} #{@scnumber}"
+      end
     end
 
     def copublisher
@@ -97,8 +131,8 @@ module Pubid::Iso
       "-#{@part}" if @part
     end
 
-    def year
-      ":#{@year}" if @year
+    def rendered_year
+      @year && ":#{@year}"
     end
 
     def type
@@ -131,12 +165,12 @@ module Pubid::Iso
 
     def supplements
       result = ""
-      if @amendment
+      if @amendment_version
         result += (@amendment_stage && "/#{@amendment_stage} ") || "/"
         result += amendment
       end
 
-      if @corrigendum
+      if @corrigendum_version
         result += (@corrigendum_stage && "/#{@corrigendum_stage} ") || "/"
         result += corrigendum
       end

data/lib/pubid/iso/parser.rb

@@ -17,6 +17,9 @@ module Pubid::Iso
   # Stage 50.60: PRF ("proof") (non-public)
   # Stage 60: IS
   class Parser < Parslet::Parser
+    rule(:space) { str(" ") }
+    rule(:space?) { space.maybe }
+
     rule(:digits) do
       match('\d').repeat(1)
     end
@@ -51,18 +54,40 @@ module Pubid::Iso
       ).as(:type)
     end
 
+    rule(:tctype) do
+      # tc-types
+      str("TC") | str("JTC") | str("PC") | str("IT") | str("CAB") | str("CASCO") | str("COPOLCO") |
+        str("COUNCIL") | str("CPSG") | str("CS") | str("DEVCO") | str("GA") | str("GAAB") | str("INFCO") |
+        str("ISOlutions") | str("ITN") | str("REMCO") | str("TMB") | str("TMBG") | str("WMO") |
+        str("DMT") | str("JCG") | str("SGPM") | str("ATMG") | str("CCCC") | str("CCCC-TG") | str("JDMT") |
+        str("JSAG") | str("JSCTF-TF") | str("JTCG") | str("JTCG-TF") | str("SAG_Acc") | str("SAG_CRMI") |
+        str("SAG_CRMI_CG") | str("SAG_ESG") | str("SAG_ESG_CG") | str("SAG_MRS") | str("SAG SF") | str("SAG SF_CG") |
+        str("SMCC") | str("STMG") | str("MENA STAR")
+    end
+
+    rule(:sctype) do
+      str("SC")
+    end
+
+    rule(:wgtype) do
+      str("AG") | str("AHG") | str("AhG") | str("WG") | str("JWG") | str("QC") | str("TF") |
+        str("PPC") | str("CAG") | str("WG SGDG") | str("WG SR") | str("STAR") | str("STTF") | str("TIG") |
+        str("CPAG") | str("CSC") | str("ITSAG") | str("CSC/FIN") | str("CSC/NOM") | str("CSC/OVE") |
+        str("CSC/SP") | str("CSC/FIN") | str("JAG")
+    end
+
     rule(:year) do
       match('\d').repeat(4, 4).as(:year)
     end
 
     rule(:part) do
-      (str("-") | str("/")) >> str(" ").maybe >>
-        (match['[\dA-Z]'] | str("-")).repeat(1).as(:part)
+      (str("-") | str("/")) >> space? >>
+        (str("Amd") | str("Cor")).absent? >> (match['[\dA-Z]'] | str("-")).repeat(1).as(:part)
     end
 
     rule(:originator) do
       organization.as(:publisher) >>
-        (str(" ").maybe >> str("/") >> organization.as(:copublisher)).repeat
+        (space? >> str("/") >> organization.as(:copublisher)).repeat
     end
 
     rule(:organization) do
@@ -75,7 +100,7 @@ module Pubid::Iso
     end
 
     rule(:edition) do
-      str(" ") >> ((str("ED") | str("Ed ") | str("Ed.")) >>
+      space >> ((str("ED") | str("Ed ") | str("Ed.")) >>
         digits.as(:edition) | str("Ed").as(:edition))
     end
 
@@ -85,18 +110,18 @@ module Pubid::Iso
 
     rule(:amendment) do
       (str("/") >> stage.as(:amendment_stage)).maybe >>
-      (str("/") | str(" ")).maybe >>
+      (str("/") | space).maybe >>
         (str("Amd") | str("AMD") | str("AM")).as(:amendment) >>
-        (str(" ") | str(".")) >>
+        (space | str(".")) >>
         digits.as(:amendment_version) >>
         (str(":") >> digits.as(:amendment_number)).maybe
     end
 
     rule(:corrigendum) do
       (str("/") >> stage.as(:corrigendum_stage)).maybe >>
-      (str("/") | str(" ")).maybe >>
+      (str("/") | space).maybe >>
         (str("Cor") | str("COR")).as(:corrigendum) >>
-        (str(" ") | str(".")) >>
+        (space | str(".")) >>
         digits.as(:corrigendum_version) >>
         (str(":") >> digits.as(:corrigendum_number)).maybe
     end
@@ -115,31 +140,45 @@ module Pubid::Iso
       str("Guide") | str("GUIDE") | str("Руководство") | str("Руководства")
     end
 
-    rule(:identifier) do
-      str("Fpr").as(:stage).maybe >>
-        # Withdrawn e.g: WD/ISO 10360-5:2000
-        str("WD/").maybe >>
-        # for French and Russian PubIDs starting with Guide type
-        (guide_prefix.as(:type) >> str(" ")).maybe >>
-        (stage.as(:stage) >> str(" ")).maybe >>
-        originator >> ((str(" ") | str("/")) >>
-        # for ISO/FDIS
-        (type | stage.as(:stage))).maybe >>
+    # Parse technical committee documents
+    rule(:tc_document_body) do
+      (tctype.as(:tctype) >> str("/").maybe).repeat >> space >> digits.as(:tcnumber) >>
+        (str("/") >> (
+          ((sctype.as(:sctype) >> space >> digits.as(:scnumber) >> str("/")).maybe >>
+            wgtype.as(:wgtype) >> space >> digits.as(:wgnumber)) |
+            (sctype.as(:sctype) >> (space | str("/") >> wgtype.as(:wgtype) >> space) >> digits.as(:scnumber))
+        )).maybe >>
+        str(" N") >> space? >> digits.as(:number)
+    end
+
+    rule(:std_document_body) do
+      (type | stage.as(:stage)).maybe >>
         # for ISO/IEC WD TS 25025
-        str(" ").maybe >> ((stage.as(:stage) | type) >> str(" ")).maybe >>
+        space? >> ((stage.as(:stage) | type) >> space).maybe >>
         digits.as(:number) >>
         # for identifiers like ISO 5537/IDF 26
-        (str("|") >> (str("IDF") >> str(" ") >> digits).as(:joint_document)).maybe >>
+        (str("|") >> (str("IDF") >> space >> digits).as(:joint_document)).maybe >>
         part.maybe >> iteration.maybe >>
-        (str(" ").maybe >> str(":") >> year).maybe >>
+        (space? >> str(":") >> year).maybe >>
         # stage before amendment
         (
-        # stage before corrigendum
-        ((amendment >> corrigendum.maybe) | corrigendum).maybe) >>
+          # stage before corrigendum
+          ((amendment >> corrigendum.maybe) | corrigendum).maybe) >>
         edition.maybe >>
         language.maybe
     end
 
+    rule(:identifier) do
+      str("Fpr").as(:stage).maybe >>
+        # Withdrawn e.g: WD/ISO 10360-5:2000
+        str("WD/").maybe >>
+        # for French and Russian PubIDs starting with Guide type
+        (guide_prefix.as(:type) >> space).maybe >>
+        (stage.as(:stage) >> space).maybe >>
+        originator >> (space | str("/")) >>
+        (tc_document_body | std_document_body)
+    end
+
     rule(:root) { identifier }
   end
 end

data/lib/pubid/iso/urn.rb

@@ -1,11 +1,5 @@
 module Pubid::Iso
-  class Urn
-    attr_accessor :number, :publisher, :copublisher, :stage, :substage, :part,
-                  :type, :year, :edition, :iteration, :supplements, :language,
-                  :amendment, :amendment_version, :amendment_number,
-                  :corrigendum, :corrigendum_version, :corrigendum_number,
-                  :amendment_stage, :corrigendum_stage, :joint_document
-
+  class Urn < Identifier
 
     STAGES = { PWI: 0,
                NP: 10,
@@ -26,7 +20,33 @@ module Pubid::Iso
       # [[":" status] ":" edition]
       # [":" docversion] [":" language]
 
-      "urn:iso:std:#{originator}#{type}:#{number}#{part}#{stage}#{edition}#{supplement}#{language}"
+      if tctype
+        "urn:iso:doc:#{originator}:#{tctype.downcase}:#{tcnumber}#{sctype}#{wgtype}:#{number}"
+      else
+        "urn:iso:std:#{originator}#{type}:#{number}#{part}#{stage}#{edition}#{supplement}#{language}"
+      end
+    end
+
+    def tctype
+      return @tctype.join(":") if @tctype.is_a?(Array)
+
+      @tctype
+    end
+
+    def sctype
+      return unless @sctype
+
+      ":#{@sctype.downcase}:#{@scnumber}"
+    end
+
+    def wgtype
+      return unless @wgtype
+
+      if @wgnumber
+        ":#{@wgtype.downcase}:#{@wgnumber}"
+      else
+        ":#{@wgtype.downcase}"
+      end
     end
 
     def part
@@ -34,10 +54,14 @@ module Pubid::Iso
     end
 
     def render_stage(stage)
+      return ":stage-#{sprintf('%05.2f', stage)}#{iteration}" if stage.is_a?(Float)
+
       ":stage-#{sprintf('%05.2f', STAGES[stage.to_sym])}#{iteration}"
     end
 
     def stage
+      return render_stage(@urn_stage) if @urn_stage
+
       return render_stage(@stage) if @stage
 
       return render_stage(@amendment_stage) if @amendment_stage
@@ -70,7 +94,6 @@ module Pubid::Iso
     def type
       # type          = "data" / "guide" / "isp" / "iwa" /
       #   "pas" / "r" / "tr" / "ts" / "tta"
-
       if @type
         ":#{@type.downcase}"
       end

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.1.2".freeze
+    VERSION = "0.1.5".freeze
   end
 end

data/lib/pubid/iso.rb

@@ -11,7 +11,7 @@ end
 require_relative "iso/errors"
 require_relative "iso/parser"
 require_relative "iso/transformer"
-require_relative "iso/urn"
 require_relative "iso/identifier"
 require_relative "iso/identifier/french"
 require_relative "iso/identifier/russian"
+require_relative "iso/urn"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake