tickethub 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc674ae1eedf5bbb77d957c44a261c2fb1c223b2
-  data.tar.gz: d74451b388632f60e6f5769d15758c4970c33abc
+  metadata.gz: 0129a4017c1ad6b4640a0b55ca6d59a3bc5db87f
+  data.tar.gz: c14dc2b3470525f5781706c3cc75c6d23b101088
 SHA512:
-  metadata.gz: 8dc1c2eb814db7a56556e5894bf85f427a61d0f44aa38c2c75a5a7c68abc2de11ecbbc40c55c3b807429f6f912d849c67eff25212cbd6d1d632510976e0e26fd
-  data.tar.gz: 01646f5738f3cb4bbdb99063e8fbcb7789738c8b88a562478e1fc6fcbbfbfbf9feb2d04fba54dbbfeef7e4ef9ce86cdf380661b08e17669ae39fa51e8d0198e3
+  metadata.gz: 845941d4a3421c5285fe415fdc3277d3a66b442ff58e06167e336beffb5daadd21c6a76802306c3de7b9300be49b222b91cecd4540c87d068573f724e8044318
+  data.tar.gz: af123871cbd0e2fd92ca975ed6d01af612c374c1fae90c9549c3225af61ac68db60fc13a5ea4858d3b67a60a390864a1aa5e83c1afe7ebb44c46a879dcfabb6e

data/lib/tickethub/exceptions.rb

@@ -52,12 +52,6 @@ module Tickethub
   # 404 Not Found
   class ResourceNotFound < ClientError; end # :nodoc:
 
-  # 409 Conflict
-  class ResourceConflict < ClientError; end # :nodoc:
-
-  # 410 Gone
-  class ResourceGone < ClientError; end # :nodoc:
-
   # 422 Invalid
   class ResourceInvalid < ClientError; end # :nodoc:
 

data/lib/tickethub/request.rb

@@ -1,5 +1,12 @@
+require 'securerandom'
+
 module Tickethub
   class Request
+
+    SAFE_TO_RETRY = [408, 502, 503, 504].freeze
+    MAXIMUM_RETRIES = 6.freeze
+    DEFAULT_TIMEOUT = 5.freeze
+
     attr_reader :options, :format, :url
     attr_accessor :params, :body, :method, :headers
 
@@ -7,7 +14,8 @@ module Tickethub
     attr_accessor :proxy, :user, :password, :auth_type, :timeout, :ssl_options
 
     def initialize(url, options = {})
-      @url     = url.to_s
+      @url = url.to_s
+      @id  = SecureRandom.uuid
 
       @options = options
       @options.each do |key, val|
@@ -15,6 +23,7 @@ module Tickethub
         send(method, val) if respond_to?(method)
       end
 
+      self.timeout ||= DEFAULT_TIMEOUT
       self.method  ||= :get
       self.params  ||= {}
       self.headers ||= {}
@@ -61,6 +70,12 @@ 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 Redirection => error
       raise error unless error.response['Location']
 
@@ -107,6 +122,7 @@ module Tickethub
       auth_headers
         .merge(content_type_headers)
         .merge(headers)
+        .merge('X-Request-ID' => @id)
     end
 
     def query_path

data/lib/tickethub/supplier/booking/ticket.rb

@@ -5,8 +5,13 @@ module Tickethub
     polymorphic 'ticket'
 
     require_relative '../ticket'
+    require_relative '../tier'
+    require_relative '../scan'
 
     collection :tickets, Supplier::Ticket
+    collection :tiers, Supplier::Tier
+    collection :scans, Supplier::Scan
+
     attribute :valid_from, type: :datetime
   end
 end

data/lib/tickethub/supplier/scan.rb

@@ -4,10 +4,10 @@ module Tickethub
   class Supplier::Scan < Resource
     path '/supplier/scans'
 
-    require_relative 'scan'
+    require_relative 'ticket'
     require_relative 'user'
 
-    association :scan, Supplier::Scan
+    collection :tickets, Supplier::Ticket
     association :user, Supplier::User
 
     attribute :at, type: :datetime

data/lib/tickethub/version.rb

@@ -1,3 +1,3 @@
 module Tickethub
-  VERSION = '0.3.4'
+  VERSION = '0.3.6'
 end

metadata

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