pubid-iso 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 994066e91ad11d2b30748ff491bd2324dca970907d61f9995c1990388711d185
-  data.tar.gz: c4b9789dac35f4afb63c567f3e2e41a51633b8e7a46af0dc80b6022778d1e616
+  metadata.gz: 2d8141eca51005c598eb5b5690a5e467d1e2586d841df60c17adf0294763487c
+  data.tar.gz: 5c8e3e156fbccc5b50ce8bbc4324e5a81377f5464d978bbd056d53bca73fa281
 SHA512:
-  metadata.gz: cb7e5d8b073c664ebbfd3ad22e05a415cb932b4c314aeca51164ac1c7c26c1fe4db37c770c63735832251c8e790a1f118a489448bba0d816982bd12c9e7a1364
-  data.tar.gz: b82c61a71b57000f7607252b2d92bf999bd143a7aba39e59e515998f96a1c3062aeb4dbf33667d1620b89be536a35c4470f389d968622e731a94bf33f83924e7
+  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/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.4".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.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-02 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