pubid-iso 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c7548bf553930fd483cab3fd09c4a23279ef230108587725c5cecb456e36885
-  data.tar.gz: eb037635c55d8f10068fb4a31ed4254e796c2c158a3b2553a643ee0e1794e8a0
+  metadata.gz: 2d8141eca51005c598eb5b5690a5e467d1e2586d841df60c17adf0294763487c
+  data.tar.gz: 5c8e3e156fbccc5b50ce8bbc4324e5a81377f5464d978bbd056d53bca73fa281
 SHA512:
-  metadata.gz: 830082c58902dfd2763afdf5d8809665f7eae31a8802b8bf290daa9cd6341a553782ed388415c3c6986b731abeb35371ceb4bbf362cd2e42aaacaa2c691f4593
-  data.tar.gz: 70c49c310c2ba7bba7a28027a7c96689d2129f7c0b1193390e81373dc901309248a21055e0ca0fd62290f1f2f919d4749c0c0142195ec46e9b77f1208e70ae92
+  metadata.gz: 988e58d807b4dc46856202b2da80d372c918ddec71cd4c7b38c56787041cd01d4c18b7371ef1d87046b07d4f09567a0201ed96a1405a9ec0d6feec84b5d73193
+  data.tar.gz: b02bdadac0ad01c20a215ff4e9c5a7bc82f2609004144498368e8dff9e01920be5da665ebdedde9892f2cacd763bd7978ca96bb79e431d75b5d638f2aa09f2e6

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/identifier/supplement.rb

@@ -19,6 +19,10 @@ module Pubid::Iso
         },
       }.freeze
 
+      def initialize(publisher: nil, **opts)
+        super(publisher: publisher, **opts)
+      end
+
       def base_has_edition?
         @base.base.nil? && !@base.edition.nil? || (!@base.base.nil? && !@base.base.edition.nil?)
       end

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/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.7.3".freeze
+    VERSION = "0.7.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-20 00:00:00.000000000 Z
+date: 2024-02-13 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.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.4
 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