pubid-iso 0.1.4 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9a5dae3e19189666e2259f498813de7aa502ee7d68e1ec4567d493be74e3acb
-  data.tar.gz: f7834ffc05c7eaeec131aaef54804512d2e6d9e5494da8fe286e9730493dd7be
+  metadata.gz: 821262e1b683c07f484d9102195fe832fd1eb00fb3a6b23f713893f081a527f3
+  data.tar.gz: 105da964ba57e1c703bf4d77f485a3fc981660b218b4bf019376f937758a4f6c
 SHA512:
-  metadata.gz: 5a3319d163496c073813d052ecc873fb6f2f90e2351f1c8ac891c2c093c56a59d8405bc942f44b3f57e013f1f7149a7b3a35fc7b73ca3c58a0116ebce5e85b63
-  data.tar.gz: 3c72a547b1abaa06142caa496e8ce6d3769499954bfeaf3f9b01a470017bd3f38a1682be9e793f7eaab019ce202367feeda9d771f13ad14cf11b9cd901dafd42
+  metadata.gz: 1e5fb2bdd1b05f02c788f4b546fa0f6b2054ef0ab01dd4b59961e8c92ccd063a95b655d04969062c2d3674ab7511058b22e7882e586c9ae00e666065592cc5d3
+  data.tar.gz: d5ded0494dbf495d81da9a98b25d72ed90303a343159bbe4d30315d857ae19e0824437f0ebbb0e47371c6f89565b39ca9d4f08bdc5b4bc8358656f7a56b54795

data/lib/pubid/iso/amendment.rb

@@ -0,0 +1,14 @@
+module Pubid::Iso
+  class Amendment < Supplement
+
+    def render_pubid
+      stage = render_pubid_stage
+      stage += " " unless stage.size == 0
+      "/#{stage}Amd #{render_pubid_number}"
+    end
+
+    def render_urn
+      "#{render_urn_stage}:amd#{render_urn_number}"
+    end
+  end
+end

data/lib/pubid/iso/corrigendum.rb

@@ -0,0 +1,14 @@
+module Pubid::Iso
+  class Corrigendum < Supplement
+
+    def render_pubid
+      stage = render_pubid_stage
+      stage += " " unless stage.size == 0
+      "/#{stage}Cor #{render_pubid_number}"
+    end
+
+    def render_urn
+      "#{render_urn_stage}:cor#{render_urn_number}"
+    end
+  end
+end

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

@@ -1,5 +1,9 @@
 module Pubid::Iso
   class French < Identifier
+    def initialize(**opts)
+      opts.each { |key, value| send("#{key}=", value) }
+    end
+
     def identifier(with_date, with_language_code)
       if @type == "Guide"
         "Guide #{originator}#{stage} #{number}#{part}#{iteration}"\
@@ -13,20 +17,8 @@ module Pubid::Iso
       super.map { |copublisher| copublisher.sub("IEC", "CEI") }
     end
 
-    def amendment
-      if @amendment_number
-        "Amd.#{@amendment_version}:#{@amendment_number}"
-      else
-        "Amd.#{@amendment_version}"
-      end
-    end
-
-    def corrigendum
-      if @corrigendum_number
-        "Cor.#{@corrigendum_version}:#{@corrigendum_number}"
-      else
-        "Cor.#{@corrigendum_version}"
-      end
+    def supplements
+      super.gsub(" ", ".")
     end
   end
 end

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

@@ -17,6 +17,10 @@ module Pubid::Iso
              "ISP" => "ИСП",
     }.freeze
 
+    def initialize(**opts)
+      opts.each { |key, value| send("#{key}=", value) }
+    end
+
     def identifier(with_date, with_language_code)
       if @type == "Guide"
         "Руководство #{originator}#{stage} #{number}#{part}#{iteration}"\
@@ -37,5 +41,9 @@ module Pubid::Iso
     def stage
       "#{(@copublisher && ' ') || '/'}#{STAGE[@stage]}" if @stage
     end
+
+    def supplements
+      super.gsub(" ", ".")
+    end
   end
 end

data/lib/pubid/iso/identifier.rb

@@ -5,7 +5,8 @@ module Pubid::Iso
                   :amendment, :amendment_version, :amendment_number,
                   :corrigendum, :corrigendum_version, :corrigendum_number,
                   :amendment_stage, :corrigendum_stage, :joint_document,
-                  :tctype, :sctype, :wgtype, :tcnumber, :scnumber, :wgnumber
+                  :tctype, :sctype, :wgtype, :tcnumber, :scnumber, :wgnumber,
+                  :urn_stage
 
     LANGUAGES = {
       "ru" => "R",
@@ -14,7 +15,21 @@ module Pubid::Iso
       "ar" => "A",
     }.freeze
 
-    def initialize(**opts)
+    def initialize(amendment: nil, amendment_number: nil, amendment_version: nil,
+                   amendment_stage: nil,
+                   corrigendum: nil, corrigendum_number: nil, corrigendum_version: nil,
+                   corrigendum_stage: nil, **opts)
+      if amendment_version
+        @amendment = Amendment.new(number: amendment_number,
+                                   version: amendment_version,
+                                   stage: amendment_stage)
+      end
+      if corrigendum_version
+        @corrigendum = Corrigendum.new(number: corrigendum_number,
+                                   version: corrigendum_version,
+                                   stage: corrigendum_stage)
+      end
+
       opts.each { |key, value| send("#{key}=", value.is_a?(Array) && value || value.to_s) }
     end
 
@@ -26,6 +41,15 @@ module Pubid::Iso
       Urn.new(**get_params)
     end
 
+    def self.parse_from_title(title)
+      title.split.reverse.inject(title) do |acc, part|
+        return parse(acc)
+      rescue Pubid::Iso::Errors::ParseError
+        # delete parts from the title until it's parseable
+        acc.reverse.sub(part.reverse, "").reverse.strip
+      end
+    end
+
     def self.parse(code_or_params)
       params = code_or_params.is_a?(String) ? Parser.new.parse(code_or_params) : code_or_params
       # Parslet returns an array when match any copublisher
@@ -146,35 +170,10 @@ module Pubid::Iso
       ".#{@iteration}" if @iteration
     end
 
-    def amendment
-      if @amendment_number
-        "Amd #{@amendment_version}:#{@amendment_number}"
-      else
-        "Amd #{@amendment_version}"
-      end
-    end
-
-    def corrigendum
-      if @corrigendum_number
-        "Cor #{@corrigendum_version}:#{@corrigendum_number}"
-      else
-        "Cor #{@corrigendum_version}"
-      end
-    end
-
     def supplements
-      result = ""
-      if @amendment_version
-        result += (@amendment_stage && "/#{@amendment_stage} ") || "/"
-        result += amendment
-      end
-
-      if @corrigendum_version
-        result += (@corrigendum_stage && "/#{@corrigendum_stage} ") || "/"
-        result += corrigendum
-      end
+      result = @amendment&.version && @amendment.render_pubid || ""
 
-      result
+      result + (@corrigendum&.version && @corrigendum.render_pubid || "")
     end
 
     def language(with_language_code = :iso)

data/lib/pubid/iso/supplement.rb

@@ -0,0 +1,37 @@
+module Pubid::Iso
+  class Supplement
+    attr_accessor :version, :number, :stage
+
+    def initialize(version:, number:, stage: nil)
+      @version, @number, @stage = version, number, stage
+    end
+
+    def ==(other)
+      other.version == version && (number.nil? || other.number == number) && (stage.nil? || other.stage == stage)
+    end
+
+    def render_pubid_stage
+      ((@stage && @stage) || "")
+    end
+
+    def render_pubid_number
+        if @number
+          "#{@version}:#{@number}"
+        else
+          "#{@version}"
+        end
+    end
+
+    def render_urn_stage
+      ((@stage && ":stage-#{sprintf('%05.2f', Urn::STAGES[@stage.to_sym])}") || "")
+    end
+
+    def render_urn_number
+        if @number
+          ":#{@number}:v#{@version}"
+        else
+          ":#{@version}:v1"
+        end
+    end
+  end
+end

data/lib/pubid/iso/urn.rb

@@ -54,13 +54,15 @@ module Pubid::Iso
     end
 
     def render_stage(stage)
+      return ":stage-#{sprintf('%05.2f', stage)}#{iteration}" if stage.is_a?(Float)
+
       ":stage-#{sprintf('%05.2f', STAGES[stage.to_sym])}#{iteration}"
     end
 
     def stage
-      return render_stage(@stage) if @stage
+      return render_stage(@urn_stage) if @urn_stage
 
-      return render_stage(@amendment_stage) if @amendment_stage
+      return render_stage(@stage) if @stage
 
       render_stage(@corrigendum_stage) if @corrigendum_stage
     end
@@ -96,21 +98,9 @@ module Pubid::Iso
     end
 
     def supplement
-      result = ""
-      if @amendment
-        result +=  if @amendment_number
-                     ":amd:#{@amendment_number}:v#{@amendment_version}"
-                   else
-                     ":amd:#{@amendment_version}:v1"
-                   end
-      end
-      if @corrigendum
-        result += if @corrigendum_number
-                    ":cor:#{@corrigendum_number}:v#{@corrigendum_version}"
-                  else
-                    ":cor:#{@corrigendum_version}:v1"
-                  end
-      end
+      result = @amendment&.render_urn || ""
+
+      result += @corrigendum&.render_urn || ""
 
       result
     end

data/lib/pubid/iso/version.rb

@@ -1,5 +1,5 @@
 module Pubid
   module Iso
-    VERSION = "0.1.4".freeze
+    VERSION = "0.1.7".freeze
   end
 end

data/lib/pubid/iso.rb

@@ -11,6 +11,9 @@ end
 require_relative "iso/errors"
 require_relative "iso/parser"
 require_relative "iso/transformer"
+require_relative "iso/supplement"
+require_relative "iso/amendment"
+require_relative "iso/corrigendum"
 require_relative "iso/identifier"
 require_relative "iso/identifier/french"
 require_relative "iso/identifier/russian"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubid-iso
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -107,11 +107,14 @@ files:
 - README.adoc
 - lib/pubid-iso.rb
 - lib/pubid/iso.rb
+- lib/pubid/iso/amendment.rb
+- lib/pubid/iso/corrigendum.rb
 - lib/pubid/iso/errors.rb
 - lib/pubid/iso/identifier.rb
 - lib/pubid/iso/identifier/french.rb
 - lib/pubid/iso/identifier/russian.rb
 - lib/pubid/iso/parser.rb
+- lib/pubid/iso/supplement.rb
 - lib/pubid/iso/transformer.rb
 - lib/pubid/iso/urn.rb
 - lib/pubid/iso/version.rb