almodovar 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a03ef84c9f0f43fc48e8592f8a0279d2569cf252
-  data.tar.gz: 3f5312eedc88662b3a5ea0175b23bd2038131521
+  metadata.gz: a6a4155b3c2891ccd7f193593f9c5a612e1bb16a
+  data.tar.gz: 353891dd01565285a46782fd3a31c5d504efb906
 SHA512:
-  metadata.gz: cad22336edc9785ee8eab726c90941a09be9e16b553926591ad89cf79b9d97fc146997d01ace6143c466718cb9467f318721247add17a39b9263cf0b6207745c
-  data.tar.gz: 7b67c6c048372157493b495a259f078ff3421d075ef9f57be6a6e251d93d725e46c0b33b7fb05b83162fce2e18a3e040761d06fe50a788c9832f35087a43beb7
+  metadata.gz: c74c6def4417b942ff3c345c56523984f80d9331ae4551c68dc4c86a3f0d9cbb390cfe3958f57eb7ac909f6e119ee205f7190bbd261a5399f23bec80381246bb
+  data.tar.gz: b9ff041e5187657d7c90800c36f8a298e32f98f426dc2045fbf25e64f0928c910f5226b452f58ba3c1dd5bfd27bfdee4e1c17376d47fcae868c362a48837420e

data/lib/almodovar.rb

@@ -16,14 +16,27 @@ require 'almodovar/errors'
 require 'almodovar/to_xml'
 
 module Almodovar
-
   class << self
+    DEFAULT_SEND_TIMEOUT = 120
+    DEFAULT_CONNECT_TIMEOUT = 30
+    DEFAULT_RECEIVE_TIMEOUT = 120
+
     def default_options
-      @default_options ||= {
-        :timeout => 120,
-        :connect_timeout => 30,
-        :user_agent => "Almodovar/#{Almodovar::VERSION}"
+      default = {
+        send_timeout: DEFAULT_SEND_TIMEOUT,
+        connect_timeout: DEFAULT_CONNECT_TIMEOUT,
+        receive_timeout: DEFAULT_RECEIVE_TIMEOUT,
+        user_agent: "Almodovar/#{Almodovar::VERSION}"
+      }
+      default.merge(@default_options || {})
+    end
+
+    def default_options=(options = {})
+      @default_options = {
+        send_timeout: options[:send_timeout],
+        connect_timeout: options[:connect_timeout],
+        receive_timeout: options[:receive_timeout]
       }
     end
   end
-end
+end

data/lib/almodovar/errors.rb

@@ -8,4 +8,16 @@ module Almodovar
       super("Status code #{response.status} on resource #{url}")
     end
   end
+
+  class TimeoutError < StandardError
+  end
+
+  class SendTimeoutError < TimeoutError
+  end
+
+  class ReceiveTimeoutError < TimeoutError
+  end
+
+  class ConnectTimeoutError < TimeoutError
+  end
 end

data/lib/almodovar/http_accessor.rb

@@ -7,18 +7,19 @@ module Almodovar
         Nokogiri::XML.parse(response.body).root
       end
     end
-    
+
     def url_with_params
       @options[:expand] = @options[:expand].join(",") if @options[:expand].is_a?(Array)
       params = @options.map { |k, v| "#{k}=#{v}" }.join("&")
       params = "?#{params}" unless params.empty?
       @url + params
     end
-    
+
     def http
       @http ||= Almodovar::HttpClient.new.tap do |session|
-        session.timeout  = Almodovar::default_options[:timeout]
+        session.send_timeout = Almodovar::default_options[:send_timeout]
         session.connect_timeout = Almodovar::default_options[:connect_timeout]
+        session.receive_timeout = Almodovar::default_options[:receive_timeout]
         session.agent_name = Almodovar::default_options[:user_agent]
 
         if @auth
@@ -28,10 +29,9 @@ module Almodovar
         end
       end
     end
-    
+
     def check_errors(response, url)
       raise(Almodovar::HttpError.new(response, url)) if response.status >= 400
     end
   end
-  
-end
+end

data/lib/almodovar/http_client.rb

@@ -2,7 +2,6 @@ require 'httpclient'
 
 module Almodovar
   class HttpClient
-
     attr_accessor :client,
                   :headers,
                   :username,
@@ -11,13 +10,10 @@ module Almodovar
 
     delegate :agent_name=,
              :connect_timeout=,
+             :send_timeout=,
+             :receive_timeout=,
              :to => :client
 
-
-    def timeout=(value)
-      client.send_timeout = value
-    end
-
     def initialize
       @client = HTTPClient.new
     end
@@ -71,7 +67,7 @@ module Almodovar
     end
 
     def request(method, uri, options = {})
-      uri = URI.parse(uri)
+      uri = URI.parse(URI.escape(URI.unescape(uri)))
       if (requires_auth?)
         domain = domain_for(uri)
         uri.user = username
@@ -79,6 +75,12 @@ module Almodovar
         set_client_auth(domain)
       end
       client.request(method, uri, :body => options[:body], :header => options[:headers].stringify_keys || {}, :follow_redirect => true)
+    rescue HTTPClient::SendTimeoutError => e
+      raise SendTimeoutError.new(e)
+    rescue HTTPClient::ReceiveTimeoutError => e
+      raise ReceiveTimeoutError.new(e)
+    rescue HTTPClient::ConnectTimeoutError => e
+      raise ConnectTimeoutError.new(e)
     end
   end
 
@@ -100,5 +102,4 @@ module Almodovar
   class HttpResponse
     attr_accessor :status, :body
   end
-
-end
+end

data/lib/almodovar/version.rb

@@ -1,3 +1,3 @@
 module Almodovar
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almodovar
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - BeBanjo S.L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -134,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: BeBanjo API client
 test_files: []
-has_rdoc: