pubid-iso 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994066e91ad11d2b30748ff491bd2324dca970907d61f9995c1990388711d185
-  data.tar.gz: c4b9789dac35f4afb63c567f3e2e41a51633b8e7a46af0dc80b6022778d1e616
+  metadata.gz: 544e6e2f64d9eb553d25aaed469e187bab1237e735596a0a02a202ca1fa799e7
+  data.tar.gz: 632097c99a2244a83bb69fb6531fd645a85d3170bd63f22f2c4deb217ba2458e
 SHA512:
-  metadata.gz: cb7e5d8b073c664ebbfd3ad22e05a415cb932b4c314aeca51164ac1c7c26c1fe4db37c770c63735832251c8e790a1f118a489448bba0d816982bd12c9e7a1364
-  data.tar.gz: b82c61a71b57000f7607252b2d92bf999bd143a7aba39e59e515998f96a1c3062aeb4dbf33667d1620b89be536a35c4470f389d968622e731a94bf33f83924e7
+  metadata.gz: 5dc20550bccf1c93defdc843ab9627781360c2849c83e77a2baac62d49e7e1ecd3617d8e7407e2204d9eba1973e8c7c87d89965513137dbe7a897bdc6ce6904f
+  data.tar.gz: 2ba3d831e311b020cfa40a818f6be3677f3cf474efcca7371dabd92f542c1902af1e0bbbf89efafc43240243dc8d6f1ea1d08db2bd748dd2d240976779983ecc

data/README.adoc

@@ -61,6 +61,21 @@ pubid.to_s
 => "ISO/WD 1234"
 ----
 
+==== "PreCD" stage
+
+For "PreCD" stage we’re using a special stage called "29" that is not in the International Harmonized Codes.
+
+[source,ruby]
+----
+pubid = Pubid::Iso::Identifier.create(publisher: "ISO", stage: :PreCD, number: 123)
+pubid.to_s
+
+=> "ISO/PreCD 123"
+
+subject.stage.harmonized_code.stages
+=> ["29.00", "29.20", "29.60", "29.92", "29.98", "29.99"]
+----
+
 === With part number
 
 [source,ruby]

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

@@ -1,4 +1,5 @@
 require_relative "../renderer/extract"
+require_relative "../renderer/urn-extract"
 
 module Pubid::Iso
   module Identifier
@@ -14,6 +15,10 @@ module Pubid::Iso
       def self.get_renderer_class
         Renderer::Extract
       end
+
+      def urn
+        Renderer::UrnExtract.new(to_h(deep: false)).render
+      end
     end
   end
 end

data/lib/pubid/iso/parser.rb

@@ -49,7 +49,8 @@ module Pubid::Iso
     end
 
     rule(:stage) do
-      array_to_str(Pubid::Iso::Renderer::Base::TRANSLATION[:russian][:stage].values) | array_to_str(STAGES)
+      array_to_str(Pubid::Iso::Renderer::Base::TRANSLATION[:russian][:stage].values) | array_to_str(STAGES) |
+        (str("preCD") | str("PreCD"))
     end
 
     rule(:typed_stage) do

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

@@ -24,21 +24,22 @@ module Pubid::Iso::Renderer
 
     def render_identifier(params, opts)
       type_prefix = params[:stage].nil? || !params[:stage].is_a?(Pubid::Core::TypedStage) ? self.class::TYPE : ""
-      # type_prefix = params[:typed_stage].nil? || params[:typed_stage].empty? ? self.class::TYPE : ""
 
-      if params[:stage].instance_of?(Pubid::Core::Stage) && !params[:stage].empty_abbr?
+      stage = params[:stage]
+
+      if params[:stage].instance_of?(Pubid::Core::Stage) && !params[:stage].to_s(with_prf: opts[:with_prf]).empty?
         type_prefix = " #{type_prefix}"
+        stage = params[:stage].to_s(with_prf: opts[:with_prf])
       end
 
       if self.class == Supplement
         if opts[:base_type] == :dir
           "%{stage}%{publisher} SUP%{number}%{part}%{iteration}%{year}%{month}%{edition}" % params
         else
-          # type_prefix = "/#{type_prefix}" unless type_prefix.empty?
-          "/%{stage}#{type_prefix}%{number}%{part}%{iteration}%{year}%{edition}" % params
+          "/#{stage}#{type_prefix}%{number}%{part}%{iteration}%{year}%{edition}" % params
         end
       else
-        "/%{stage}#{type_prefix}%{number}%{part}%{iteration}%{year}%{edition}" % params
+        "/#{stage}#{type_prefix}%{number}%{part}%{iteration}%{year}%{edition}" % params
       end
     end
 

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

@@ -0,0 +1,25 @@
+require_relative "urn"
+
+module Pubid::Iso::Renderer
+  class UrnExtract < Urn
+    def render_identifier(params)
+      "%{base}%{stage}:ext%{year}%{number}%{edition}" \
+        "#{@params[:base].language ? (':' + @params[:base].language) : ''}" % params
+    end
+
+    def render_base(base, _opts, _params)
+      return base.urn if base.base || base.is_a?(Pubid::Iso::Identifier::Directives)
+
+      # to avoid rendering language as part of base
+      Urn.new(base.to_h(deep: false)).render
+    end
+
+    def render_number(number, _opts, params)
+      if params[:year]
+        ":v#{number}"
+      else
+        ":#{number}:v1"
+      end
+    end
+  end
+end

data/lib/pubid/iso/transformer.rb

@@ -136,6 +136,8 @@ module Pubid::Iso
         { stage: "CD", type: "TR" }
       when "PDTS"
         { stage: "CD", type: "TS" }
+      when "preCD"
+        { stage: "PreCD" }
       else
         { stage: code }
       end

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.7.4".freeze
+    VERSION = "0.7.6".freeze
   end
 end

data/lib/pubid/iso.rb

@@ -95,6 +95,7 @@ config.type_names = { tr: {
                         long: "Recommendation",
                         short: "R",
                       } }.freeze
+config.prefixes = %w[ISO ИСО FprISO]
 Pubid::Iso::Identifier.set_config(config)
 
 require_relative "iso/parser"

data/stages.yaml

@@ -3,6 +3,7 @@ abbreviations:
   NP: ["10.00", "10.20", "10.60", "10.98", "10.92"]
   AWI: ["20.00", "10.99"]
   WD: ["20.20", "20.60", "20.98", "20.99"]
+  PreCD: ["29.00", "29.20", "29.60", "29.92", "29.98", "29.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"]
@@ -32,6 +33,12 @@ codes_description:
   "20.60": Close of comment period
   "20.98": Project deleted
   "20.99": WD approved for registration as CD
+  "29.00": Committee draft (CD) registered
+  "29.20": CD study/ballot initiated
+  "29.60": Close of voting/ comment period
+  "29.92": CD referred back to Working Group
+  "29.98": Project deleted
+  "29.99": CD approved for registration as DIS
   "30.00": Committee draft (CD) registered
   "30.20": CD study/ballot initiated
   "30.60": Close of voting/ comment period
@@ -84,9 +91,9 @@ substage_codes:
   proceed: "99"
 
 draft_codes: ["00.00", "00.20", "00.60", "00.99", "10.00", "10.20", "10.60", "10.92",
-  "10.99", "20.00", "20.20", "20.60", "20.99", "30.00",
-  "30.20", "30.60", "30.92", "30.99", "40.00", "40.20", "40.60", "40.92",
-  "40.93", "40.99", "50.00", "50.20", "50.60", "50.92", "50.99"]
+  "10.99", "20.00", "20.20", "20.60", "20.99", "29.00", "29.20", "29.60", "29.92",
+  "29.99", "30.00", "30.20", "30.60", "30.92", "30.99", "40.00", "40.20", "40.60",
+  "40.92", "40.93", "40.99", "50.00", "50.20", "50.60", "50.92", "50.99"]
 
 canceled_codes: ["00.98", "10.98", "20.98", "30.98", "40.98", "50.98", "95.99"]
 published_codes: ["60.00", "60.60", "90.20", "90.60", "90.92", "90.93", "90.99", "95.20", "95.60", "95.92"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-02 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.5
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com
@@ -121,6 +121,7 @@ files:
 - lib/pubid/iso/renderer/urn-amendment.rb
 - lib/pubid/iso/renderer/urn-corrigendum.rb
 - lib/pubid/iso/renderer/urn-dir.rb
+- lib/pubid/iso/renderer/urn-extract.rb
 - lib/pubid/iso/renderer/urn-supplement.rb
 - lib/pubid/iso/renderer/urn-tc.rb
 - lib/pubid/iso/renderer/urn.rb
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Library to generate, parse and manipulate ISO PubID.