ruby_universign 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb709339136cbd0245b7d798db80c7107c11bba63390dcfbd602d4f1c69e03c
-  data.tar.gz: 14eb0891dee9adc855633c65cbd011ff01d9afc7e4ce639ee840ac3e25d02433
+  metadata.gz: 9b39566328cf7e2edb2c55e4c22139129f91adb7cdfeb5120d5c7f40b98b73db
+  data.tar.gz: b87ec0c9ad5888959c2e42f2d16425777da5d68aae108e5970a498fef4345416
 SHA512:
-  metadata.gz: 506698f5430b9d49ec75a69f46351c926fcba8d5d62e5c4af2869dec95e4bcbf55a1670ecb761a4613813b4a552830deb4f7adaf1dc9b0b543eb0c4efdd77468
-  data.tar.gz: 87b9d900f92c102ce365d3b71c2a2e21c81ad3ad03dcefab8ccd17695fa561c9cbd642684d7e53f426cc4ef6fdca4b61b5dd0dd535e8e46a3d6144b1f9bc09ac
+  metadata.gz: 973c59f15e06122b52d812ec50bcbeb993db6b145f8435aedca5c72f33bdd0f0bbb13d5308460fc51bb9f4079dd6c7073e8a6728020ded5257502918bd69498c
+  data.tar.gz: acd708d77ab30e7dc2f5b6645ced38f2e4c9210fed1041fe7e809d58b16abd186b65fd487b5fa0a1ce8f9d071eac817fbd76369e1b62c95c624e31442320640b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v1.4.0
+-------------------------
+- Refactor and rename errors. They now all inherit from `Universign::Error`.
+
 v1.3.1
 -------------------------
 

data/lib/universign.rb

@@ -10,11 +10,10 @@ require 'universign/transaction'
 require 'universign/signature_field'
 require 'universign/signer_infos'
 require 'universign/transaction_signer'
+require 'universign/error'
 require 'universign/client'
 require 'universign/document'
 require 'universign/configuration'
-require 'universign/error'
 
 module Universign
-  include Error
 end

data/lib/universign/client.rb

@@ -22,15 +22,5 @@ module Universign
         super(method, *args, &block)
       end
     end
-
-    #                          _   _
-    #   _____  _____ ___ _ __ | |_(_) ___  _ __  ___
-    #  / _ \ \/ / __/ _ \ '_ \| __| |/ _ \| '_ \/ __|
-    # |  __/>  < (_|  __/ |_) | |_| | (_) | | | \__ \
-    #  \___/_/\_\___\___| .__/ \__|_|\___/|_| |_|___/
-    #                   |_|
-    class InvalidCredentials < StandardError; end
-    class ErrorWhenSigningPDF < StandardError; end
-    class UnknownException < StandardError; end
   end
 end

data/lib/universign/document.rb

@@ -103,27 +103,5 @@ module Universign
       @meta_data         = data
       params['metaData'] = data
     end
-
-    #                          _   _
-    #   _____  _____ ___ _ __ | |_(_) ___  _ __  ___
-    #  / _ \ \/ / __/ _ \ '_ \| __| |/ _ \| '_ \/ __|
-    # |  __/>  < (_|  __/ |_) | |_| | (_) | | | \__ \
-    #  \___/_/\_\___\___| .__/ \__|_|\___/|_| |_|___/
-    #                   |_|
-    class UnknownDocument < StandardError; end
-    class NotSigned < StandardError; end
-    class MissingDocument < StandardError; end
-    class MetaDataMustBeAHash < StandardError; end
-    class DocumentURLInvalid < StandardError
-      attr_accessor :url
-
-      def initialize(url)
-        @url = url
-      end
-
-      def to_s
-        "Can't find document at '#{@url}''"
-      end
-    end
   end
 end

data/lib/universign/error.rb

@@ -1,14 +1,34 @@
 module Universign
-  module Error
-    autoload :Client, 'client'
-    ERROR_CODE = {
-      73002 => Universign::Client::ErrorWhenSigningPDF, # An error occured when signing the PDF document
-      73010 => Universign::Client::InvalidCredentials, # The login and/or password are invalid.
-      73025 => Universign::Document::UnknownDocument, # The used transaction id or custom id is invalid
-      73027 => Universign::Document::NotSigned
-    }
-
-    class UniversignError < StandardError; end
-    class NotEnoughTokens < UniversignError; end
+  class Error < ::StandardError
+    def self.match_class(code)
+      {
+        73002 => Universign::ErrorWhenSigningPDF, # An error occured when signing the PDF document
+        73010 => Universign::InvalidCredentials, # The login and/or password are invalid.
+        73025 => Universign::UnknownDocument, # The used transaction id or custom id is invalid
+        73027 => Universign::DocumentNotSigned
+      }.fetch(code, nil)
+    end
+  end
+
+  class NotEnoughTokens < Error; end
+
+  class ErrorWhenSigningPDF < Error; end
+  class InvalidCredentials < Error; end
+  class UnknownException < Error; end
+
+  class UnknownDocument < Error; end
+  class DocumentNotSigned < Error; end
+  class MissingDocument < Error; end
+  class MetaDataMustBeAHash < Error; end
+  class DocumentURLInvalid < Error
+    attr_accessor :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    def to_s
+      "Can't find document at '#{@url}'"
+    end
   end
 end

data/lib/universign/safeguard.rb

@@ -16,27 +16,27 @@ module Universign
           raise ex
         end
 
-        known_exception = Universign::ERROR_CODE[ex.faultCode]
+        known_exception = Universign::Error.match_class(ex.faultCode)
 
         if known_exception
           raise known_exception
         elsif ex.faultString.include?('Error on document download for this URL')
           url = ex.faultString.match(/<(.+)>/)[1] rescue 'unknown URL'
-          raise Universign::Document::DocumentURLInvalid.new(url)
+          raise Universign::DocumentURLInvalid.new(url)
         elsif ex.faultString.include?('Invalid document URL')
           url = ex.faultString.match(/<(.+)>/)[1] rescue 'unknown URL'
-          raise Universign::Document::DocumentURLInvalid.new(url)
+          raise Universign::DocumentURLInvalid.new(url)
         elsif ex.faultString.include?('Not enough tokens')
           raise Universign::NotEnoughTokens
         elsif ex.faultString.include?('ID is unknown')
-          raise Universign::Document::UnknownDocument
+          raise Universign::UnknownDocument
         else
           handle_exception(ex, callback)
         end
 
       rescue RuntimeError => ex
         if ex.message.include?('Authorization failed')
-          raise Universign::Client::InvalidCredentials
+          raise Universign::InvalidCredentials
         end
         raise ex
       end

data/lib/universign/version.rb

@@ -1,3 +1,3 @@
 module Universign
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_universign
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Nicolas Besnard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport