judopay 2.1.0 → 2.1.3

data/lib/judopay/api.rb

@@ -1,10 +1,10 @@
-require File.expand_path('../connection', __FILE__)
-require File.expand_path('../request', __FILE__)
-
-module Judopay
-  # @private
-  class API
-    include Connection
-    include Request
-  end
-end
+require File.expand_path('../connection', __FILE__)
+require File.expand_path('../request', __FILE__)
+
+module Judopay
+  # @private
+  class API
+    include Connection
+    include Request
+  end
+end

data/lib/judopay/connection.rb

@@ -1,77 +1,77 @@
-require 'faraday'
-require 'faraday_middleware'
-require 'openssl'
-require_relative '../faraday/raise_http_exception'
-require_relative '../faraday/judo_mashify'
-
-module Judopay
-  # @private
-  module Connection
-    private
-
-    def connection(raw = false)
-      connection = Faraday::Connection.new(default_connection_options) do |faraday|
-        # When adapter set to "httpclient" SSL error emerges after bunch of requests:
-        # "Faraday::SSLError: SSL_connect SYSCALL returned=5 errno=0 state=SSLv2/v3 read server hello A"
-        faraday.adapter :net_http
-        faraday.use Faraday::Request::UrlEncoded
-        faraday.use Faraday::Response::Logger, Judopay.configuration.logger
-        define_format(faraday, raw)
-        faraday.use FaradayMiddleware::RaiseHttpException
-      end
-
-      define_auth(connection)
-    end
-
-    def define_format(faraday, raw)
-      return if raw
-      faraday.use FaradayMiddleware::JudoMashify
-      faraday.use Faraday::Response::ParseJson if Judopay.configuration.format.to_s == 'json'
-    end
-
-    def define_auth(connection)
-      # Authentication with basic auth if there is no OAuth2 access token
-      if Judopay.configuration.oauth_access_token.nil?
-        Judopay.configuration.validate
-        connection.basic_auth(
-          Judopay.configuration.api_token,
-          Judopay.configuration.api_secret
-        )
-        Judopay.log(Logger::DEBUG, 'Using HTTP basic auth')
-      end
-
-      connection
-    end
-
-    def default_connection_options
-      {
-        :headers => request_headers,
-        :url => Judopay.configuration.endpoint_url,
-        :ssl => {
-          :ca_file => File.dirname(File.dirname(__FILE__)) + '/certs/rapidssl_ca.crt',
-          :cert_store => false,
-          :verify => true
-        }
-      }
-    end
-
-    def request_headers
-      format = Judopay.configuration.format
-
-      headers = {
-        'Accept' => "application/#{format}; charset=utf-8",
-        'User-Agent' => Judopay.configuration.user_agent,
-        'API-Version' => Judopay.configuration.api_version,
-        'Content-Type' => 'application/json'
-      }
-
-      # Do we have an OAuth2 access token?
-      unless Judopay.configuration.oauth_access_token.nil?
-        headers['Authorization'] = 'Bearer ' + Judopay.configuration.oauth_access_token
-        Judopay.log(Logger::DEBUG, 'Using OAuth2 access token')
-      end
-
-      headers
-    end
-  end
-end
+require 'faraday'
+require 'faraday_middleware'
+require 'openssl'
+require_relative '../faraday/raise_http_exception'
+require_relative '../faraday/judo_mashify'
+
+module Judopay
+  # @private
+  module Connection
+    private
+
+    def connection(raw = false)
+      connection = Faraday.new(default_connection_options) do |faraday|
+        faraday.use Faraday::Request::UrlEncoded
+        faraday.use Faraday::Response::Logger, Judopay.configuration.logger
+        define_format(faraday, raw)
+        faraday.use FaradayMiddleware::RaiseHttpException
+        # When adapter set to "httpclient" SSL error emerges after bunch of requests:
+        # "Faraday::SSLError: SSL_connect SYSCALL returned=5 errno=0 state=SSLv2/v3 read server hello A"
+        faraday.adapter :net_http
+      end
+
+      define_auth(connection)
+    end
+
+    def define_format(faraday, raw)
+      return if raw
+      faraday.use FaradayMiddleware::JudoMashify
+      faraday.use Faraday::Response::ParseJson if Judopay.configuration.format.to_s == 'json'
+    end
+
+    def define_auth(connection)
+      # Authentication with basic auth if there is no OAuth2 access token
+      if Judopay.configuration.oauth_access_token.nil?
+        Judopay.configuration.validate
+        connection.basic_auth(
+          Judopay.configuration.api_token,
+          Judopay.configuration.api_secret
+        )
+        Judopay.log(Logger::DEBUG, 'Using HTTP basic auth')
+      end
+
+      connection
+    end
+
+    def default_connection_options
+      {
+        :headers => request_headers,
+        :url => Judopay.configuration.endpoint_url,
+        :ssl => {
+          :ca_file => File.dirname(File.dirname(__FILE__)) + '/certs/rapidssl_ca.crt',
+          :cert_store => false,
+          :verify => true
+        }
+      }
+    end
+
+    def request_headers
+      format = Judopay.configuration.format
+
+      headers = {
+        'Accept' => "application/#{format}; charset=utf-8",
+        'User-Agent' => Judopay.configuration.user_agent,
+        'API-Version' => Judopay.configuration.api_version,
+        'Content-Type' => 'application/json'
+      }
+
+      # Do we have an OAuth2 access token?
+      unless Judopay.configuration.oauth_access_token.nil?
+        headers['Authorization'] = 'Bearer ' + Judopay.configuration.oauth_access_token
+        Judopay.log(Logger::DEBUG, 'Using OAuth2 access token')
+      end
+
+      headers
+    end
+  end
+end

data/lib/judopay/core_ext/hash.rb

@@ -1,29 +1,29 @@
-require 'addressable/uri'
-require_relative 'string'
-
-class Hash
-  # Convert hash keys to camelcase
-  #
-  #  {'this_key' => 1}.camel_case_keys! #=> { 'thisKey' => 1 }
-  def camel_case_keys!
-    output_hash = {}
-    each do |key, value|
-      camel_case_key = key.to_s.camel_case
-      if value.is_a?(Hash)
-        output_hash[camel_case_key] = value.camel_case_keys!
-      else
-        output_hash[key.to_s.camel_case] = value
-      end
-    end
-    replace(output_hash)
-  end
-
-  # Produce a URL query string from the hash
-  #
-  #  {'this_key' => 1}.to_query_string #=> this_key=1
-  def to_query_string
-    uri = Addressable::URI.new
-    uri.query_values = self
-    uri.query
-  end
-end
+require 'addressable/uri'
+require_relative 'string'
+
+class Hash
+  # Convert hash keys to camelcase
+  #
+  #  {'this_key' => 1}.camel_case_keys! #=> { 'thisKey' => 1 }
+  def camel_case_keys!
+    output_hash = {}
+    each do |key, value|
+      camel_case_key = key.to_s.camel_case
+      if value.is_a?(Hash)
+        output_hash[camel_case_key] = value.camel_case_keys!
+      else
+        output_hash[key.to_s.camel_case] = value
+      end
+    end
+    replace(output_hash)
+  end
+
+  # Produce a URL query string from the hash
+  #
+  #  {'this_key' => 1}.to_query_string #=> this_key=1
+  def to_query_string
+    uri = Addressable::URI.new
+    uri.query_values = self
+    uri.query
+  end
+end

data/lib/judopay/core_ext/string.rb

@@ -1,32 +1,32 @@
-class String
-  # Convert to camel case
-  #
-  #   "foo_bar".camel_case          #=> "fooBar"
-  def camel_case
-    return self if self !~ /_/ && self =~ /[A-Z]+.*/
-    split('_').map(&:capitalize).join.uncapitalize
-  end
-
-  # Convert first letter to lower case
-  #
-  #   "BananaMan".uncapitalize      #=> "bananaMan"
-  def uncapitalize
-    self[0, 1].downcase + self[1..-1]
-  end
-
-  # Converts a camel_cased string to a underscored string
-  # Replaces spaces with underscores, and strips whitespace
-  #
-  #   "BananaMan".underscore        #=> "banana_man"
-  def underscore
-    to_s
-      .strip
-      .tr(' ', '_')
-      .gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr('-', '_')
-      .squeeze('_')
-      .downcase
-  end
-end
+class String
+  # Convert to camel case
+  #
+  #   "foo_bar".camel_case          #=> "fooBar"
+  def camel_case
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map(&:capitalize).join.uncapitalize
+  end
+
+  # Convert first letter to lower case
+  #
+  #   "BananaMan".uncapitalize      #=> "bananaMan"
+  def uncapitalize
+    self[0, 1].downcase + self[1..-1]
+  end
+
+  # Converts a camel_cased string to a underscored string
+  # Replaces spaces with underscores, and strips whitespace
+  #
+  #   "BananaMan".underscore        #=> "banana_man"
+  def underscore
+    to_s
+      .strip
+      .tr(' ', '_')
+      .gsub(/::/, '/')
+      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+      .tr('-', '_')
+      .squeeze('_')
+      .downcase
+  end
+end

data/lib/judopay/error.rb

@@ -1,115 +1,117 @@
-require 'json'
-
-module Judopay
-  # Single field error model
-  class FieldError
-    attr_accessor :message, :code, :field_name, :detail
-
-    def initialize(message, code, field_name, detail)
-      @detail = detail
-      @field_name = field_name
-      @code = code
-      @message = message
-    end
-
-    def to_s
-      "Field \"#{@field_name}\" (code #{@code}): #{@message}"
-    end
-  end
-
-  # Custom error class for rescuing from all API errors
-  class APIError < StandardError
-    CATEGORY_UNKNOWN = 0
-    CATEGORY_REQUEST = 1
-    CATEGORY_MODEL = 2
-    CATEGORY_CONFIG = 3
-    CATEGORY_PROCESSING = 4
-    CATEGORY_EXCEPTION = 5
-
-    attr_accessor :message, :error_code, :status_code, :category, :field_errors
-
-    class << self
-      def factory(response)
-        parsed_body = JSON.parse(response.body)
-
-        new(
-          parsed_body['message'],
-          parsed_body['code'],
-          response.status.to_i,
-          parsed_body['category'],
-          extract_field_errors(parsed_body['details'])
-        )
-      end
-
-      protected
-
-      def extract_field_errors(field_errors)
-        result = []
-
-        if field_errors.is_a?(Hash) && field_errors.key?('receiptId')
-          result << 'Duplicate transaction. Receipt id: ' + field_errors['receiptId'].to_s
-        else
-          field_errors.to_a.each do |field_error|
-            result << FieldError.new(field_error['message'], field_error['code'], field_error['fieldName'], field_error['detail'])
-          end
-        end
-
-        result
-      end
-    end
-
-    def initialize(message, error_code = 0, status_code = 0, category = CATEGORY_UNKNOWN, field_errors = [])
-      @message = message
-      @error_code = error_code
-      @status_code = status_code
-      @category = category
-      @field_errors = field_errors
-    end
-
-    def to_s
-      "JudoPay ApiException (status code #{@status_code}, error code #{@error_code}, category #{@category}) #{message}"
-    end
-
-    def message
-      (@message || self.class.name) + field_errors_message
-    end
-
-    protected
-
-    def field_errors_message
-      return '' if @field_errors.empty?
-      "\nFields errors:\n#{@field_errors.join("\n")}"
-    end
-  end
-
-  # A validation error that hasn't reached the API
-  class ValidationError < StandardError
-    attr_accessor :errors, :message
-
-    def initialize(message, errors = nil)
-      @errors = errors
-      @message = message
-      @message += model_errors_summary unless @errors.nil?
-    end
-
-    def to_s
-      @message
-    end
-
-    def model_errors
-      return if @errors.nil?
-      @errors.messages
-    end
-
-    protected
-
-    def model_errors_summary
-      summary = ["\nField errors:"]
-      model_errors.each do |key, value|
-        summary.push("#{key}: #{value.join('; ')}")
-      end
-
-      summary.join("\n")
-    end
-  end
-end
+require 'json'
+
+module Judopay
+  # Single field error model
+  class FieldError
+    attr_accessor :message, :code, :field_name, :detail
+
+    def initialize(message, code, field_name, detail)
+      @detail = detail
+      @field_name = field_name
+      @code = code
+      @message = message
+    end
+
+    def to_s
+      "Field \"#{@field_name}\" (code #{@code}): #{@message}"
+    end
+  end
+
+  # Custom error class for rescuing from all API errors
+  class APIError < StandardError
+    CATEGORY_UNKNOWN = 0
+    CATEGORY_REQUEST = 1
+    CATEGORY_MODEL = 2
+    CATEGORY_CONFIG = 3
+    CATEGORY_PROCESSING = 4
+    CATEGORY_EXCEPTION = 5
+
+    attr_accessor :error_code, :status_code, :category, :field_errors
+
+    attr_writer :message
+
+    class << self
+      def factory(response)
+        parsed_body = JSON.parse(response.body)
+
+        new(
+          parsed_body['message'],
+          parsed_body['code'],
+          response.status.to_i,
+          parsed_body['category'],
+          extract_field_errors(parsed_body['details'])
+        )
+      end
+
+      protected
+
+      def extract_field_errors(field_errors)
+        result = []
+
+        if field_errors.is_a?(Hash) && field_errors.key?('receiptId')
+          result << 'Duplicate transaction. Receipt id: ' + field_errors['receiptId'].to_s
+        else
+          field_errors.to_a.each do |field_error|
+            result << FieldError.new(field_error['message'], field_error['code'], field_error['fieldName'], field_error['detail'])
+          end
+        end
+
+        result
+      end
+    end
+
+    def initialize(message, error_code = 0, status_code = 0, category = CATEGORY_UNKNOWN, field_errors = [])
+      @message = message
+      @error_code = error_code
+      @status_code = status_code
+      @category = category
+      @field_errors = field_errors
+    end
+
+    def to_s
+      "JudoPay ApiException (status code #{@status_code}, error code #{@error_code}, category #{@category}) #{message}"
+    end
+
+    def message
+      (@message || self.class.name) + field_errors_message
+    end
+
+    protected
+
+    def field_errors_message
+      return '' if @field_errors.empty?
+      "\nFields errors:\n#{@field_errors.join("\n")}"
+    end
+  end
+
+  # A validation error that hasn't reached the API
+  class ValidationError < StandardError
+    attr_accessor :errors, :message
+
+    def initialize(message, errors = nil)
+      @errors = errors
+      @message = message
+      @message += model_errors_summary unless @errors.nil?
+    end
+
+    def to_s
+      @message
+    end
+
+    def model_errors
+      return if @errors.nil?
+      @errors.messages
+    end
+
+    protected
+
+    def model_errors_summary
+      summary = ["\nField errors:"]
+      model_errors.each do |key, value|
+        summary.push("#{key}: #{value.join('; ')}")
+      end
+
+      summary.join("\n")
+    end
+  end
+end