dashamail 0.0.2 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f48ec737a49d93bb7d4dd55bfce8cf3b51ea2815fad8580da6f1915c629c043a
-  data.tar.gz: 1b4b2585e485821f4687449a4d22ef9653abb53647f88416ea7eac5b95c9edd4
+  metadata.gz: 0612ef4950e3b43dbabdc4109f6984d6e44f17be85015e821f886fdd58fae5d4
+  data.tar.gz: 551e73f0e6546f082ec9f35f21564ac1110018f0e1b60319f058ca8a4f402dba
 SHA512:
-  metadata.gz: 387c198f5698dd19f88f6c1764fc54953bb96cd285bfc73a9cf3ef423effb32aeb76c60ca8f37956450badc4a1f0c4ca3d9053f731d3094d044ebd9fdff749dc
-  data.tar.gz: 54eabe15dc9ebae600d605f650ee9c1f2e4b8fa2e2aeb8e3b013a1b6bc369d50963d9bc6671d925168120810e68f03adcaf6fa5ce2a57bd99596c34cbfa9f558
+  metadata.gz: 36a36ed54d11007ceba9ecfc075ba7e43fdf2c50819076534bf93196f337a6d82843b1d6c6b17d1bc06ff54c4b09b42eec94f734ffe554aa64aa297e61abbe7d
+  data.tar.gz: a47e1c4e79f65c2c2d9c10a01b970a7dc90c92853a6c24bc1a482e94ecc2134fee211c01efdf99fe200e98cb1cb1536ca0f9acb6b30b20a0815cc425d5f2bca0

data/lib/dashamail/api_request.rb

@@ -94,6 +94,10 @@ module Dashamail
       @request_builder.proxy
     end
 
+    def ssl_options
+      @request_builder.ssl_options
+    end
+
     def adapter
       @request_builder.faraday_adapter
     end
@@ -147,7 +151,7 @@ module Dashamail
     end
 
     def rest_client
-      client = Faraday.new(self.api_url, proxy: self.proxy, ssl: { version: "TLSv1_2" }) do |faraday|
+      client = Faraday.new(self.api_url, proxy: self.proxy, ssl: self.ssl_options) do |faraday|
         faraday.response :raise_error
         faraday.adapter adapter
         if @request_builder.debug
@@ -166,7 +170,10 @@ module Dashamail
           body = MultiJson.load(response.body, symbolize_keys: symbolize_keys)
           err_code = body.dig(:response, :msg, :err_code).to_i
           if err_code > 0 && err_code != 4
-            raise Dashamail::Error, "Ошибка #{body.dig(:response, :msg, :err_code)}: #{body.dig(:response, :msg, :text)}"
+            err_text = body.dig(:response, :msg, :text)
+            error_params = { title: err_text, status_code: err_code }
+            error = Error.new("Ошибка #{err_code}: #{err_text}", error_params)
+            raise error
           end
           parsed_response = Response.new(headers: headers, body: body)
         rescue MultiJson::ParseError

data/lib/dashamail/request.rb

@@ -1,11 +1,12 @@
 module Dashamail
   class Request
-    attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
+    attr_accessor :api_key, :api_endpoint, :timeout, :open_timeout, :proxy, :ssl_options, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
 
     DEFAULT_TIMEOUT = 60
     DEFAULT_OPEN_TIMEOUT = 60
 
-    def initialize(api_key: nil, api_endpoint: nil, timeout: nil, open_timeout: nil, proxy: nil, faraday_adapter: nil, symbolize_keys: false, debug: false, logger: nil, test: false)
+    def initialize(api_key: nil, api_endpoint: nil, timeout: nil, open_timeout: nil, proxy: nil, ssl_options: nil,
+                   faraday_adapter: nil, symbolize_keys: false, debug: false, logger: nil, test: false)
       @path_parts = []
       @api_key = api_key || self.class.api_key
       @api_key = @api_key.strip if @api_key
@@ -13,6 +14,7 @@ module Dashamail
       @timeout = timeout || self.class.timeout || DEFAULT_TIMEOUT
       @open_timeout = open_timeout || self.class.open_timeout || DEFAULT_OPEN_TIMEOUT
       @proxy = proxy || self.class.proxy || ENV['DASHAMAIL_PROXY']
+      @ssl_options = ssl_options || self.class.ssl_options || { version: "TLSv1_2" }
       @faraday_adapter = faraday_adapter || self.class.faraday_adapter || Faraday.default_adapter
       @symbolize_keys = symbolize_keys || self.class.symbolize_keys || false
       @debug = debug || self.class.debug || false
@@ -80,10 +82,14 @@ module Dashamail
     end
 
     class << self
-      attr_accessor :api_key, :timeout, :open_timeout, :api_endpoint, :proxy, :faraday_adapter, :symbolize_keys, :debug, :logger, :test
+      attr_accessor :api_key, :timeout, :open_timeout, :api_endpoint, :proxy, :ssl_options, :faraday_adapter,
+                    :symbolize_keys, :debug, :logger, :test
 
       def method_missing(sym, *args, &block)
-        new(api_key: self.api_key, api_endpoint: self.api_endpoint, timeout: self.timeout, open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys, debug: self.debug, proxy: self.proxy, logger: self.logger, test: self.test).send(sym, *args, &block)
+        new(api_key: self.api_key, api_endpoint: self.api_endpoint, timeout: self.timeout,
+            open_timeout: self.open_timeout, faraday_adapter: self.faraday_adapter, symbolize_keys: self.symbolize_keys,
+            debug: self.debug, proxy: self.proxy, ssl_options: self.ssl_options, logger: self.logger,
+            test: self.test).send(sym, *args, &block)
       end
 
       def respond_to_missing?(method_name, include_private = false)

data/lib/dashamail/version.rb

@@ -1,3 +1,3 @@
 module Dashamail
-  VERSION = "0.0.2"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dashamail
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - Pavel Osetrov
@@ -80,7 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.8
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="