pubid-core 0.2.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5961503e7e921ca44202798588badd95d5977fd62fbf98275777770439b5da17
-  data.tar.gz: 2840650728ca920a51a615d2ee81e2884607e485e7740fdd4fc4279cb34cb6fd
+  metadata.gz: f2ec998c6f62ddf6387a254425f4989052de90cd44f60577c384f1371314e874
+  data.tar.gz: f9aa149ce454d7d8c674fe12c6c7dc9246ff06c6197c63686abaacd6babe15a6
 SHA512:
-  metadata.gz: 9a956ff7eb7a323b86e3c8656e4396d0c8af503a89f05c96dbd9ff3cc37ec1f6f43ae8a1111eb6c1437b98d3a846f62e0a72b658e2d89a207099351327953c2e
-  data.tar.gz: d55c54c9dc464c01af7bda543bf482d82472ab169101759b510793824e4ee963725e43fe5a486c05627f886f0111e7525fff05d1bd3beafe7612dbe93abe2b87
+  metadata.gz: 502cca40f231aa67f96041c61cb82868a67a1db3b521d8a2e1f7431d3013dfe48d77e698139407c1640f23931d76766c92eeee36033f6f0de1424bd57f669ccc
+  data.tar.gz: 63ba052753612c1c239a5fc6bd71a3952f35dd6dd82715899fa02855479bb55039c71e6b2b7d5d13ab2d02abea638089ab96bc4eacf4c64a6bdfa9c5a27797ca

data/lib/pubid/core/identifier.rb

@@ -4,29 +4,37 @@ module Pubid::Core
                   :type, :year, :edition, :language, :amendments,
                   :corrigendums
 
-    def initialize(amendments: nil, corrigendums: nil, **opts)
-      if amendments
-        @amendments = if amendments.is_a?(Array)
-                        amendments.map do |amendment|
-                          self.class.get_amendment_class.new(**amendment)
-                        end
-                      else
-                        [self.class.get_amendment_class.new(**amendments)]
-                      end
-      end
-      if corrigendums
-        @corrigendums = if corrigendums.is_a?(Array)
-                          corrigendums.map do |corrigendum|
-                            self.class.get_corrigendum_class.new(**corrigendum)
-                          end
-                        else
-                          [self.class.get_corrigendum_class.new(**corrigendums)]
-                        end
-      end
+    # Creates new identifier from options provided:
+    # @param publisher [String] document's publisher, eg. "ISO"
+    # @param copublisher [String,Array<String>] document's copublisher, eg. "IEC"
+    # @param number [Integer] document's number, eg. "1234"
+    # @param part [String] document's part and subparts, eg. "1", "1-1A", "2-3D"
+    # @param type [String] document's type, eg. "TR", "TS"
+    # @param year [Integer] document's year, eg. "2020"
+    # @param edition [Integer] document's edition, eg. "1"
+    # @param language [String] document's translation language
+    #   (available languages: "ru", "fr", "en", "ar")
+    # @param amendments [Array<Amendment>] document's amendments
+    # @param corrigendums [Array<Corrigendum>] document's corrigendums
+    # @see Amendment
+    # @see Corrigendum
+    def initialize(publisher:, number:, copublisher: nil, part: nil, type: nil,
+                   year: nil, edition: nil, language: nil, amendments: nil,
+                   corrigendums: nil)
 
-      opts.each { |key, value| send("#{key}=", value.is_a?(Parslet::Slice) && value.to_s || value) }
+      @amendments = amendments
+      @corrigendums = corrigendums
+      @publisher = publisher.to_s
+      @number = number
+      @copublisher = copublisher if copublisher
+      @part = part.to_s if part
+      @type = type.to_s if type
+      @year = year.to_i if year
+      @edition = edition.to_i if edition
+      @language = language.to_s if language
     end
 
+    # @return [String] Rendered URN identifier
     def urn
       Renderer::Urn.new(get_params).render
     end
@@ -35,39 +43,26 @@ module Pubid::Core
       instance_variables.map { |var| [var.to_s.gsub("@", "").to_sym, instance_variable_get(var)] }.to_h
     end
 
+    # Render identifier using default renderer
     def to_s
       self.class.get_renderer_class.new(get_params).render
     end
 
     class << self
-      def get_amendment_class
-        Amendment
-      end
-
-      def get_corrigendum_class
-        Corrigendum
-      end
-
-      def get_renderer_class
-        Renderer::Base
-      end
-
-      def get_transformer_class
-        Transformer
-      end
-
-      def update_old_code(code)
-        return code unless defined?(UPDATE_CODES)
-
-        UPDATE_CODES.each do |from, to|
-          code = code.gsub(from.match?(/^\/.*\/$/) ? Regexp.new(from[1..-2]) : /^#{Regexp.escape(from)}$/, to)
-        end
-        code
-      end
-
+      # Parses given identifier
+      # @param code_or_params [String, Hash] code or hash from parser
+      #   eg. "ISO 1234", { }
+      # @return [Pubid::Core::Identifier] identifier
       def parse(code_or_params)
         params = code_or_params.is_a?(String) ?
                    get_parser_class.new.parse(update_old_code(code_or_params)) : code_or_params
+        transform(params)
+      rescue Parslet::ParseFailed => failure
+        raise Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
+      end
+
+      # Transform parameters hash or array or hashes to identifier
+      def transform(params)
         # Parslet returns an array when match any copublisher
         # otherwise it's hash
         if params.is_a?(Array)
@@ -76,7 +71,7 @@ module Pubid::Core
               params.inject({}) do |r, i|
                 result = r
                 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)
+                  result = result.merge(k => r.key?(k) ? [v, r[k]].flatten : v)
                 end
                 result
               end
@@ -88,9 +83,36 @@ module Pubid::Core
           end.to_h)
         end
         # merge values repeating keys into array (for copublishers)
+      end
 
-      rescue Parslet::ParseFailed => failure
-        raise Errors::ParseError, "#{failure.message}\ncause: #{failure.parse_failure_cause.ascii_tree}"
+      def get_amendment_class
+        Amendment
+      end
+
+      def get_corrigendum_class
+        Corrigendum
+      end
+
+      def get_renderer_class
+        Renderer::Base
+      end
+
+      def get_transformer_class
+        Transformer
+      end
+
+      # @return [Hash, nil] replacement patterns
+      def get_update_codes
+        nil
+      end
+
+      def update_old_code(code)
+        return code unless get_update_codes
+
+        get_update_codes.each do |from, to|
+          code = code.gsub(from.match?(/^\/.*\/$/) ? Regexp.new(from[1..-2]) : /^#{Regexp.escape(from)}$/, to)
+        end
+        code
       end
     end
   end

data/lib/pubid/core/parser.rb

@@ -41,5 +41,11 @@ module Pubid::Core
     rule(:year_month) do
       year_digits >> dash >> month_digits
     end
+
+    def array_to_str(array)
+      array.reduce(str(array.first)) do |acc, value|
+        acc | str(value)
+      end
+    end
   end
 end

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

@@ -34,9 +34,12 @@ module Pubid::Core::Renderer
       render_identifier(params)
     end
 
+    def render_base(params, prefix = "")
+      "%{publisher}%{copublisher}#{prefix} %{number}" % params
+    end
+
     def render_identifier(params)
-      "%{publisher}%{copublisher}%{type}%{stage} %{number}%{part}%{iteration}"\
-        "%{year}%{edition}%{amendments}%{corrigendums}%{language}" % params
+      render_base(params)
     end
 
     def render_copublisher(copublisher, _opts, _params)
@@ -58,21 +61,6 @@ module Pubid::Core::Renderer
       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}"
@@ -89,13 +77,5 @@ module Pubid::Core::Renderer
         "(#{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

@@ -1,18 +1,12 @@
 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_base(params)
+      "urn:iso:std:%{publisher}%{copublisher}%{type}:%{number}%{part}" % params
+    end
 
     def render_identifier(params)
-      "urn:iso:std:%{publisher}%{copublisher}%{type}:%{number}%{part}%{stage}"\
-      "%{urn_stage}%{corrigendum_stage}%{iteration}%{edition}%{amendments}%{corrigendums}%{language}" % params
+      render_base(params)
     end
 
     def render_publisher(publisher, _opts, _params)
@@ -20,7 +14,7 @@ module Pubid::Core::Renderer
     end
 
     def render_copublisher(copublisher, _opts, _params)
-      return "-#{copublisher.downcase}" unless copublisher.is_a?(Array)
+      return "-#{copublisher.to_s.downcase}" unless copublisher.is_a?(Array)
 
       copublisher.map(&:to_s).sort.map do |copublisher|
         "-#{copublisher.downcase}"
@@ -47,15 +41,6 @@ module Pubid::Core::Renderer
       ":#{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)

data/lib/pubid/core/supplement.rb

@@ -3,6 +3,9 @@ module Pubid::Core
     include Comparable
     attr_accessor :version, :number
 
+    # Creates new supplement with provided version and optional number
+    # @param version [Integer]
+    # @param number [Integer]
     def initialize(version:, number: nil)
       @version, @number = version&.to_i, number&.to_i
     end

data/lib/pubid/core/transformer.rb

@@ -1,4 +1,46 @@
 module Pubid::Core
   class Transformer < Parslet::Transform
+    class << self
+      def get_amendment_class
+        Amendment
+      end
+
+      def get_corrigendum_class
+        Corrigendum
+      end
+    end
+
+    def initialize
+      super
+
+      rule(amendments: subtree(:amendments)) do |context|
+        if context[:amendments].is_a?(Array)
+          context[:amendments] = context[:amendments].map do |amendment|
+            self.class.get_amendment_class.new(version: amendment[:version], number: amendment[:number])
+          end
+        else
+          context[:amendments] =
+            [self.class.get_amendment_class.new(
+              version: context[:amendments][:version],
+              number: context[:amendments][:number])]
+
+        end
+        context
+      end
+
+      rule(corrigendums: subtree(:corrigendums)) do |context|
+        if context[:corrigendums].is_a?(Array)
+          context[:corrigendums] = context[:corrigendums].map do |corrigendum|
+            self.class.get_corrigendum_class.new(version: corrigendum[:version], number: corrigendum[:number])
+          end
+        else
+          context[:corrigendums] =
+            [self.class.get_corrigendum_class.new(
+              version: context[:corrigendums][:version],
+              number: context[:corrigendums][:number])]
+        end
+        context
+      end
+    end
   end
 end

data/lib/pubid/core/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Core
-    VERSION = "0.2.2".freeze
+    VERSION = "1.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-12 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake