nps_sdk 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f52f959344e61f3c2229da2ad383f76992f4404e801a0b6d2af437af91b3bad
-  data.tar.gz: 20dcafc06db6c03aa8d3b61f2e35fb89dddbd0740923eec590fb4b735c8e515d
+  metadata.gz: 91bef4b7f40520eb77e2e6a0da83b4bced5c1553c2e39b078d0ef9588e20122e
+  data.tar.gz: 28ea5d36c97e0e452ff428eee01f3134d62e6478a89adb16233bd3cb26ca307c
 SHA512:
-  metadata.gz: 351ab4c51b195f2927f5d0e6eddc57ee6ff927cef3df0ada65d3847417677620b8f358917bc16ef96e1dc0b02724b44d000c541e72ef520be9947606b4385dbb
-  data.tar.gz: 11b49693d978ef533d26696422ed646e4400a2dfaa829b31f9b99ca718745210f1a176f4d1ce96da2b1ab3862aaa1815ace8dbb7cc2148824bc243d00d2456fb
+  metadata.gz: 7ff32579588daa0f8fa0dc2fc2ed214d9867356cd922338236d223d22516d733b45346cde0c59d99adf309823b69a829d0ab9ba666cd2991cdbec2d808748856
+  data.tar.gz: b0b0a774e27e9d059a8720f89251e0254325aa4abbdccd319790a4fda82587825d4c901f6f72f49b9ed0c07d920972808613f8e6fb7b40bbc3967735babaaee1

data/lib/nps/api_exception.rb

@@ -8,4 +8,44 @@ class LoggerException < StandardError
   def message
     "DEBUG level is now allowed in PRODUCTION ENVIRONMENT"
   end
+end
+
+class EmptyCustomUrlsException < StandardError
+  def message
+    "CustomUrls cannot by empty"
+  end
+end
+
+class InvalidUrlException < StandardError
+  def message
+    "Invalid URL"
+  end
+
+  def self.error_message_with_url (url)
+    "Invalid URL - #{url}"
+  end
+end
+
+class WrongConfigurationException < StandardError
+  def message
+    "Only CUSTOM_ENV environment is available with CustomUrls"
+  end
+end
+
+class MissingEnvironmentException < StandardError
+  def message
+    "Environment field not specified"
+  end
+end
+
+class MaxCustomUrlsException < StandardError
+  def message
+    "Custom Urls must contain at most 2 urls"
+  end
+end
+
+class EmptyCustomUrlsWithCustomEnvException < StandardError
+  def message
+    "CustomEnvUrls cannot be empty using CUSTOM_ENV environment"
+  end
 end

data/lib/nps/configuration.rb

@@ -14,6 +14,7 @@ module Nps
     attr_accessor :proxy_url
     attr_accessor :proxy_username
     attr_accessor :proxy_password
+    attr_accessor :custom_env_urls
 
   end
 end

data/lib/nps/environments.rb

@@ -1,8 +1,40 @@
 module Nps
   class Environments
-    SANDBOX_ENV = "sandbox.wsdl"
-    STAGING_ENV = "staging.wsdl"
-    PRODUCTION_ENV = "production.wsdl"
-    DEVELOPMENT_ENV = "development.wsdl"
+    PRODUCTION_ENV = 0
+    SANDBOX_ENV = 1
+    STAGING_ENV = 2
+    DEVELOPMENT_ENV = 3
+    CUSTOM_ENV = 4
+
+    SANDBOX_WSDL = "sandbox.wsdl"
+    STAGING_WSDL = "staging.wsdl"
+    PRODUCTION_WSDL = "production.wsdl"
+    DEVELOPMENT_WSDL = "development.wsdl"
+    CUSTOM_WSDL = "production.wsdl"
+
+    private_constant :SANDBOX_WSDL
+    private_constant :STAGING_WSDL
+    private_constant :PRODUCTION_WSDL
+    private_constant :DEVELOPMENT_WSDL
+    private_constant :CUSTOM_WSDL
+
+    def self.get_wsdl (environment)
+      begin
+        if environment < 0
+          raise "Invalid environment"
+        end
+        environments = [
+            PRODUCTION_WSDL,
+            STAGING_WSDL,
+            SANDBOX_WSDL,
+            DEVELOPMENT_WSDL,
+            CUSTOM_WSDL
+        ]
+        return environments[environment]
+      rescue
+        raise "Environment not found"
+      end
+    end
+
   end
 end

data/lib/nps/nps_formatter.rb

@@ -5,7 +5,7 @@ module Nps
 
     def call(severity, time, progname, msg)
       msg = ofuscate(msg)
-      "#{time} - #{severity} - NpsSDK - #{msg2str(msg)}"
+      "#{time} - #{severity} - NpsSDK - #{msg2str(msg)} \n"
     end
 
     def ofuscate_cvc(msg)

data/lib/nps/soap_client.rb

@@ -1,5 +1,7 @@
 require 'certifi'
 require_relative 'services'
+require_relative 'environments'
+require_relative 'utils'
 module Nps
   class SoapClient
 
@@ -13,12 +15,48 @@ module Nps
       end
       if conf.log_level == Logger::DEBUG and conf.environment == Nps::Environments::PRODUCTION_ENV
         raise LoggerException
-      end  
+      end
+
+      if conf.environment.nil?
+        raise MissingEnvironmentException
+      end
+
+      if conf.environment == Nps::Environments::CUSTOM_ENV and conf.custom_env_urls.nil?
+        raise EmptyCustomUrlsWithCustomEnvException
+      end
+
+      if conf.custom_env_urls
+        if conf.environment != Nps::Environments::CUSTOM_ENV
+          raise WrongConfigurationException
+        end
+
+        if conf.custom_env_urls.length > Nps::Utils::MAX_CUSTOM_URLS
+          raise MaxCustomUrlsException
+        end
+
+        if conf.custom_env_urls.kind_of?(Array) and conf.custom_env_urls.empty?
+          raise EmptyCustomUrlsException
+        end
+
+        conf.custom_env_urls.each do |url|
+          # if url =~ /\A#{URI::regexp}\z/
+          #   raise InvalidUrlException.error_message_with_url url
+          # end
+
+          unless url_valid? url
+            raise InvalidUrlException.error_message_with_url url
+          end
+
+          # unless valid_url_1? url
+          #   raise InvalidUrlException.error_message_with_url url
+          # end
+        end
+      end
 
       @key = conf.key
       @log = true
       @logger = conf.logger
-      @wsdl = conf.environment
+      @wsdl = Nps::Environments::get_wsdl(conf.environment)
       @open_timeout = conf.o_timeout.nil? ? 5 : conf.o_timeout
       @read_timeout = conf.r_timeout.nil? ? 60 : conf.r_timeout
       @verify_ssl = conf.verify_ssl.nil? ? true : conf.verify_ssl
@@ -27,15 +65,28 @@ module Nps
       @proxy = conf.proxy_url ? conf.proxy_url : nil
       @proxy_username = conf.proxy_username ? @proxy_username : nil
       @proxy_password = conf.proxy_password ? @proxy_password : nil
+      @custom_env_urls = conf.custom_env_urls ? conf.custom_env_urls : nil
 
       setup
     end
 
+    def url_valid?(url)
+        url = URI.parse(url) rescue false
+        url.kind_of?(URI::HTTP) || url.kind_of?(URI::HTTPS)
+    end
+
+    def valid_url_1?(url)
+      uri = URI.parse(url)
+      uri.is_a?(URI::HTTP) && !uri.host.nil?
+    rescue URI::InvalidURIError
+      false
+    end
+
     def setup
-      client_config = {
+      @client_config = {
           ssl_verify_mode: :none,
-          wsdl: File.join(File.dirname(File.expand_path(__FILE__)), "/wsdl/" + @wsdl),
           logger: @logger,
+          wsdl: File.join(File.dirname(File.expand_path(__FILE__)), "/wsdl/" + @wsdl),
           open_timeout: @open_timeout,
           read_timeout: @read_timeout,
           pretty_print_xml: true,
@@ -46,7 +97,7 @@ module Nps
         lvl_config = {
           log_level: :debug
         }
-        client_config.merge!(lvl_config)
+        @client_config.merge!(lvl_config)
       end
       
       if @verify_ssl
@@ -54,26 +105,23 @@ module Nps
             ssl_verify_mode: :peer,
             ssl_ca_cert_file: Certifi.where
         }
-        client_config.merge!(ssl_config)
+        @client_config.merge!(ssl_config)
       end
 
       if @proxy
         proxy = {
             proxy: @proxy
         }
-        client_config.merge!(proxy)
+        @client_config.merge!(proxy)
       end
 
       if @proxy_username
         proxy_auth = {
           headers: { "Proxy-Authorization" => "Basic #{secret}" }
         }
-        client_config.merge!(proxy_auth)
+        @client_config.merge!(proxy_auth)
       end
 
-
-      @client = Savon.client client_config
-
     end
 
     def add_secure_hash(params)
@@ -124,11 +172,43 @@ module Nps
         params = add_secure_hash(params)
       end 
       params = {"Requerimiento" => params}
-      begin
-        @client.call(service, message: params).body
-      rescue TimeoutError
-        raise ApiException
-      end
+
+        if @custom_env_urls
+          internal_connection_timeout = @read_timeout
+          @custom_env_urls.each do |url|
+            begin
+              start_time = Time.now
+              @client_config.merge!({endpoint: url,
+                                     open_timeout: Nps::Utils::CUSTOM_URL_CONNECTION_TIMEOUT,
+                                     read_timeout: internal_connection_timeout})
+              @client = Savon.client @client_config
+              @client.call(service, message: params).body
+              break
+            rescue SocketError, HTTPClient::ConnectTimeoutError
+	      if @custom_env_urls.last == url
+      	        raise ApiException
+	      end
+	      @logger.warn("Could not connect to #{url}")
+              finish_time = Time.now
+              delta_time = finish_time - start_time
+              internal_connection_timeout -= delta_time.ceil
+              next
+            rescue HTTPClient::ReceiveTimeoutError
+              raise ApiException
+            rescue StandardError 
+              raise 'An unexpected error occurred'
+            end
+          end
+        else
+          begin
+            @client = Savon.client @client_config
+            @client.call(service, message: params).body
+          rescue HTTPClient::ReceiveTimeoutError
+           raise ApiException
+          rescue StandardError 
+           raise 'An unexpected error occurred'
+         end
+       end
     end
   end
 end

data/lib/nps/utils.rb

@@ -4,6 +4,8 @@ module Nps
     API_VERSION = {version: '2.2'}
     CACHE_TTL = 1
     TIMEOUT = 90
+    MAX_CUSTOM_URLS = 2
+    CUSTOM_URL_CONNECTION_TIMEOUT = 3
 
     SANITIZE = {
         'psp_Person.FirstName.max_length' => '128',

data/lib/nps/version.rb

@@ -1,5 +1,5 @@
 module Nps
   class Version
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nps_sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - merchantservices@ingenico.com