baidu-sms 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 125f13235de60599a74661d20d494aafb319f518
-  data.tar.gz: 55b21fb9657383e6077a5d8ee57dbf930a162f99
+  metadata.gz: da1a6b1d4c9c33e89428e12c5416449607ddf211
+  data.tar.gz: 7892dfcf0a9a73d01998aec21b49002a6568b9e2
 SHA512:
-  metadata.gz: 36d2bc6f87716aa2f509eff8d6ccaf414c83c0ae89a92a420775712951949aa74ed1680c4681dcad709768efc1db061abcd1c77deb57eb4d186e65f9caae6201
-  data.tar.gz: bc9da75759366e14427982c8d7740e115b1bc7d45c0f5a802c67175255f17c27229aa568fcd18f953b379fc082c43d0d673cdb1b4c23f9e9110eaac1aa3342f7
+  metadata.gz: 1b4c80345dfe7226bd5adc77cda1529d6310041bf4b9f4da3b4c950bbf7095d83413ef4d1fac2120bdee65dbaeb0ed4297097f0280ef06999e9d0fbebff376d7
+  data.tar.gz: 3d3f7ba23db2e08ba0a4785fb2e0299b8089afa7037e052174ee66c368768e88e2a32c3d7cbc5e366a202b0ac03271f98dd2d4aa3f2a0cd535292c5d99ec679c

data/lib/baidu-sms/core.rb

@@ -5,6 +5,7 @@ module BaiduSMS
     SMS_RESOURCE = "/sem/sms/v3/"
     COMMON_RESOURCE = "/sem/common/v2"
     AUTH_NS = "ns2"
+    DEFAULT_CLIENT_OPTIONS = { open_timeout: 300, read_timeout: 300, ssl_verify_mode: :none }
 
     def authorise_headers(username, password, token)
       { auth_namespace('AuthHeader') => { auth_namespace('username') => username,
@@ -12,15 +13,25 @@ module BaiduSMS
                                           auth_namespace('token') => token } }
     end
 
-    def initialise_client(service, credentials)
+    def initialise_client(service, credentials, options = {})
+      client_options = set_client_options(options)
       wsdl_namespace_location = BAIDU_HOST[:secure] + SMS_RESOURCE + service + "?wsdl"
       authorise_namespace_location = BAIDU_HOST[:basic] + COMMON_RESOURCE
       Savon.client(wsdl: wsdl_namespace_location,
                   namespaces: { "xmlns:#{AUTH_NS}" => authorise_namespace_location },
-                  soap_header: authorise_headers(credentials[:username], credentials[:password], credentials[:token])
+                  soap_header: authorise_headers(credentials[:username], credentials[:password], credentials[:token]),
+                  open_timeout: client_options[:open_timeout],
+                  read_timeout: client_options[:read_timeout],
+                  ssl_verify_mode: client_options[:ssl_verify_mode]
                   )
     end
 
+    private
+
+    def set_client_options(options)
+      DEFAULT_CLIENT_OPTIONS.inject({}) { |i, (k, v)| i[k] = options[k] || v; i }
+    end
+
     def auth_namespace(str)
       "#{AUTH_NS}:#{str}"
     end

data/lib/baidu-sms/report_service.rb

@@ -1,5 +1,3 @@
-require 'curl'
-
 module BaiduSMS
   class ReportService
     include BaiduSMS::Core
@@ -42,7 +40,7 @@ module BaiduSMS
         response = @client.call(*args)
         header = response.header[:res_header]
         raise BaiduSMSInvalidRequestError.new("#{header[:failures][:code]} - #{header[:failures][:message]}") unless header[:status].to_i == 0
-      rescue Curl::Err::TimeoutError => e
+      rescue HTTPI::TimeoutError => e
         raise e unless retry_timeout && current_retry < max_retries
         current_retry += 1
         sleep [10 * (2 ** current_retry), 600].min

data/lib/baidu-sms/version.rb

@@ -1,3 +1,3 @@
 module BaiduSMS
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baidu-sms
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Robert Borkowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -79,4 +79,3 @@ signing_key:
 specification_version: 4
 summary: Wrapper for connecting to the Baidu Search Marketing API
 test_files: []
-has_rdoc: