ticketevolution-ruby 0.7.26 → 0.7.31

data/README.markdown

@@ -36,7 +36,8 @@ Then
     require 'ticket_evolution'
     @connection = TicketEvolution::Connection.new({
       :token => '<YOUR TOKEN>',
-      :secret => '<YOUR SECRET>'
+      :secret => '<YOUR SECRET>',
+      :version => 9
     })
     @connection.brokerages.list({:per_page => 1})
 
@@ -53,10 +54,10 @@ Each set of API credentials can be combined with a mode and api version to creat
       :token => '',       # => (required) The API token, used to identify you
       :secret => '',      # => (required) The API secret, used to sign requests
                           #               More info: [http://developer.ticketevolution.com/signature_tool](http://developer.ticketevolution.com/signature_tool))
+      :version => 9,      # => (required) API version to use - the correct version
+                                          at the time of this writing is 9
       :mode => :sandbox,  # => (optional) Specifies the server environment to use
                                           Valid options: :production or :sandbox
-      :version => 8,      # => (optional) API version to use - the only available
-                                          version at the time of this writing is 8
       :logger => nil      # => (optional) Object to use for logging requests and
                           #               responses. Any 'Logger' instance object
                           #               is valid. EX: Logger.new('log/te_api.log')

data/lib/ticket_evolution.rb

@@ -77,10 +77,13 @@ i.req 'brokerage'
 i.req 'category'
 i.req 'company'
 i.req 'client'
+i.req 'commission'
 i.req 'configuration'
 i.req 'credit_card'
+i.req 'credit_memo'
 i.req 'ticket_hold'
 i.req 'email_address'
+i.req 'credential'
 i.req 'event'
 i.req 'office'
 i.req 'order'
@@ -88,6 +91,7 @@ i.req 'payment'
 i.req 'performer'
 i.req 'phone_number'
 i.req 'promotion_code'
+i.req 'queued_order'
 i.req 'quote'
 i.req 'rate_option'
 i.req 'service_fee'
@@ -107,12 +111,19 @@ i.req 'brokerages'
 i.req 'categories'
 i.req 'companies'
 i.req 'clients'
+i.req 'commissions'
+i.req 'commission_payment'
 i.req 'configurations'
+i.req 'credit_memos'
+i.req 'credit_memo_payment'
+i.req 'credentials'
 i.req 'events'
 i.req 'offices'
 i.req 'orders'
+i.req 'payments'
 i.req 'performers'
 i.req 'promotion_codes'
+i.req 'queued_orders'
 i.req 'quotes'
 i.req 'rate_options'
 i.req 'settings'
@@ -120,9 +131,12 @@ i.req 'shipments'
 i.req 'filtered_tickets'
 i.req 'ticket_groups'
 i.req 'track_details'
+i.req 'transactions'
 i.req 'users'
 i.req 'venues'
 i.req 'search'
+i.req 'searches'
+i.req 'reports'
 
 i.req 'clients', 'addresses'
 i.req 'clients', 'credit_cards'
@@ -131,8 +145,9 @@ i.req 'clients', 'phone_numbers'
 
 i.req 'accounts', 'transactions'
 
-i.req 'offices', 'credit_cards'
+i.req 'credit_memos', 'credit_memo_payments'
+i.req 'commissions', 'commission_payments'
 
-i.req 'orders', 'payments'
+i.req 'offices', 'credit_cards'
 
 i.req 'ticket_groups', 'ticket_holds'

data/lib/ticket_evolution/accounts/transactions.rb

@@ -1,8 +1,19 @@
 module TicketEvolution
   class Accounts
     class Transactions < TicketEvolution::Endpoint
+      include TicketEvolution::Modules::Create
       include TicketEvolution::Modules::List
       include TicketEvolution::Modules::Show
+
+      def balances(params = nil)
+        request(:GET, "/balances", params) do |response|
+          singular_class.new(response.body.merge({
+            :status_code => response.response_code,
+            :server_message => response.server_message,
+            :connection => response.body[:connection]
+          }))
+        end
+      end
     end
   end
 end

data/lib/ticket_evolution/commission.rb

@@ -0,0 +1,5 @@
+module TicketEvolution
+  class Commission < Model
+    include Model::ParentalBehavior
+  end
+end

data/lib/ticket_evolution/commission_payment.rb

@@ -0,0 +1,12 @@
+module TicketEvolution
+  class CommissionPayment < Model
+
+    def apply(params = {})
+      plural_class.new(:parent => self.endpoint.parent, :id => self.id).apply(params)
+    end
+
+    def cancel(params = {})
+      plural_class.new(:parent => self.endpoint.parent, :id => self.id).cancel
+    end
+  end
+end

data/lib/ticket_evolution/commissions.rb

@@ -0,0 +1,17 @@
+module TicketEvolution
+  class Commissions < Endpoint
+    include TicketEvolution::Modules::List
+    include TicketEvolution::Modules::Show
+
+    def pay(params = nil)
+      request(:POST, "/pay", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+  end
+end

data/lib/ticket_evolution/commissions/commission_payments.rb

@@ -0,0 +1,31 @@
+module TicketEvolution
+  class Commissions
+    class CommissionPayments < TicketEvolution::Endpoint
+      include TicketEvolution::Modules::List
+      include TicketEvolution::Modules::Show
+
+      def apply(params = {})
+        ensure_id
+        request(:GET, '/apply', params) do |response|
+          singular_class.new(response.body.merge({
+            :status_code => response.response_code,
+            :server_message => response.server_message,
+            :connection => response.body[:connection]
+          }))
+        end
+      end
+
+      def cancel(params = nil)
+        ensure_id
+        request(:GET, "/cancel", nil) do |response|
+          singular_class.new(response.body.merge({
+            :status_code => response.response_code,
+            :server_message => response.server_message,
+            :connection => response.body[:connection]
+          }))
+        end
+      end
+    end
+  end
+end
+

data/lib/ticket_evolution/core/collection.rb

@@ -1,6 +1,7 @@
 module TicketEvolution
   class Collection
-    attr_accessor :total_entries, :per_page, :current_page, :entries, :status_code, :unique_categories
+    attr_accessor :total_entries, :per_page, :current_page, :entries, :status_code, 
+                  :unique_categories, :balance_sum, :total_sum
 
     include Enumerable
 
@@ -25,6 +26,8 @@ module TicketEvolution
         end
       }
       values[:unique_categories] = response.body['unique_categories'] if response.body['unique_categories']
+      values[:balance_sum] = response.body['balance_sum'] if response.body['balance_sum']
+      values[:total_sum] = response.body['total_sum'] if response.body['total_sum']
       new(values)
     end
   end

data/lib/ticket_evolution/core/endpoint/request_handler.rb

@@ -53,7 +53,7 @@ module TicketEvolution
         OpenStruct.new.tap do |resp|
           resp.header = response.headers
           resp.response_code = response.status
-          resp.body = MultiJson.decode(response.body).merge({:connection => self.connection})
+          resp.body = (MultiJson.decode(response.body) rescue {"error" => "Internal Server Error"}).merge({:connection => self.connection})
           resp.server_message = (CODES[resp.response_code] || ['Unknown Error']).last
         end
       end
@@ -61,6 +61,10 @@ module TicketEvolution
       def collection_handler(response)
         TicketEvolution::Collection.build_from_response(response, self.class.name.demodulize.underscore, singular_class)
       end
+
+      def raw_handler(response)
+        response
+      end
     end
   end
 end

data/lib/ticket_evolution/credential.rb

@@ -0,0 +1,5 @@
+module TicketEvolution
+  class Credential < Model
+  end
+end
+

data/lib/ticket_evolution/credentials.rb

@@ -0,0 +1,5 @@
+module TicketEvolution
+  class Credentials < Endpoint
+    include TicketEvolution::Modules::List
+  end
+end

data/lib/ticket_evolution/credit_memo.rb

@@ -0,0 +1,9 @@
+module TicketEvolution
+  class CreditMemo < Model
+    include Model::ParentalBehavior
+
+    def cards(params = nil)
+      plural_class.new(:parent => @connection,:id => self.id).cards(params)
+    end
+  end
+end

data/lib/ticket_evolution/credit_memo_payment.rb

@@ -0,0 +1,13 @@
+module TicketEvolution
+  class CreditMemoPayment < Model
+
+    def apply(params = {})
+      plural_class.new(:parent => self.endpoint.parent, :id => self.id).apply(params)
+    end
+
+    def cancel(params = {})
+      plural_class.new(:parent => self.endpoint.parent, :id => self.id).cancel
+    end
+  end
+end
+

data/lib/ticket_evolution/credit_memos.rb

@@ -0,0 +1,20 @@
+module TicketEvolution
+  class CreditMemos < Endpoint
+    include TicketEvolution::Modules::List
+    include TicketEvolution::Modules::Show
+    include TicketEvolution::Modules::Update
+
+    def cards(params = nil)
+      ensure_id
+      request(:GET, "/cards", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+  end
+end
+

data/lib/ticket_evolution/credit_memos/credit_memo_payments.rb

@@ -0,0 +1,31 @@
+module TicketEvolution
+  class CreditMemos
+    class CreditMemoPayments < TicketEvolution::Endpoint
+      include TicketEvolution::Modules::List
+      include TicketEvolution::Modules::Show
+      include TicketEvolution::Modules::Create
+
+      def apply(params = {})
+        ensure_id
+        request(:GET, '/apply', params) do |response|
+          singular_class.new(response.body.merge({
+            :status_code => response.response_code,
+            :server_message => response.server_message,
+            :connection => response.body[:connection]
+          }))
+        end
+      end
+
+      def cancel(params = nil)
+        ensure_id
+        request(:GET, "/cancel", nil) do |response|
+          singular_class.new(response.body.merge({
+            :status_code => response.response_code,
+            :server_message => response.server_message,
+            :connection => response.body[:connection]
+          }))
+        end
+      end
+    end
+  end
+end

data/lib/ticket_evolution/modules/create.rb

@@ -3,7 +3,15 @@ module TicketEvolution
     module Create
       def create(params = nil, &handler)
         handler ||= method(:build_for_create)
-        params = { endpoint_name.to_sym => [params] } if params.present?
+        if params.present?
+          if params.is_a?(Array)
+            params = { endpoint_name.to_sym => params }
+          else
+            if !params[endpoint_name.to_sym].present?
+              params = { endpoint_name.to_sym => [params] }
+            end
+          end
+        end
         request(:POST, nil, params, &handler)
       end
 

data/lib/ticket_evolution/modules/create_in_background.rb

@@ -4,7 +4,7 @@ module TicketEvolution
       def create_in_background(params = nil, &handler)
         handler ||= method(:build_for_create_in_background)
         params = { endpoint_name.to_sym => [params] } if params.present?
-        request(:POST, '/create_in_background', params, &handler)
+        request(:POST, '/background', params, &handler)
       end
 
       def build_for_create_in_background(response)

data/lib/ticket_evolution/modules/list.rb

@@ -6,6 +6,11 @@ module TicketEvolution
         request(:GET, nil, params, &handler)
       end
 
+      def raw(params = nil, &handler)
+        handler ||= method(:raw_handler)
+        request(:GET, nil, params, &handler)
+      end
+
       alias :all :list
     end
   end

data/lib/ticket_evolution/modules/retrieve_queued_order.rb

@@ -1,14 +1,11 @@
 module TicketEvolution
   module Modules
     module RetrieveQueuedOrder
-      def retrieve_queued_order(id, params = nil, &handler)
-        handler ||= method(:build_for_retrieve_queued_order)
-        request(:GET, "/retrieve_queued_order/#{id}", params, &handler)
+      def retrieve_queued_orders(&handler)
+        handler ||= method(:collection_handler)
+        request(:GET, "/queued_orders", &handler)
       end
 
-      def build_for_retrieve_queued_order(response)
-        response.body
-      end
     end
   end
 end

data/lib/ticket_evolution/order.rb

@@ -6,6 +6,10 @@ module TicketEvolution
       plural_class.new(:parent => @connection,:id => self.id).accept_order(params)
     end
 
+    def return(params)
+      plural_class.new(:parent => @connection,:id => self.id).return_order(params)
+    end
+
     def complete
       plural_class.new(:parent => @connection,:id => self.id).complete_order
     end
@@ -14,6 +18,10 @@ module TicketEvolution
       plural_class.new(:parent => @connection,:id => self.id).reject_order(params)
     end
 
+    def cancel(params)
+      plural_class.new(:parent => @connection,:id => self.id).cancel_order(params)
+    end
+
     def email(params)
       plural_class.new(:parent => @connection,:id => self.id).email_order(params)
     end
@@ -37,5 +45,17 @@ module TicketEvolution
     def print(params = nil)
       plural_class.new(:parent => @connection,:id => self.id).print_order(params)
     end
+
+    def get_ticket_costs(params = nil)
+      plural_class.new(:parent => @connection,:id => self.id).get_ticket_costs(params)
+    end
+
+    def update_ticket_costs(params)
+      plural_class.new(:parent => @connection,:id => self.id).update_ticket_costs(params)
+    end
+
+    def update_spec_tickets(params)
+      plural_class.new(:parent => @connection,:id => self.id).update_spec_tickets(params)
+    end
   end
 end

data/lib/ticket_evolution/orders.rb

@@ -24,6 +24,17 @@ module TicketEvolution
       end
     end
 
+    def return_order(params = nil)
+      ensure_id
+      request(:POST, "/return", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
     def pend_to_seller(params)
       request(:POST, "/#{params[:id]}/pend_to_seller", params, &method(:build_for_show))
     end
@@ -43,6 +54,17 @@ module TicketEvolution
       end
     end
 
+    def cancel_order(params = nil)
+      ensure_id
+      request(:POST, "/cancel", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
     def complete_order
       ensure_id
       request(:POST, "/complete", nil, &method(:build_for_create))
@@ -107,5 +129,37 @@ module TicketEvolution
       end
     end
 
+    def get_ticket_costs(params = nil)
+      ensure_id
+      request(:GET, "/get_ticket_costs", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+    def update_ticket_costs(params = nil)
+      ensure_id
+      request(:POST, "/update_ticket_costs", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+    def update_spec_tickets(params = nil)
+      ensure_id
+      request(:POST, "/update_spec_tickets", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
   end
 end

data/lib/ticket_evolution/payment.rb

@@ -1,15 +1,17 @@
 module TicketEvolution
   class Payment < Model
-    def apply
-      plural_class.new(:parent => @connection,:id => self.id).apply
+    include Model::ParentalBehavior
+
+    def apply(params=nil)
+      plural_class.new(:parent => @connection,:id => self.id).apply(params)
     end
 
     def cancel
       plural_class.new(:parent => @connection,:id => self.id).cancel
     end
 
-    def refund
-      plural_class.new(:parent => @connection,:id => self.id).refund
+    def refund(params=nil)
+      plural_class.new(:parent => @connection,:id => self.id).refund(params)
     end
   end
 end

data/lib/ticket_evolution/payments.rb

@@ -0,0 +1,46 @@
+module TicketEvolution
+  class Payments < Endpoint
+    include TicketEvolution::Modules::Create
+    include TicketEvolution::Modules::List
+    include TicketEvolution::Modules::Show
+    include TicketEvolution::Modules::Update
+
+    def status(params = {})
+      handler ||= method(:collection_handler)
+      request(:GET, '/status', params, &handler)
+    end
+
+    def apply(params = {})
+      ensure_id
+      request(:GET, "/apply", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+    def cancel(params = nil)
+      ensure_id
+      request(:GET, "/cancel", nil) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+    def refund(params = nil)
+      ensure_id
+      request(:POST, "/refund", params) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+  end
+end

data/lib/ticket_evolution/queued_order.rb

@@ -0,0 +1,4 @@
+module TicketEvolution
+  class QueuedOrder < Model
+  end
+end

data/lib/ticket_evolution/queued_orders.rb

@@ -0,0 +1,10 @@
+module TicketEvolution
+  class QueuedOrders < Endpoint
+    include TicketEvolution::Modules::List
+    include TicketEvolution::Modules::Show
+
+    def list_recent
+      request(:GET, '/recent', &method(:collection_handler))
+    end
+  end
+end

data/lib/ticket_evolution/quote.rb

@@ -1,4 +1,9 @@
 module TicketEvolution
   class Quote < Model
+
+    def resend
+      plural_class.new(:parent => @connection,:id => self.id).resend
+    end
+
   end
 end

data/lib/ticket_evolution/quotes.rb

@@ -3,5 +3,36 @@ module TicketEvolution
     include TicketEvolution::Modules::List
     include TicketEvolution::Modules::Search
     include TicketEvolution::Modules::Show
+    include TicketEvolution::Modules::Create
+    include TicketEvolution::Modules::Update
+
+    def autocomplete(params = {})
+      request(:GET, "/autocomplete", params, &method(:build_for_search))
+    end
+
+    def resend
+      ensure_id
+      request(:GET, "/resend", nil) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+    def build_for_search(response)
+      collection = TicketEvolution::Collection.new(
+        :total_entries => response.body['total_entries'],
+        :per_page => response.body['per_page'],
+        :current_page => response.body['current_page']
+      )
+
+      response.body['results'].each do |result|
+        collection.entries << result
+      end
+
+      collection
+    end
   end
 end

data/lib/ticket_evolution/reports.rb

@@ -0,0 +1,15 @@
+module TicketEvolution
+  class Reports < Endpoint
+    def sales(params = {})
+      request(:GET, '/sales', params, &method(:build_for_reports))
+    end
+
+    def inventory(params = {})
+      request(:GET, '/inventory', params, &method(:build_for_reports))
+    end
+
+    def build_for_reports(response)
+      response.body
+    end
+  end
+end

data/lib/ticket_evolution/searches.rb

@@ -0,0 +1,11 @@
+module TicketEvolution
+  class Searches < Endpoint
+    def suggestions(params = {})
+      request(:GET, '/suggestions', params, &method(:build_for_search))
+    end
+
+    def build_for_search(response)
+      response.body['suggestions']
+    end
+  end
+end

data/lib/ticket_evolution/shipment.rb

@@ -3,11 +3,20 @@ module TicketEvolution
     def generate_airbill
       plural_class.new(:parent => @connection, :id => self.id).generate_airbill
     end
+    def get_airbill
+      plural_class.new(:parent => @connection, :id => self.id).get_airbill
+    end
     def email_airbill(params)
       plural_class.new(:parent => @connection, :id => self.id).email_airbill(params)
     end
     def cancel
       plural_class.new(:parent => @connection, :id => self.id).cancel_shipment
     end
+    def deliver
+      plural_class.new(:parent => @connection, :id => self.id).deliver_shipment
+    end
+    def pend
+      plural_class.new(:parent => @connection, :id => self.id).pend_shipment
+    end
   end
 end

data/lib/ticket_evolution/shipments.rb

@@ -5,6 +5,23 @@ module TicketEvolution
     include TicketEvolution::Modules::Show
     include TicketEvolution::Modules::Update
 
+    def status(params = {})
+      handler ||= method(:collection_handler)
+      request(:GET, '/status', params, &handler)
+    end
+
+    def get_airbill(params = {})
+      ensure_id
+
+      request(:GET, "/get_airbill", nil) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+   end
+
     def generate_airbill(params = nil)
       ensure_id
       request(:POST, "/airbill", nil) do |response|
@@ -39,5 +56,29 @@ module TicketEvolution
         }))
       end
     end
+
+    def pend_shipment(params = nil)
+      ensure_id
+
+      request(:GET, "/pend", nil) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
+
+    def deliver_shipment(params = nil)
+      ensure_id
+
+      request(:GET, "/deliver", nil) do |response|
+        singular_class.new(response.body.merge({
+          :status_code => response.response_code,
+          :server_message => response.server_message,
+          :connection => response.body[:connection]
+        }))
+      end
+    end
   end
 end

data/lib/ticket_evolution/ticket_groups.rb

@@ -2,6 +2,7 @@ module TicketEvolution
   class TicketGroups < Endpoint
     include TicketEvolution::Modules::List
     include TicketEvolution::Modules::Show
+    include TicketEvolution::Modules::Create
     include TicketEvolution::Modules::Update
 
     def hold(params = nil)
@@ -13,7 +14,7 @@ module TicketEvolution
       ensure_id
       request(:POST, "/take", params, &method(:build_for_show))
     end
-    
+
     def update_hold(params = nil)
       ensure_id
       request(:POST, "/update_hold/#{params[:ticket_hold_id]}", params, &method(:build_for_show))
@@ -43,5 +44,15 @@ module TicketEvolution
       handler ||= method(:collection_handler)
       request(:GET, '/index_cart', ids, &handler)
     end
+
+    def mass_index(params = {})
+      handler ||= method(:collection_handler)
+      request(:GET, '/mass_index', params, &handler)
+    end
+
+    def mass_update(params = {})
+      handler ||= method(:collection_handler)
+      request(:POST, '/mass_update', params, &handler)
+    end
   end
 end

data/lib/ticket_evolution/transaction.rb

@@ -1,4 +1,7 @@
 module TicketEvolution
   class Transaction < Model
+    def balances(params = nil)
+      plural_class.new(:parent => @connection,:id => self.id).balances(params)
+    end
   end
 end

data/lib/ticket_evolution/transactions.rb

@@ -0,0 +1,7 @@
+module TicketEvolution
+  class Transactions < Endpoint
+    include TicketEvolution::Modules::List
+    include TicketEvolution::Modules::Create
+    include TicketEvolution::Modules::Show
+  end
+end

data/lib/ticket_evolution/version.rb

@@ -1,3 +1,3 @@
 module TicketEvolution
-  VERSION = '0.7.26'
+  VERSION = '0.7.31'
 end

data/spec/lib/ticket_evolution/order_spec.rb

@@ -23,6 +23,15 @@ describe TicketEvolution::Order do
       end
     end
 
+    describe "#return" do
+      it "should pass the request to TicketEvolution::Orders#return_order" do
+        plural_klass.should_receive(:new).with(:parent => connection, :id => instance.id).and_return(plural_klass_instance)
+        plural_klass_instance.should_receive(:return_order).with(params).and_return(:dont_care)
+
+        instance.return(params)
+      end
+    end
+
     describe "#complete" do
       it "should pass the request to TicketEvolution::Orders#complete_order" do
         plural_klass.should_receive(:new).with(:parent => connection, :id => instance.id).and_return(plural_klass_instance)
@@ -40,5 +49,14 @@ describe TicketEvolution::Order do
         instance.reject(params)
       end
     end
+
+    describe "#cancel" do
+      it "should pass the request to TicketEvolution::Orders#cancel_order" do
+        plural_klass.should_receive(:new).with(:parent => connection, :id => instance.id).and_return(plural_klass_instance)
+        plural_klass_instance.should_receive(:cancel_order).with(params).and_return(:dont_care)
+
+        instance.cancel(params)
+      end
+    end
   end
 end

data/spec/lib/ticket_evolution/orders_spec.rb

@@ -121,6 +121,37 @@ describe TicketEvolution::Orders do
     end
   end
 
+  describe "#cancel_order" do
+    context "with an id" do
+      let(:instance) { klass.new({:parent => Fake.connection, :id => 1}) }
+
+      context "with params" do
+        let(:params) { {:cancellation_reason => "IT'S A TRAP!!", :reviewer_id => 1} }
+
+        it "should pass call request as a POST, passing params" do
+          instance.should_receive(:request).with(:POST, "/cancel", params)
+
+          instance.cancel_order(params)
+        end
+      end
+
+      context "without params" do
+        it "should pass call request as a POST, passing params" do
+          instance.should_receive(:request).with(:POST, "/cancel", nil)
+
+          instance.cancel_order
+        end
+      end
+    end
+
+    context "without an id" do
+      it "should raise an UnavailableMethodError if there is no id" do
+        message = "#{klass.to_s}#cancel_order can only be called if there is an id present on this #{klass.to_s} instance"
+        expect { instance.cancel_order }.to raise_error TicketEvolution::MethodUnavailableError, message
+      end
+    end
+  end
+
   describe "#complete_order" do
     context "with an id" do
       let(:instance) { klass.new({:parent => Fake.connection, :id => 1}) }

data/spec/lib/ticket_evolution/{orders/payments_spec.rb → payments_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe TicketEvolution::Orders::Payments do
-  let(:klass) { TicketEvolution::Orders::Payments }
+describe TicketEvolution::Payments do
+  let(:klass) { TicketEvolution::Payments }
   let(:single_klass) { TicketEvolution::Payment }
-  let(:update_base) { {'url' => '/orders/1/payments/1'} }
+  let(:update_base) { {'url' => '/payments/1'} }
 
   it_behaves_like 'a ticket_evolution endpoint class'
   it_behaves_like 'a create endpoint'
@@ -19,8 +19,8 @@ describe TicketEvolution::Orders::Payments do
       use_vcr_cassette 'payments/apply'
 
       it 'applies a payment' do
-        instance.should_receive(:request).with(:POST, '/1/apply', { :order_id => 1, :id => 1 })
-        instance.apply({ :order_id => 1, :id => 1 })
+        instance.should_receive(:request).with(:GET, '/apply', { :id => 1, :check_number => 12345 })
+        instance.apply({ :id => 1, :check_number => 12345 })
       end
     end
 
@@ -29,7 +29,7 @@ describe TicketEvolution::Orders::Payments do
       use_vcr_cassette 'payments/cancel'
 
       it 'cancels the payment' do
-        instance.should_receive(:request).with(:POST, '/1/cancel', { :order_id => 1, :id => 1 })
+        instance.should_receive(:request).with(:GET, '/cancel', nil)
         instance.cancel({ :order_id => 1, :id => 1 })
       end
     end
@@ -39,8 +39,8 @@ describe TicketEvolution::Orders::Payments do
       use_vcr_cassette 'payments/refund'
 
       it 'refunds the payment' do
-        instance.should_receive(:request).with(:GET, '/1/refund',nil)
-        instance.refund(1)
+        instance.should_receive(:request).with(:POST, '/refund', { :order_id => 1, :id => 1 })
+        instance.refund({ :order_id => 1, :id => 1 })
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ticketevolution-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.26
+  version: 0.7.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -221,6 +221,10 @@ files:
 - lib/ticket_evolution/clients/credit_cards.rb
 - lib/ticket_evolution/clients/email_addresses.rb
 - lib/ticket_evolution/clients/phone_numbers.rb
+- lib/ticket_evolution/commission.rb
+- lib/ticket_evolution/commission_payment.rb
+- lib/ticket_evolution/commissions.rb
+- lib/ticket_evolution/commissions/commission_payments.rb
 - lib/ticket_evolution/companies.rb
 - lib/ticket_evolution/company.rb
 - lib/ticket_evolution/configuration.rb
@@ -237,7 +241,13 @@ files:
 - lib/ticket_evolution/core/model/parental_behavior.rb
 - lib/ticket_evolution/core/singular_class.rb
 - lib/ticket_evolution/core/time.rb
+- lib/ticket_evolution/credential.rb
+- lib/ticket_evolution/credentials.rb
 - lib/ticket_evolution/credit_card.rb
+- lib/ticket_evolution/credit_memo.rb
+- lib/ticket_evolution/credit_memo_payment.rb
+- lib/ticket_evolution/credit_memos.rb
+- lib/ticket_evolution/credit_memos/credit_memo_payments.rb
 - lib/ticket_evolution/email_address.rb
 - lib/ticket_evolution/errors/connection_not_found.rb
 - lib/ticket_evolution/errors/endpoint_configuration_error.rb
@@ -262,18 +272,22 @@ files:
 - lib/ticket_evolution/offices/credit_cards.rb
 - lib/ticket_evolution/order.rb
 - lib/ticket_evolution/orders.rb
-- lib/ticket_evolution/orders/payments.rb
 - lib/ticket_evolution/payment.rb
+- lib/ticket_evolution/payments.rb
 - lib/ticket_evolution/performer.rb
 - lib/ticket_evolution/performers.rb
 - lib/ticket_evolution/phone_number.rb
 - lib/ticket_evolution/promotion_code.rb
 - lib/ticket_evolution/promotion_codes.rb
+- lib/ticket_evolution/queued_order.rb
+- lib/ticket_evolution/queued_orders.rb
 - lib/ticket_evolution/quote.rb
 - lib/ticket_evolution/quotes.rb
 - lib/ticket_evolution/rate_option.rb
 - lib/ticket_evolution/rate_options.rb
+- lib/ticket_evolution/reports.rb
 - lib/ticket_evolution/search.rb
+- lib/ticket_evolution/searches.rb
 - lib/ticket_evolution/service_fee.rb
 - lib/ticket_evolution/settings.rb
 - lib/ticket_evolution/shipment.rb
@@ -286,6 +300,7 @@ files:
 - lib/ticket_evolution/track_detail.rb
 - lib/ticket_evolution/track_details.rb
 - lib/ticket_evolution/transaction.rb
+- lib/ticket_evolution/transactions.rb
 - lib/ticket_evolution/user.rb
 - lib/ticket_evolution/users.rb
 - lib/ticket_evolution/venue.rb
@@ -350,9 +365,9 @@ files:
 - spec/lib/ticket_evolution/offices/credit_cards_spec.rb
 - spec/lib/ticket_evolution/offices_spec.rb
 - spec/lib/ticket_evolution/order_spec.rb
-- spec/lib/ticket_evolution/orders/payments_spec.rb
 - spec/lib/ticket_evolution/orders_spec.rb
 - spec/lib/ticket_evolution/payment_spec.rb
+- spec/lib/ticket_evolution/payments_spec.rb
 - spec/lib/ticket_evolution/performer_spec.rb
 - spec/lib/ticket_evolution/performers_spec.rb
 - spec/lib/ticket_evolution/phone_number_spec.rb
@@ -405,6 +420,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4363082675175179634
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -477,9 +495,9 @@ test_files:
 - spec/lib/ticket_evolution/offices/credit_cards_spec.rb
 - spec/lib/ticket_evolution/offices_spec.rb
 - spec/lib/ticket_evolution/order_spec.rb
-- spec/lib/ticket_evolution/orders/payments_spec.rb
 - spec/lib/ticket_evolution/orders_spec.rb
 - spec/lib/ticket_evolution/payment_spec.rb
+- spec/lib/ticket_evolution/payments_spec.rb
 - spec/lib/ticket_evolution/performer_spec.rb
 - spec/lib/ticket_evolution/performers_spec.rb
 - spec/lib/ticket_evolution/phone_number_spec.rb

data/lib/ticket_evolution/orders/payments.rb

@@ -1,42 +0,0 @@
-module TicketEvolution
-  class Orders
-    class Payments < TicketEvolution::Endpoint
-      include TicketEvolution::Modules::List
-      include TicketEvolution::Modules::Show
-      include TicketEvolution::Modules::Create
-      include TicketEvolution::Modules::Update
-
-      def apply(params = nil)
-        _ensure_id(params)
-        request(:POST, "/#{params[:id]}/apply", params, &method(:build_for_show))
-      end
-
-      def cancel(params = nil)
-        _ensure_id(params)
-        request(:POST, "/#{params[:id]}/cancel", params, &method(:build_for_show))
-      end
-
-      def refund(id,params=nil, &handler)
-        handler ||= method(:refund_handler)
-        params = { endpoint_name.to_sym => [params] } if params.present?
-        request(:GET, "/#{id}/refund", params, &method(:build_for_show))
-      end
-
-      def refund_handler(response)
-        singular_class.new(response.body.merge({
-          :status_code => response.response_code,
-          :server_message => response.server_message,
-          :connection => response.body[:connection]
-        }))
-      end
-
-      private
-
-      def _ensure_id(params)
-        raise TicketEvolution::MethodUnavailableError.new \
-          "#{self.class.to_s}##{caller.first.split('`').last.split("'").first} can only be called if there is an id present on this #{self.class.to_s} instance" \
-          unless params && params[:id].present?
-      end
-    end
-  end
-end