pubid-iso 0.6.1 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0cd99c30184d624f0019e7d10fd9d3d752e86ff701b4852de0d97f79e9ac095
-  data.tar.gz: 1c2c1988f300757de153e28ff528f01a488c058e2b3b49a41be94a73ef242397
+  metadata.gz: 554740ba301fe225d6b7a58931013bb6d33d2c9ffa41de45c2b72b53b16340e7
+  data.tar.gz: ad603b65a477dbf70222252e0b286226d9dc576ff24fc794e9873fdea4a0a45e
 SHA512:
-  metadata.gz: 7f63fbc6f3f030698619fa235ee2ba17bc3ba8d237ae05b2b0397a6e211654defe106d6f13fabf4c28e40470bc8ba68664b07ff90ec12f8e1fb7d7f33a1302b2
-  data.tar.gz: dfa9bcb9441abc1ce2d5e56cce1ea915d72f3c9599ba64b6ec5e554e464397fe22940abc659eee1298136abba27acc26d5457f8e025a2f648a1fa32dfbe88159
+  metadata.gz: 731c5b93d0c2a443a6d1af5c965d6eb4984279bb062d1bd3136436cf65044186332661cbc6ae51a0500131b1cc13204991c4ed8e211fe28937298db806c65817
+  data.tar.gz: 441fbee4c9481f6c60f7f25a7ea6256550dab0241c0fb1a048e3272eaab4b87ac1089c08d2f7a33dbd74d418151793193ee7e0d36143b8c46ac79594134b3fcf

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

@@ -13,7 +13,7 @@ module Pubid::Iso
         },
       }.freeze
       def self.type
-        { key: :add, title: "Addendum" }
+        { key: :add, title: "Addendum", short: "ADD" }
       end
 
       def self.get_renderer_class

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

@@ -21,7 +21,7 @@ module Pubid::Iso
         },
       }.freeze
       def self.type
-        { key: :amd, title: "Amendment" }
+        { key: :amd, title: "Amendment", short: "AMD" }
       end
 
       def self.get_renderer_class
@@ -31,7 +31,7 @@ module Pubid::Iso
       def urn
         raise Errors::NoEditionError, "Base document must have edition" unless base_has_edition?
 
-        Renderer::UrnAmendment.new(get_params).render
+        Renderer::UrnAmendment.new(to_h(deep: false)).render
       end
     end
   end

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

@@ -12,7 +12,7 @@ module Pubid::Iso
                     :tctype, :sctype, :wgtype, :tcnumber, :scnumber, :wgnumber,
                     :dirtype,
                     :base,
-                    :typed_stage,
+                    # :typed_stage,
                     :supplements,
                     :addendum
 
@@ -21,7 +21,7 @@ module Pubid::Iso
       #
       # @param stage [Stage, Symbol, String] stage or typed stage, e.g. "PWI", "NP", "50.00", Stage.new(abbr: :WD), "DTR"
       # @param iteration [Integer] document iteration, eg. "1", "2", "3"
-      # @param joint_document [Identifier] joint document
+      # @param joint_document [Identifier, Hash] joint document
       # @param supplements [Array<Supplement>] supplements
       # @param tctype [String] Technical Committee type, eg. "TC", "JTC"
       # @param sctype [String] TC subsommittee, eg. "SC"
@@ -30,7 +30,7 @@ module Pubid::Iso
       # @param scnumber [Integer] Subsommittee number, eg. "1", "2"
       # @param wgnumber [Integer] Working group number, eg. "1", "2"
       # @param dirtype [String] Directives document type, eg. "JTC"
-      # @param base [Identifier] base document for supplement's identifier
+      # @param base [Identifier, Hash] base document for supplement's identifier
       # @param type [nil, :tr, :ts, :amd, :cor, :guide, :dir, :tc, Type] document's type, eg. :tr, :ts, :amd, :cor, Type.new(:tr)
       # @raise [Errors::SupplementWithoutYearOrStageError] when trying to apply
       #   supplement to the document without edition year or stage
@@ -62,13 +62,19 @@ module Pubid::Iso
         end
 
         if stage
-          @typed_stage, @stage = resolve_stage(stage)
+          @stage = resolve_stage(stage)
         elsif iteration && !is_a?(Supplement)
           raise Errors::IterationWithoutStageError, "Document without stage cannot have iteration"
         end
 
         @iteration = iteration.to_i if iteration
-        @joint_document = joint_document if joint_document
+        if joint_document
+          if joint_document.is_a?(Hash)
+            @joint_document = Identifier.create(**joint_document)
+          else
+            @joint_document = joint_document
+          end
+        end
         @tctype = tctype if tctype
         @sctype = sctype.to_s if sctype
         @wgtype = wgtype.to_s if wgtype
@@ -77,7 +83,13 @@ module Pubid::Iso
         @wgnumber = wgnumber.to_s if wgnumber
         @dir = dir.to_s if dir
         @dirtype = dirtype.to_s if dirtype
-        @base = base if base
+        if base
+          if base.is_a?(Hash)
+            @base = Identifier.create(**base)
+          else
+            @base = base
+          end
+        end
         @part = part if part
         @addendum = addendum if addendum
         @edition = edition
@@ -178,7 +190,7 @@ module Pubid::Iso
       # @return [String] URN identifier
       def urn
         ((@tctype && Renderer::UrnTc) || Pubid::Iso::Renderer::Urn).new(
-          get_params.merge({ type: type[:key] }),
+          to_h(deep: false).merge({ type: type[:key] }),
         ).render + (language ? ":#{language}" : "")
       end
 
@@ -243,7 +255,7 @@ module Pubid::Iso
         options[:with_prf] = with_prf
         options[:language] = lang
 
-        self.class.get_renderer_class.new(get_params).render(**options) +
+        self.class.get_renderer_class.new(to_h(deep: false)).render(**options) +
           if @joint_document
             render_joint_document(@joint_document)
           end.to_s

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

@@ -22,7 +22,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :cor, title: "Corrigendum" }
+        { key: :cor, title: "Corrigendum", short: "COR" }
       end
 
       def self.get_renderer_class
@@ -32,7 +32,7 @@ module Pubid::Iso
       def urn
         raise Errors::NoEditionError, "Base document must have edition" unless base_has_edition?
 
-        Renderer::UrnCorrigendum.new(get_params).render
+        Renderer::UrnCorrigendum.new(to_h(deep: false)).render
       end
     end
   end

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

@@ -16,7 +16,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :dir, title: "Directives" }
+        { key: :dir, title: "Directives", short: "DIR" }
       end
 
       def self.get_renderer_class
@@ -24,7 +24,7 @@ module Pubid::Iso
       end
 
       def urn
-        Renderer::UrnDir.new(get_params).render
+        Renderer::UrnDir.new(to_h(deep: false)).render
       end
 
       def render_joint_document(joint_document)

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

@@ -8,7 +8,7 @@ module Pubid::Iso
       TYPED_STAGES = {}.freeze
 
       def self.type
-        { key: :ext, title: "Extract" }
+        { key: :ext, title: "Extract", short: "EXT" }
       end
 
       def self.get_renderer_class

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

@@ -25,7 +25,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :guide, title: "Guide" }
+        { key: :guide, title: "Guide", short: "GUIDE" }
       end
     end
   end

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

@@ -31,7 +31,7 @@ module Pubid::Iso
       end
 
       def typed_stage_abbrev
-        if self.class::TYPED_STAGES.key?(typed_stage)
+        if self.class::TYPED_STAGES.key?(stage)
           super
         else
           stage&.abbr
@@ -39,7 +39,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :is, title: "International Standard" }
+        { key: :is, title: "International Standard", short: nil }
       end
     end
   end

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

@@ -6,12 +6,12 @@ module Pubid::Iso
       def_delegators 'Pubid::Iso::Identifier::InternationalStandardizedProfile', :type
 
       TYPED_STAGES = {
-        dis: {
+        disp: {
           abbr: "DISP",
           name: "Draft International Standardized Profile",
           harmonized_stages: %w[40.00 40.20 40.60 40.92 40.93 40.98 40.99],
         },
-        fdis: {
+        fdisp: {
           abbr: "FDISP",
           name: "Final Draft International Standardized Profile",
           harmonized_stages: %w[50.00 50.20 50.60 50.92],
@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :isp, title: "International Standardized Profile" }
+        { key: :isp, title: "International Standardized Profile", short: "ISP" }
       end
 
       def self.get_renderer_class

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

@@ -6,7 +6,7 @@ module Pubid::Iso
       def_delegators 'Pubid::Iso::Identifier::InternationalWorkshopAgreement', :type
 
       TYPED_STAGES = {
-        dis: {
+        diwa: {
           abbr: "DIWA",
           name: "Draft International Workshop Agreement",
           harmonized_stages: %w[40.00 40.20 40.60 40.92 40.93 40.98 40.99],
@@ -14,7 +14,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :iwa, title: "International Workshop Agreement" }
+        { key: :iwa, title: "International Workshop Agreement", short: "IWA" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :pas, title: "Publicly Available Specification" }
+        { key: :pas, title: "Publicly Available Specification", short: "PAS" }
       end
 
       def self.get_renderer_class

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

@@ -8,7 +8,7 @@ module Pubid::Iso
       TYPED_STAGES = {}.freeze
 
       def self.type
-        { key: :r, title: "Recommendation" }
+        { key: :r, title: "Recommendation", short: "R" }
       end
 
       def self.get_renderer_class

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

@@ -24,7 +24,7 @@ module Pubid::Iso
       end
 
       def self.type
-        { key: :sup, title: "Supplement", values: %w[Supplement Suppl SUP] }
+        { key: :sup, title: "Supplement", values: %w[Supplement Suppl SUP], short: "SUP" }
       end
 
       def self.get_renderer_class
@@ -32,7 +32,7 @@ module Pubid::Iso
       end
 
       def urn
-        Renderer::UrnSupplement.new(get_params).render
+        Renderer::UrnSupplement.new(to_h(deep: false)).render
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Pubid::Iso
       TYPED_STAGES = {}.freeze
 
       def self.type
-        { key: :tc, title: "Technical Committee" }
+        { key: :tc, title: "Technical Committee", short: "TC" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :tr, title: "Technical Report" }
+        { key: :tr, title: "Technical Report", short: "TR" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :ts, title: "Technical Specification" }
+        { key: :ts, title: "Technical Specification", short: "TS" }
       end
 
       def self.get_renderer_class

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

@@ -19,7 +19,7 @@ module Pubid::Iso
       }.freeze
 
       def self.type
-        { key: :tta, title: "Technology Trends Assessments" }
+        { key: :tta, title: "Technology Trends Assessments", short: "TTA" }
       end
 
       def self.get_renderer_class

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

@@ -42,10 +42,10 @@ module Pubid::Iso::Renderer
     def render_base(_base, _opts, _params)
     end
 
-    def render_type_prefix(params)
-      result = params[:typed_stage].nil? || params[:typed_stage].empty? ? self.class::TYPE : ""
+    def render_type_prefix(params, opts)
+      result = params[:stage].nil? || !params[:stage].is_a?(Pubid::Core::TypedStage) ? self.class::TYPE : ""
 
-      if params[:stage] && !params[:stage].empty? && !result.empty?
+      if params[:stage] != "" && !params[:stage].to_s(with_prf: opts[:with_prf]).empty? && !result.empty?
         " #{result}"
       else
         result
@@ -53,7 +53,8 @@ module Pubid::Iso::Renderer
     end
 
     def render_identifier(params, opts)
-      "%{publisher}%{typed_stage}%{stage}#{render_type_prefix(params)} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{addendum}%{edition}" % params
+      stage = params.key?(:stage) ? postrender_stage(params[:stage], opts, params) : ""
+      "%{publisher}#{stage}#{render_type_prefix(params, opts)} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{addendum}%{edition}" % params
     end
 
     def render_copublisher_string(publisher, copublishers, opts)
@@ -125,8 +126,11 @@ module Pubid::Iso::Renderer
       typed_stage.to_s
     end
 
-    def render_stage(stage, opts, params)
-      return if params[:typed_stage]
+    def render_stage(stage, _opts, _params)
+      stage
+    end
+
+    def postrender_stage(stage, opts, params)
       return if stage.empty_abbr?(with_prf: opts[:with_prf])
 
       if opts[:language]

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

@@ -7,7 +7,7 @@ module Pubid::Iso::Renderer
       res = ("%{publisher} DIR%{dirtype}%{number}%{year}%{edition}" % params)
 
       if params.key?(:joint_document)
-        joint_params = prerender_params(params[:joint_document].get_params, {})
+        joint_params = prerender_params(params[:joint_document].to_h(deep: false), {})
         joint_params.default = ""
         res += (" + %{publisher}%{dirtype}%{number}%{year}" % joint_params)
       end

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

@@ -8,8 +8,8 @@ module Pubid::Iso::Renderer
       elsif opts[:language] == :russian
         "Руководство %{publisher}%{stage} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{edition}" % params
       else
-        if params[:typed_stage] && !params[:typed_stage].empty?
-          "%{publisher}%{typed_stage}%{stage} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{edition}" % params
+        if params[:stage] && params[:stage].is_a?(Pubid::Core::TypedStage)
+          "%{publisher}%{stage} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{edition}" % params
         else
           "%{publisher}%{stage} Guide %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{edition}" % params
         end

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

@@ -11,7 +11,8 @@ module Pubid::Iso::Renderer
     end
 
     def render_identifier(params, opts)
-      "%{typed_stage}%{stage}#{render_type_prefix(params)} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{addendum}%{edition}" % params
+      stage = params.key?(:stage) ? postrender_stage(params[:stage], opts, params) : ""
+      "#{stage}#{render_type_prefix(params, opts)} %{number}%{part}%{iteration}%{year}%{amendments}%{corrigendums}%{addendum}%{edition}" % params
     end
   end
 end

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

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

@@ -8,10 +8,10 @@ module Pubid::Iso::Renderer
 
       if params.key?(:joint_document)
         if params[:joint_document].is_a?(Pubid::Iso::Identifier::Supplement)
-          joint_params = params[:joint_document].get_params
+          joint_params = params[:joint_document].to_h(deep: false)
           res += ":#{joint_params[:base].publisher.downcase}:sup:%{year}" % joint_params
         else
-          joint_params = prerender_params(params[:joint_document].get_params, {})
+          joint_params = prerender_params(params[:joint_document].to_h(deep: false), {})
           joint_params.default = ""
           res += (":%{publisher}%{copublisher}%{dirtype}%{number}%{supplement}" % joint_params)
         end

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

@@ -13,7 +13,7 @@ module Pubid::Iso::Renderer
       return base.urn if base.base || base.is_a?(Pubid::Iso::Identifier::Directives)
 
       # to avoid rendering language as part of base
-      Urn.new(base.get_params).render
+      Urn.new(base.to_h(deep: false)).render
     end
 
     def render_number(number, _opts, params)

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.6.1".freeze
+    VERSION = "0.7.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: '1.12'
 description: Library to generate, parse and manipulate ISO PubID.
 email:
 - open.source@ribose.com