tickethub 0.3.49 → 0.3.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e0fc258895fc9573c90778fdd8121a8394e2a4
-  data.tar.gz: 6e14ac646684446324a89c0c7d9126dbb1a9ed45
+  metadata.gz: 57ddcb360af1a24030fa0782912f8d18fba392d8
+  data.tar.gz: 804a1795f1f619a920cdb698aaf96c21bd939e05
 SHA512:
-  metadata.gz: 084882f1d239b378f42bf7b9934cd0571adf2a9c91055ac207d729e95a6469394c073fb614f5c695d791062c700b8e989646f9e552240a766cb004ee57944d50
-  data.tar.gz: 818886b7cb005c1aa0c68d466b0372189f166dfd3dd6dd8b2d89007de35134b74bee4dfe0607b11c0abfeb76e90d1f926b82652c24a3980db7dd0defc9903321
+  metadata.gz: 4c8330974730cc0820c9215f0a1528d8bc7ca6aed534d47f48077de8947e306a93e194ccc0797155386909dc9fce0a677e808b646ad48138e4c5355c2024a65d
+  data.tar.gz: e534933f6942e2c48b5619882d192bc62d89f641f17486de0f2b1c93cd5426d458f62df964f489308ff29c7d3bdf0959c5330835624b1b7b925543c286722b2f

data/lib/tickethub/connection.rb

@@ -113,13 +113,7 @@ module Tickethub
 
     def configure_http(http)
       http = apply_ssl_options(http)
-
-      # Net::HTTP timeouts default to 60 seconds.
-      if timeout
-        http.open_timeout = timeout
-        http.read_timeout = timeout
-      end
-
+      http.read_timeout = timeout if timeout
       http
     end
 

data/lib/tickethub/request.rb

@@ -3,18 +3,17 @@ require 'securerandom'
 module Tickethub
   class Request
 
-    SAFE_TO_RETRY = [408, 502, 503, 504].freeze
-    MAXIMUM_RETRIES = 3.freeze
-
     attr_reader :options, :format, :url
     attr_accessor :params, :body, :method, :headers
 
     # Connection options
-    attr_accessor :proxy, :user, :password, :auth_type, :timeout, :ssl_options
+    attr_accessor :proxy, :user, :password, :auth_type, :timeout, :retries, :ssl_options
 
     def initialize(url, options = {})
       @url = url.to_s
       @id  = SecureRandom.uuid
+      @retries = 3
+      @timeout = 10
 
       @options = options
       @options.each do |key, val|
@@ -59,7 +58,7 @@ module Tickethub
       uri.path
     end
 
-    def execute(retries = 0)
+    def execute
       if encoded?
         result = connection.send(method, path, encoded, build_headers)
       else
@@ -68,15 +67,11 @@ module Tickethub
 
       Response.new(result)
 
-    rescue TimeoutError => err
-      raise if retries == MAXIMUM_RETRIES - 1
-      execute retries + 1
-    rescue ConnectionError => err
-      raise if ! SAFE_TO_RETRY.member?(err.response.code) || retries == MAXIMUM_RETRIES - 1
-      execute retries + 1
+    rescue TimeoutError, ServerError => err
+      raise err if (@retries -= 1) == 0
+      execute
     rescue Redirection => error
       raise error unless error.response['Location']
-
       location = URI.parse(error.response['Location'])
 
       # Path is relative

data/lib/tickethub/reseller/channel.rb

@@ -7,9 +7,6 @@ module Tickethub
     require_relative 'product'
     require_relative '../token'
 
-    association :private_token, Tickethub::Token
-    association :public_token, Tickethub::Token
-
     association :product, Reseller::Product
 
     attribute :updated_at, type: :datetime

data/lib/tickethub/supplier/channel.rb

@@ -8,9 +8,6 @@ module Tickethub
     require_relative 'product'
     require_relative '../token'
 
-    association :private_token, Tickethub::Token
-    association :public_token, Tickethub::Token
-
     association :product, Supplier::Product
     association :partner, Supplier::Partner
 

data/lib/tickethub/version.rb

@@ -1,3 +1,3 @@
 module Tickethub
-  VERSION = '0.3.49'
+  VERSION = '0.3.50'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tickethub
 version: !ruby/object:Gem::Version
-  version: 0.3.49
+  version: 0.3.50
 platform: ruby
 authors:
 - Oliver Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler