Skip to content

Commit

Permalink
Fixup whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
gdb committed Jun 20, 2012
1 parent 6031cbf commit 22907c7
Show file tree
Hide file tree
Showing 24 changed files with 32 additions and 54 deletions.
35 changes: 9 additions & 26 deletions lib/stripe.rb
Expand Up @@ -33,7 +33,6 @@
require 'stripe/event'
require 'stripe/transfer'


# Errors
require 'stripe/errors/stripe_error'
require 'stripe/errors/api_error'
Expand All @@ -48,42 +47,34 @@ module Stripe
@@api_base = 'https://api.stripe.com/v1'
@@verify_ssl_certs = true


def self.api_url(url='')
@@api_base + url
end



def self.api_key=(api_key)
@@api_key = api_key
end



def self.api_key
@@api_key
end



def self.api_base=(api_base)
@@api_base = api_base
end



def self.api_base
@@api_base
end



def self.verify_ssl_certs=(verify)
@@verify_ssl_certs = verify
end



def self.verify_ssl_certs
@@verify_ssl_certs
end


def self.request(method, url, api_key, params=nil, headers={})
api_key ||= @@api_key
raise AuthenticationError.new('No API key provided. (HINT: set your API key using "Stripe.api_key = <API-KEY>". You can generate API keys from the Stripe web interface. See https://stripe.com/api for details, or email support@stripe.com if you have any questions.)') unless api_key
Expand Down Expand Up @@ -189,14 +180,12 @@ def self.request(method, url, api_key, params=nil, headers={})
[resp, api_key]
end


private

def self.execute_request(opts)
RestClient::Request.execute(opts)
end


def self.handle_api_error(rcode, rbody)
begin
error_obj = Stripe::JSON.load(rbody)
Expand All @@ -218,27 +207,22 @@ def self.handle_api_error(rcode, rbody)
end
end


def self.invalid_request_error(error, rcode, rbody, error_obj)
InvalidRequestError.new(error[:message], error[:param], rcode, rbody, error_obj)
end



def self.authentication_error(error, rcode, rbody, error_obj)
AuthenticationError.new(error[:message], rcode, rbody, error_obj)
end



def self.card_error(error, rcode, rbody, error_obj)
CardError.new(error[:message], error[:param], error[:code], rcode, rbody, error_obj)
end



def self.api_error(error, rcode, rbody, error_obj)
APIError.new(error[:message], rcode, rbody, error_obj)
end


def self.handle_restclient_error(e)
case e
when RestClient::ServerBrokeConnection, RestClient::RequestTimeout
Expand All @@ -253,5 +237,4 @@ def self.handle_restclient_error(e)
message += "\n\n(Network error: #{e.message})"
raise APIConnectionError.new(message)
end

end
6 changes: 2 additions & 4 deletions lib/stripe/api_operations/create.rb
@@ -1,18 +1,16 @@
module Stripe
module APIOperations
module Create

module ClassMethods
def create(params={}, api_key=nil)
response, api_key = Stripe.request(:post, self.url, api_key, params)
Util.convert_to_stripe_object(response, api_key)
end
end

def self.included(base)
base.extend(ClassMethods)
end

end
end
end
end
2 changes: 0 additions & 2 deletions lib/stripe/api_operations/delete.rb
@@ -1,13 +1,11 @@
module Stripe
module APIOperations
module Delete

def delete
response, api_key = Stripe.request(:delete, url, @api_key)
refresh_from(response, api_key)
self
end

end
end
end
2 changes: 0 additions & 2 deletions lib/stripe/api_operations/list.rb
@@ -1,7 +1,6 @@
module Stripe
module APIOperations
module List

module ClassMethods
def all(filters={}, api_key=nil)
response, api_key = Stripe.request(:get, url, api_key, filters)
Expand All @@ -12,7 +11,6 @@ def all(filters={}, api_key=nil)
def self.included(base)
base.extend(ClassMethods)
end

end
end
end
2 changes: 0 additions & 2 deletions lib/stripe/api_operations/update.rb
@@ -1,7 +1,6 @@
module Stripe
module APIOperations
module Update

def save
if @unsaved_values.length > 0
values = {}
Expand All @@ -11,7 +10,6 @@ def save
end
self
end

end
end
end
1 change: 1 addition & 0 deletions lib/stripe/api_resource.rb
Expand Up @@ -7,6 +7,7 @@ def self.url
shortname = self.name.split('::')[-1]
"/#{CGI.escape(shortname.downcase)}s"
end

def url
unless id = self['id']
raise InvalidRequestError.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{id.inspect}", 'id')
Expand Down
2 changes: 1 addition & 1 deletion lib/stripe/charge.rb
Expand Up @@ -26,4 +26,4 @@ def capture_url
url + '/capture'
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/coupon.rb
Expand Up @@ -4,4 +4,4 @@ class Coupon < APIResource
include Stripe::APIOperations::Delete
include Stripe::APIOperations::List
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/customer.rb
Expand Up @@ -48,4 +48,4 @@ def subscription_url
url + '/subscription'
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/errors/api_connection_error.rb
@@ -1,4 +1,4 @@
module Stripe
class APIConnectionError < StripeError
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/errors/api_error.rb
@@ -1,4 +1,4 @@
module Stripe
class APIError < StripeError
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/errors/authentication_error.rb
@@ -1,4 +1,4 @@
module Stripe
class AuthenticationError < StripeError
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/errors/card_error.rb
Expand Up @@ -8,4 +8,4 @@ def initialize(message, param, code, http_status=nil, http_body=nil, json_body=n
@code = code
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/errors/invalid_request_error.rb
Expand Up @@ -7,4 +7,4 @@ def initialize(message, param, http_status=nil, http_body=nil, json_body=nil)
@param = param
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/errors/stripe_error.rb
Expand Up @@ -17,4 +17,4 @@ def to_s
"#{status_string}#{@message}"
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/event.rb
Expand Up @@ -2,4 +2,4 @@ module Stripe
class Event < APIResource
include Stripe::APIOperations::List
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/invoice.rb
Expand Up @@ -13,4 +13,4 @@ def self.upcoming_url
url + '/upcoming'
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/invoice_item.rb
Expand Up @@ -5,4 +5,4 @@ class InvoiceItem < APIResource
include Stripe::APIOperations::Delete
include Stripe::APIOperations::Update
end
end
end
4 changes: 3 additions & 1 deletion lib/stripe/json.rb
Expand Up @@ -4,16 +4,18 @@ module JSON
def self.dump(*args)
MultiJson.dump(*args)
end

def self.load(*args)
MultiJson.load(*args)
end
else
def self.dump(*args)
MultiJson.encode(*args)
end

def self.load(*args)
MultiJson.decode(*args)
end
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/plan.rb
Expand Up @@ -5,4 +5,4 @@ class Plan < APIResource
include Stripe::APIOperations::List
include Stripe::APIOperations::Update
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/stripe_object.rb
Expand Up @@ -147,4 +147,4 @@ def method_missing(name, *args)
end
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/token.rb
Expand Up @@ -2,4 +2,4 @@ module Stripe
class Token < APIResource
include Stripe::APIOperations::Create
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/transfer.rb
Expand Up @@ -13,4 +13,4 @@ def transactions_url
url + '/transactions'
end
end
end
end
2 changes: 1 addition & 1 deletion lib/stripe/util.rb
Expand Up @@ -100,4 +100,4 @@ def self.flatten_params_array(value, calculated_key)
result
end
end
end
end

0 comments on commit 22907c7

Please sign in to comment.