ticketinghub 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97e21b1e188ecea18f1d9a4c5fe01ba83d02485
-  data.tar.gz: 97e94ae9c677bf65785b40d8c7ad04620f393925
+  metadata.gz: 7f21a9e16f1bd59df8cbee7c6e932fc51158548b
+  data.tar.gz: 44d6029b5eb3ca276003259a78cb90ff9f1cde07
 SHA512:
-  metadata.gz: 257a2d73b1c03a3cc78fb8a3d6fac0b3a9afb94401e294550c0c488ea5722b46b3d4ecd4a8e60dfbac9b8cf73f6b4c4f053339b00a0394d905be90084df1fc35
-  data.tar.gz: 860b75d4b1a38f8cf167f22da7106e8bf5013c973058d04b8270cad148f9bb770298e30b20e3bac7ffa9ef3d5a2560b9975b55a5c7521d4f2bdf17dd6cc00db7
+  metadata.gz: 27abe8ac329b8365d4312088e1751bffbfb1d844310e84dadcee601d38ac9331187187d89ffe1cb529a1b1f1574595b34dfcb6f47fd9e0ca64f5b582c237bbdb
+  data.tar.gz: c14c25c3022ca477efd30430dd39aac59d380659a051bd7cecb31707fd1742910c09af00934284214b86f0d2f42cf75fd4b08b82e38952826180684587fe52be

data/lib/ticketing_hub/client.rb

@@ -8,72 +8,63 @@ module TicketingHub
 
     attr_accessor *Configuration::VALID_OPTIONS_KEYS
 
-    def initialize options={}
+    def self.from_oauth_password(email, password)
+      token = TicketingHub.post 'oauth/token', { grant_type: 'password', username: email, password: password,
+        client_id: TicketingHub.client_id, client_secret: TicketingHub.client_secret }
+      new(access_token: token.access_token, refresh_token: token.refresh_token, expires_at: Time.now + token.expires_in)
+    end
+
+    def initialize(options={})
       options = TicketingHub.options.merge options
       Configuration::VALID_OPTIONS_KEYS.each do |key|
         send "#{key}=", options[key]
       end
     end
 
-    def get_token code
-      post('token', grant_type: 'code', client_id: client_id,
-        client_secret: client_secret, code: code, endpoint: oauth_endpoint)['access_token']
-    end
-
-    def venue id=nil
-      id ? get("venues/#{id}") : get('venue')
+    def venues
+      get 'venues'
     end
 
     def user
-      get 'user'
+      get('user').first
     end
 
-    def orders venue_id=nil
-      venue_id ||= venue(venue_id).id
+    def orders(venue_id=nil)
       get "venues/#{venue_id}/orders"
     end
 
-    def order order_id
-      get "orders/#{_normalize_object_id order_id}"
+    def find_order(venue_id=nil, id)
+      get "venues/#{venue_id}/orders/#{id}"
     end
 
-    def tiers date, time, venue_id=nil
-      venue_id ||= venue(venue_id).id
-      get "venues/#{venue_id}/tiers", { date: date, time: time }
+    def tiers(venue_id, date, time, options = {})
+      get "venues/#{venue_id}/tiers", options.merge({ date: date, time: time })
     end
 
-    def seasons venue_id=nil
-      venue_id ||= venue(venue_id).id
+    def seasons(venue_id)
       get "venues/#{venue_id}/seasons"
     end
 
-    def customer_fields order_id, ticket_id=nil
-      ticket_id.nil?? get("orders/#{_normalize_object_id order_id}/fields") :
-        get("tickets/#{_normalize_object_id ticket_id}/fields")
+    def customer_fields(venue_id, order_id, ticket_id=nil)
+      ticket_id.nil?? get("venues/#{venue_id}/orders/#{order_id}/fields") :
+        get("venues/#{venue_id}/tickets/#{ticket_id}/fields")
     end
 
-    def create_order order_attributes, venue_id=nil
-      venue_id ||= venue(venue_id).id
-      post "venues/#{venue_id}/orders", order_attributes
+    def create_order(venue_id, date, time, order_attributes = {})
+      post "venues/#{venue_id}/orders", order_attributes.merge(date: date, time: time)
     end
 
-    def cancel_order order_id
-      delete "orders/#{_normalize_object_id order_id}"
+    def cancel_order(venue_id, order_id)
+      delete "venues/#{venue_id}/orders/#{order_id}"
     end
 
-    def update_order order_id, order_attributes
-      patch "orders/#{_normalize_object_id order_id}", order_attributes
+    def update_order(venue_id, order_id, order_attributes)
+      patch "venues/#{venue_id}/orders/#{order_id}", order_attributes
     end
 
-    def confirm_order order_id, order_attributes=nil
-      update_order order_id, order_attributes if order_attributes
-      post "orders/#{_normalize_object_id order_id}/confirm"
+    def confirm_order(venue_id, order_id, order_attributes = {})
+      update_order venue_id, order_id, order_attributes if order_attributes.any?
+      post "venues/#{venue_id}/orders/#{order_id}/confirm"
     end
-
-    private
-
-      def _normalize_object_id object_id
-        (object_id.is_a?(Hash) ? object_id['id'] : object_id).to_i
-      end
   end
 end

data/lib/ticketing_hub/collection.rb

@@ -0,0 +1,37 @@
+module TicketingHub
+  class Collection < Enumerator::Generator
+
+    attr_accessor :client, :path, :options
+
+    def initialize(client, path, options = {})
+      self.client = client
+      self.path = path
+      self.options = options
+
+      super() do |yielder|
+        response = client.request(:get, path, options)
+        if response.body.is_a?(Array)
+          response.body.each { |value| yielder << value }
+        else yielder << response.body end
+        while next_url = links(response)['next']
+          client.request(:get, next_url, options).body.each do |value|
+            yielder << value
+          end
+        end
+      end
+    end
+
+    def find(id, options = {})
+      client.request(:get, "#{path}/#{id}", options).body
+    end
+
+    def links(response)
+      links = ( response.headers["Link"] || "" ).split(', ').map do |link|
+        url, type = link.match(/<(.*?)>; rel="(\w+)"/).captures
+        [ type, url ]
+      end
+
+      Hash[*links.flatten]
+    end
+  end
+end

data/lib/ticketing_hub/configuration.rb

@@ -7,23 +7,19 @@ module TicketingHub
     VALID_OPTIONS_KEYS = [
       :adapter,
       :faraday_config_block,
-      :api_version,
       :api_endpoint,
-      :oauth_endpoint,
       :client_id,
       :client_secret,
-      :oauth_token,
+      :access_token,
+      :refresh_token,
+      :expires_at,
       :proxy,
       :user_agent,
-      :request_host,
-      :auto_traversal].freeze
+      :request_host].freeze
 
     DEFAULT_ADAPTER        = Faraday.default_adapter
-    DEFAULT_API_VERSION    = 1
     DEFAULT_API_ENDPOINT   = ENV['TH_API_ENDPOINT'] || 'https://api.ticketinghub.com/'
-    DEFAULT_OAUTH_ENDPOINT = ENV['TH_OAUTH_ENDPOINT'] || 'https://www.ticketinghub.com/oauth/'
     DEFAULT_USER_AGENT     = "TicketingHub Ruby Gem #{TicketingHub::VERSION}".freeze
-    DEFAULT_AUTO_TRAVERSAL = false
 
     attr_accessor *VALID_OPTIONS_KEYS
 
@@ -51,16 +47,14 @@ module TicketingHub
 
     def reset
       self.adapter        = DEFAULT_ADAPTER
-      self.api_version    = DEFAULT_API_VERSION
       self.api_endpoint   = DEFAULT_API_ENDPOINT
-      self.oauth_endpoint = DEFAULT_OAUTH_ENDPOINT
       self.client_id      = nil
       self.client_secret  = nil
-      self.oauth_token    = nil
+      self.access_token   = nil
+      self.refresh_token  = nil
       self.proxy          = nil
       self.request_host   = nil
       self.user_agent     = DEFAULT_USER_AGENT
-      self.auto_traversal = DEFAULT_AUTO_TRAVERSAL
     end
   end
 end

data/lib/ticketing_hub/connection.rb

@@ -27,7 +27,7 @@ module TicketingHub
     private
 
       def connection options={}
-        token = options.delete(:access_token) || options.delete(:oauth_token) || oauth_token
+        token = options.delete(:access_token) || access_token
 
         options = {
           authenticate: !token.nil?,

data/lib/ticketing_hub/error.rb

@@ -9,6 +9,21 @@ module TicketingHub
     def response_body
       @response[:body]
     end
+
+    private
+      def build_error_message
+        return nil  if @response.nil?
+
+        message = if response_body
+          ": #{response_body[:error] || response_body[:error_message] || ''}"
+        else
+          ''
+        end
+        errors = unless message.empty?
+          response_body[:errors] ?  ": #{response_body[:errors].map{|e|e[:error_message]}.join(', ')}" : ''
+        end
+        "#{@response[:method].to_s.upcase} #{@response[:url].to_s}: #{@response[:status]}#{message}#{errors}"
+      end
   end
 
   # Raised when TicketingHub returns a 400 HTTP status code

data/lib/ticketing_hub/request.rb

@@ -1,78 +1,53 @@
 require 'multi_json'
+require_relative 'collection'
 
 module TicketingHub
   module Request
 
-    def delete path, options={}
+    def delete(path, options={})
       request(:delete, path, options).body
     end
 
-    def get path, options={}
-      response = request(:get, path, options)
-      body = response.body
-
-      if auto_traversal && body.is_a?(Array)
-        while next_url = links(response)['next']
-          response = request(:get, next_url, options)
-          body += response.body
-        end
-      end
-
-      body
+    def get(path, options={})
+      TicketingHub::Collection.new self, path, options
     end
 
-    def patch path, options={}
+    def patch(path, options={})
       request(:patch, path, options).body
     end
 
-    def post path, options={}
+    def post(path, options={})
       request(:post, path, options).body
     end
 
-    def put path, options={}
+    def put(path, options={})
       request(:put, path, options).body
     end
 
-    private
-
-      # Executes the request, checking if it was successful
-      #
-      # @return [Boolean] True on success, false otherwise
-      def boolean_from_response(method, path, options={})
-       request(method, path, options).status == 204
-      rescue TicketingHub::NotFound
-        false
-      end
-
-      def request(method, path, options={})
-        force_urlencoded = options.delete(:force_urlencoded) || false
-        url = options.delete(:endpoint) || api_endpoint
-        conn_options = { force_urlencoded: force_urlencoded, url: url }
+    def request(method, path, options={})
+      force_urlencoded = options.delete(:force_urlencoded) || false
+      url = options.delete(:endpoint) || api_endpoint
+      conn_options = { force_urlencoded: force_urlencoded, url: url }
 
-        connection(conn_options).send(method) do |request|
-          case method
+      connection(conn_options).send(method) do |request|
+        case method
           when :get, :delete, :head
             request.url(path, options)
           when :patch, :post, :put
             request.path = path
-            unless options.empty?
-              request.body = force_urlencoded ? options : MultiJson.dump(options)
-            end
-          end
-
-          if TicketingHub.request_host
-            request.headers['Host'] = TicketingHub.request_host
-          end
-        end
-      end
-
-      def links(response)
-        links = ( response.headers["Link"] || "" ).split(', ').map do |link|
-          url, type = link.match(/<(.*?)>; rel="(\w+)"/).captures
-          [ type, url ]
+            request.body = force_urlencoded ? options : MultiJson.dump(options) unless options.empty?
         end
-
-        Hash[ *links.flatten ]
+        request.headers['Host'] = TicketingHub.request_host if TicketingHub.request_host
       end
+    rescue TicketingHub::Unauthorized => e
+      if refresh_token.present? && e.response_body == ' '
+        body = post '/oauth/token', { grant_type: 'refresh_token',
+          refresh_token: refresh_token, client_id: client_id, client_secret: client_secret }
+        self.refresh_token = body.refresh_token
+        self.access_token = body.access_token
+        self.expires_at = Time.now + body.expires_in.to_i
+        request(method, path, options)
+      else throw e end
     end
+  end
 end

data/lib/ticketing_hub/version.rb

@@ -1,3 +1,3 @@
 module TicketingHub
-  VERSION = '1.0.3' unless defined?(TicketingHub::VERSION)
+  VERSION = '1.0.4' unless defined?(TicketingHub::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ticketinghub
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Oliver Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - Rakefile
 - ticketinghub.gemspec
 - lib/ticketing_hub/client.rb
+- lib/ticketing_hub/collection.rb
 - lib/ticketing_hub/configuration.rb
 - lib/ticketing_hub/connection.rb
 - lib/ticketing_hub/error.rb