pubid-core 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572e76f914359171e1ebd2e4894cd02fcfcc519311f687a5f616b701bf177a44
-  data.tar.gz: 8e0328ff09f797795747a1df3de3484a37dc717c2e657e782c5d4310784044d0
+  metadata.gz: 64a6316ad207f1d35b7c91406887d54cdb839765ce1d7aed4fc4a2ce5c27b9ce
+  data.tar.gz: 9b54bb81e84b0e90a46e70ddbdf48c0cb73438e84c66c6e144bd010954f475ae
 SHA512:
-  metadata.gz: 8a62af066a0517b83ba5440f26437bdea0251f485de3d3062c38921fbe9271490aec6c90aa2bacdda7ed5772f44113ca248dbd68035b1223c83a0a075476f4ae
-  data.tar.gz: ab780a3f9b8e17abbb3554615ecb7f2c642573c6399fed11c6d93e76aa6459cc9980f433b9d4f904da306a3d6afbefede51b4c3021fa9ce70905be424c17f368
+  metadata.gz: b18da4c3bb53562b9556948b631be4525d62b9bd244f93889328c6359f73df90c1159f8a08ace0d641644255ac072c8378a48e3f720b909dce8cafa6d8a1deeb
+  data.tar.gz: be5beb7da4ef8741504375c6a044a3a400fda9edf4eac1c2042fa9ea3516d7656dbdb200156d6fbf77402d57106e974124f145046bc38627538651f2c2fe4944

data/lib/pubid/core/identifier.rb

@@ -27,12 +27,16 @@ module Pubid::Core
       opts.each { |key, value| send("#{key}=", value.is_a?(Array) && value || value.to_s) }
     end
 
+    def urn
+      Renderer::Urn.new(get_params).render
+    end
+
     def get_params
       instance_variables.map { |var| [var.to_s.gsub("@", "").to_sym, instance_variable_get(var)] }.to_h
     end
 
     def to_s
-      self.class.get_renderer.new(get_params).render
+      self.class.get_renderer_class.new(get_params).render
     end
 
     class << self
@@ -44,8 +48,12 @@ module Pubid::Core
         Corrigendum
       end
 
-      def get_renderer
-        Renderer
+      def get_renderer_class
+        Renderer::Base
+      end
+
+      def get_transformer_class
+        Transformer
       end
 
       def parse(code_or_params)
@@ -57,7 +65,7 @@ module Pubid::Core
             **(
               params.inject({}) do |r, i|
                 result = r
-                i.map {|k, v| Transformer.new.apply(k => v).to_a.first }.each do |k, v|
+                i.map {|k, v| get_transformer_class.new.apply(k => v).to_a.first }.each do |k, v|
                   result = result.merge(k => r.key?(k) ? [v, r[k]] : v)
                 end
                 result
@@ -66,7 +74,7 @@ module Pubid::Core
           )
         else
           new(**params.map do |k, v|
-            Transformer.new.apply(k => v).to_a.first
+            get_transformer_class.new.apply(k => v).to_a.first
           end.to_h)
         end
         # merge values repeating keys into array (for copublishers)

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

@@ -0,0 +1,100 @@
+module Pubid::Core::Renderer
+  class Base
+    attr_accessor :params
+
+    LANGUAGES = {
+      "ru" => "R",
+      "fr" => "F",
+      "en" => "E",
+      "ar" => "A",
+    }.freeze
+
+    def initialize(params)
+      @params = params
+    end
+
+    def prerender_params(params, opts)
+      params.map do |key, value|
+        if respond_to?("render_#{key}")
+          [key, send("render_#{key}", value, opts, params)]
+        else
+          [key, value]
+        end
+      end.to_h
+    end
+
+    # render from hash keys
+    def render(with_date: true, with_language_code: :iso)
+      params = prerender_params(@params,
+                                { with_date: with_date, with_language_code: with_language_code })
+      # render empty string when the key is not exist
+      params.default = ""
+
+      render_identifier(params)
+    end
+
+    def render_identifier(params)
+      "%{publisher}%{copublisher}%{type}%{stage} %{number}%{part}%{iteration}"\
+        "%{year}%{edition}%{amendments}%{corrigendums}%{language}" % params
+    end
+
+    def render_copublisher(copublisher, _opts, _params)
+      # (!@copublisher.is_a?(Array) && [@copublisher]) || @copublisher
+      if copublisher.is_a?(Array)
+        copublisher.map(&:to_s).sort.map do |copublisher|
+          "/#{copublisher.gsub('-', '/')}"
+        end.join
+      else
+        "/#{copublisher}"
+      end
+    end
+
+    def render_amendments(amendments, _opts, _params)
+      amendments.sort.map(&:render_pubid).join("+")
+    end
+
+    def render_corrigendums(corrigendums, _opts, _params)
+      corrigendums.sort.map(&:render_pubid).join("+")
+    end
+
+    def render_type(type, opts, params)
+      if params[:copublisher]
+        " #{type}"
+      else
+        "/#{type}"
+      end
+    end
+
+    def render_stage(stage, opts, params)
+      if params[:copublisher]
+        " #{stage}"
+      else
+        "/#{stage}"
+      end
+    end
+
+    def render_part(part, opts, _params)
+      "-#{part}"
+    end
+
+    def render_year(year, opts, _params)
+      opts[:with_date] && ":#{year}" || ""
+    end
+
+    def render_language(language, opts, _params)
+      if opts[:with_language_code] == :single
+        "(#{LANGUAGES[language]})"
+      else
+        "(#{language})"
+      end
+    end
+    
+    def render_edition(edition, _opts, _params)
+      " ED#{edition}"
+    end
+
+    def render_iteration(iteration, _opts, _params)
+      ".#{iteration}"
+    end
+  end
+end

data/lib/pubid/core/renderer/urn.rb

@@ -0,0 +1,72 @@
+module Pubid::Core::Renderer
+  class Urn < Base
+    STAGES = { PWI: 0,
+               NP: 10,
+               AWI: 20,
+               WD: 20.20,
+               CD: 30,
+               DIS: 40,
+               FDIS: 50,
+               PRF: 50,
+               IS: 60 }.freeze
+
+    def render_identifier(params)
+      "urn:iso:std:%{publisher}%{copublisher}%{type}:%{number}%{part}%{stage}"\
+      "%{urn_stage}%{corrigendum_stage}%{iteration}%{edition}%{amendments}%{corrigendums}%{language}" % params
+    end
+
+    def render_publisher(publisher, _opts, _params)
+      publisher.downcase
+    end
+
+    def render_copublisher(copublisher, _opts, _params)
+      return "-#{copublisher.downcase}" unless copublisher.is_a?(Array)
+
+      copublisher.map(&:to_s).sort.map do |copublisher|
+        "-#{copublisher.downcase}"
+      end.join
+    end
+
+    def render_edition(edition, _opts, _params)
+      ":ed-#{edition}"
+    end
+
+    def render_type(type, _, _)
+      ":#{type.downcase}"
+    end
+
+    def render_amendments(amendments, _opts, _params)
+      amendments&.map(&:render_urn)&.join || ""
+    end
+
+    def render_corrigendums(corrigendums, _opts, _params)
+      corrigendums&.map(&:render_urn)&.join || ""
+    end
+
+    def render_language(language, _opts, _params)
+      ":#{language}"
+    end
+
+    def render_stage(stage, _opts, _params)
+      return ":stage-#{sprintf('%05.2f', stage)}" if stage.is_a?(Float)
+
+      ":stage-#{sprintf('%05.2f', STAGES[stage.to_sym])}"
+    end
+
+    def render_urn_stage(stage, opts, params)
+      render_stage(stage, opts, params)
+    end
+
+    def render_corrigendum_stage(stage, opts, params)
+      render_stage(stage, opts, params)
+    end
+
+    def render_iteration(iteration, _opts, params)
+      ".v#{iteration}" if params[:stage]
+    end
+
+    def render_part(part, _opts, _params)
+      ":-#{part}"
+    end
+  end
+end

data/lib/pubid/core/supplement.rb

@@ -1,13 +1,18 @@
 module Pubid::Core
   class Supplement
-    attr_accessor :version, :number, :stage
+    include Comparable
+    attr_accessor :version, :number
 
-    def initialize(version:, number: nil, stage: nil)
-      @version, @number, @stage = version, number, stage
+    def initialize(version:, number: nil)
+      @version, @number = version&.to_i, number&.to_i
     end
 
-    def ==(other)
-      other.version == version && (number.nil? || other.number == number) && (stage.nil? || other.stage == stage)
+    def <=>(other)
+      return 0 if number.nil? && other.number
+
+      return number <=> other.number if version == other.version
+
+      (version <=> other.version) || number <=> other.number
     end
 
     def render_pubid_number

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "0.1.5".freeze
+    VERSION = "0.1.8".freeze
   end
 end

data/lib/pubid/core.rb

@@ -6,5 +6,6 @@ require_relative "core/supplement"
 require_relative "core/amendment"
 require_relative "core/corrigendum"
 require_relative "core/transformer"
-require_relative "core/renderer"
+require_relative "core/renderer/base"
+require_relative "core/renderer/urn"
 require_relative "core/identifier"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,7 +70,8 @@ files:
 - lib/pubid/core/errors.rb
 - lib/pubid/core/identifier.rb
 - lib/pubid/core/parser.rb
-- lib/pubid/core/renderer.rb
+- lib/pubid/core/renderer/base.rb
+- lib/pubid/core/renderer/urn.rb
 - lib/pubid/core/supplement.rb
 - lib/pubid/core/transformer.rb
 - lib/pubid/core/version.rb

data/lib/pubid/core/renderer.rb

@@ -1,15 +0,0 @@
-module Pubid::Core
-  class Renderer
-    attr_accessor :params
-
-    def initialize(params)
-      @params = params
-      @params.default = ""
-    end
-    # render from hash keys
-    def render
-      "%{publisher}%{type}%{stage} %{number}%{part}%{iteration}"\
-        "%{edition}%{supplements}%{language}" % @params
-    end
-  end
-end