stripe 1.7.0 → 1.7.1

data/.gitignore

@@ -0,0 +1,2 @@
+/stripe-*.gem
+.rvmrc

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+gemfile:
+  - gemfiles/default-with-activesupport.gemfile
+  - gemfiles/json.gemfile
+  - gemfiles/yajl.gemfile

data/CONTRIBUTORS

@@ -0,0 +1,3 @@
+Greg Brockman <gdb@gregbrockman.com>
+Ross Boucher <rboucher@gmail.com>
+Bradley Grzesiak <brad@bendyworks.com>

data/Gemfile

@@ -0,0 +1,2 @@
+source "https://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    stripe (1.7.1)
+      multi_json (~> 1.1)
+      rest-client (~> 1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    metaclass (0.0.1)
+    mime-types (1.19)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    test-unit (2.4.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  rake
+  shoulda
+  stripe!
+  test-unit

data/History.txt

@@ -0,0 +1,68 @@
+=== 1.7.1 2012-08-15
+
+* Add new Account API resource
+
+=== 1.7.0 2012-05-17
+
+* 3 major enhancements:
+  * Switch from vendored stripe-json to multi_json for all JSON
+    parsing and rendering. This should not impact programmatic usage
+    of the library, but may cause small rendering differences from,
+    e.g., StripeObject#inspect (github issue #22)
+  * Add new delete_discount method to Customer objects
+  * Add new Transfer API resource
+
+* 2 minor enhancements:
+  * Switch from HTTP Basic auth to Bearer auth (Note: Stripe will
+    support Basic auth for the indefinite future, but recommends
+    Bearer auth when possible going forward)
+  * Numerous test suite improvements
+
+=== 1.6.3 2012-03-22
+
+* 1 bugfix:
+  * Encode GET query strings ourselves instead of using rest-client to
+    work around a bug
+
+=== 1.6.2 2012-02-24
+
+* 1 bugfix:
+  * Correct argument handling in StripeObject#as_json
+
+=== 1.6.1 2012-02-22
+
+* 1 bugfix:
+  * Fix StripeObject#inspect when ActiveSupport 3.0 is loaded
+
+=== 1.6.0 2012-02-01
+* A whole bunch of releases between 1.5.0 and 1.6.0, but few changes, mainly the addition of:
+  - plans
+  - coupons
+  - events 
+  - tokens
+* 1.6.0 also contains a new inspect/to_string implementation
+
+=== 1.5.0 2011-05-09
+
+* 1 major enhancement:
+  * Update for new RESTful API
+
+=== 1.3.4 2011-01-07
+
+* 1 major enhancement:
+  * Rename to Stripe
+
+=== 1.2 2010-06-06
+
+* 1 major enhancement:
+  * Support for the set_customer_subscription and delete_customer API methods
+
+=== 1.1 2010-03-14
+
+* 1 major enhancement:
+  * Support for recurring billing
+
+=== 1.0 2010-01-05
+
+* 1 major enhancement:
+  * Initial release

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2011- Stripe, Inc. (https://stripe.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,28 @@
+= Stripe Ruby bindings
+
+== Installation
+
+You don't need this source code unless you want to modify the gem. If
+you just want to use the Stripe Ruby bindings, you should run:
+
+  sudo gem install --source https://code.stripe.com stripe
+
+If you want to build the gem from source:
+
+  sudo gem build stripe.gemspec
+
+== Requirements
+
+* Ruby 1.8.7 or above. (Ruby 1.8.6 may work if you load
+  ActiveSupport.)
+* rest-client, multi_json
+
+== Mirrors
+
+The stripe gem is mirrored on Rubygems, so you should be able to
+install it via <tt>gem install stripe</tt> if desired. We recommend using 
+the https://code.stripe.com mirror so all code is fetched over SSL.
+
+== Development
+
+Test cases can be run with: `bundle exec rake test`

data/Rakefile

@@ -0,0 +1,9 @@
+task :default => [:test]
+
+task :test do
+  ret = true
+  Dir["test/**/*.rb"].each do |f|
+    ret = ret && ruby(f, '')
+  end
+  exit(ret)
+end

data/VERSION

@@ -0,0 +1 @@
+1.7.1

data/gemfiles/default-with-activesupport.gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+gemspec :path => File.join(File.dirname(__FILE__), "..")
+gem "activesupport"

data/gemfiles/default-with-activesupport.gemfile.lock

@@ -0,0 +1,39 @@
+PATH
+  remote: /home/evan/src/stripe-ruby
+  specs:
+    stripe (1.7.0)
+      multi_json (~> 1.1)
+      rest-client (~> 1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    i18n (0.6.0)
+    metaclass (0.0.1)
+    mime-types (1.18)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.4)
+    rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    test-unit (2.4.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  mocha
+  rake
+  shoulda
+  stripe!
+  test-unit

data/gemfiles/json.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec :path => File.join(File.dirname(__FILE__), "..")
+gem "json"
+gem "activesupport"

data/gemfiles/json.gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: /home/evan/src/stripe-ruby
+  specs:
+    stripe (1.7.0)
+      multi_json (~> 1.1)
+      rest-client (~> 1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    i18n (0.6.0)
+    json (1.7.0)
+    metaclass (0.0.1)
+    mime-types (1.18)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.4)
+    rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    test-unit (2.4.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  json
+  mocha
+  rake
+  shoulda
+  stripe!
+  test-unit

data/gemfiles/yajl.gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+gemspec :path => File.join(File.dirname(__FILE__), "..")
+gem "yajl-ruby"
+gem "activesupport"

data/gemfiles/yajl.gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: /home/evan/src/stripe-ruby
+  specs:
+    stripe (1.7.0)
+      multi_json (~> 1.1)
+      rest-client (~> 1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    i18n (0.6.0)
+    metaclass (0.0.1)
+    mime-types (1.18)
+    mocha (0.11.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.4)
+    rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    test-unit (2.4.8)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport
+  mocha
+  rake
+  shoulda
+  stripe!
+  test-unit
+  yajl-ruby

data/lib/stripe.rb

@@ -2,7 +2,6 @@
 # API spec at http://stripe.com/api/spec
 require 'cgi'
 require 'set'
-
 require 'rubygems'
 require 'openssl'
 
@@ -10,7 +9,39 @@ gem 'rest-client', '~> 1.4'
 require 'rest_client'
 require 'multi_json'
 
-require File.join(File.dirname(__FILE__), 'stripe/version')
+# Version
+require 'stripe/version'
+
+# API operations
+require 'stripe/api_operations/create'
+require 'stripe/api_operations/update'
+require 'stripe/api_operations/delete'
+require 'stripe/api_operations/list'
+
+# Resources
+require 'stripe/util'
+require 'stripe/json'
+require 'stripe/stripe_object'
+require 'stripe/api_resource'
+require 'stripe/singleton_api_resource'
+require 'stripe/account'
+require 'stripe/customer'
+require 'stripe/invoice'
+require 'stripe/invoice_item'
+require 'stripe/charge'
+require 'stripe/plan'
+require 'stripe/coupon'
+require 'stripe/token'
+require 'stripe/event'
+require 'stripe/transfer'
+
+# Errors
+require 'stripe/errors/stripe_error'
+require 'stripe/errors/api_error'
+require 'stripe/errors/api_connection_error'
+require 'stripe/errors/card_error'
+require 'stripe/errors/invalid_request_error'
+require 'stripe/errors/authentication_error'
 
 module Stripe
   @@ssl_bundle_path = File.join(File.dirname(__FILE__), 'data/ca-certificates.crt')
@@ -18,513 +49,33 @@ module Stripe
   @@api_base = 'https://api.stripe.com/v1'
   @@verify_ssl_certs = true
 
-  module Util
-    def self.objects_to_ids(h)
-      case h
-      when APIResource
-        h.id
-      when Hash
-        res = {}
-        h.each { |k, v| res[k] = objects_to_ids(v) unless v.nil? }
-        res
-      when Array
-        h.map { |v| objects_to_ids(v) }
-      else
-        h
-      end
-    end
-
-    def self.convert_to_stripe_object(resp, api_key)
-      types = {
-        'charge' => Charge,
-        'customer' => Customer,
-        'invoiceitem' => InvoiceItem,
-        'invoice' => Invoice,
-        'plan' => Plan,
-        'coupon' => Coupon,
-        'event' => Event,
-        'transfer' => Transfer
-      }
-      case resp
-      when Array
-        resp.map { |i| convert_to_stripe_object(i, api_key) }
-      when Hash
-        # Try converting to a known object class.  If none available, fall back to generic APIResource
-        if klass_name = resp[:object]
-          klass = types[klass_name]
-        end
-        klass ||= StripeObject
-        klass.construct_from(resp, api_key)
-      else
-        resp
-      end
-    end
-
-    def self.file_readable(file)
-      begin
-        File.open(file) { |f| }
-      rescue
-        false
-      else
-        true
-      end
-    end
-
-    def self.symbolize_names(object)
-      case object
-      when Hash
-        new = {}
-        object.each do |key, value|
-          key = (key.to_sym rescue key) || key
-          new[key] = symbolize_names(value)
-        end
-        new
-      when Array
-        object.map { |value| symbolize_names(value) }
-      else
-        object
-      end
-    end
-
-    def self.encode_key(key)
-      URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-    end
-
-    def self.flatten_params(params, parent_key = nil)
-      result = []
-      params.each do |key, value|
-        calculated_key = parent_key ? "#{parent_key}[#{encode_key(key)}]" : encode_key(key)
-        if value.is_a? Hash
-          result += flatten_params(value, calculated_key)
-        elsif value.is_a? Array
-          result += flatten_params_array(value, calculated_key)
-        else
-          result << [calculated_key, value]
-        end
-      end
-      result
-    end
-
-    def self.flatten_params_array value, calculated_key
-      result = []
-      value.each do |elem|
-        if elem.is_a? Hash
-          result += flatten_params(elem, calculated_key)
-        elsif elem.is_a? Array
-          result += flatten_params_array(elem, calculated_key)
-        else
-          result << ["#{calculated_key}[]", elem]
-        end
-      end
-      result
-    end
+  def self.api_url(url='')
+    @@api_base + url
   end
 
-  module JSON
-    if MultiJson.respond_to?(:dump)
-      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
+  def self.api_key=(api_key)
+    @@api_key = api_key
   end
 
-  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
-
-    module Update
-      def save
-        if @unsaved_values.length > 0
-          values = {}
-          @unsaved_values.each { |k| values[k] = @values[k] }
-          response, api_key = Stripe.request(:post, url, @api_key, values)
-          refresh_from(response, api_key)
-        end
-        self
-      end
-    end
-
-    module Delete
-      def delete
-        response, api_key = Stripe.request(:delete, url, @api_key)
-        refresh_from(response, api_key)
-        self
-      end
-    end
-
-    module List
-      module ClassMethods
-        def all(filters={}, api_key=nil)
-          response, api_key = Stripe.request(:get, url, api_key, filters)
-          Util.convert_to_stripe_object(response, api_key)
-        end
-      end
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-    end
+  def self.api_key
+    @@api_key
   end
 
-  class StripeObject
-    include Enumerable
-
-    attr_accessor :api_key
-    @@permanent_attributes = Set.new([:api_key])
-
-    # The default :id method is deprecated and isn't useful to us
-    if method_defined?(:id)
-      undef :id
-    end
-
-    def initialize(id=nil, api_key=nil)
-      @api_key = api_key
-      @values = {}
-      # This really belongs in APIResource, but not putting it there allows us
-      # to have a unified inspect method
-      @unsaved_values = Set.new
-      @transient_values = Set.new
-      self.id = id if id
-    end
-
-    def self.construct_from(values, api_key=nil)
-      obj = self.new(values[:id], api_key)
-      obj.refresh_from(values, api_key)
-      obj
-    end
-
-    def to_s(*args); Stripe::JSON.dump(@values, :pretty => true); end
-
-    def inspect()
-      id_string = (self.respond_to?(:id) && !self.id.nil?) ? " id=#{self.id}" : ""
-      "#<#{self.class}:0x#{self.object_id.to_s(16)}#{id_string}> JSON: " + Stripe::JSON.dump(@values, :pretty => true)
-    end
-
-    def refresh_from(values, api_key, partial=false)
-      @api_key = api_key
-
-      removed = partial ? Set.new : Set.new(@values.keys - values.keys)
-      added = Set.new(values.keys - @values.keys)
-      # Wipe old state before setting new.  This is useful for e.g. updating a
-      # customer, where there is no persistent card parameter.  Mark those values
-      # which don't persist as transient
-
-      instance_eval do
-        remove_accessors(removed)
-        add_accessors(added)
-      end
-      removed.each do |k|
-        @values.delete(k)
-        @transient_values.add(k)
-        @unsaved_values.delete(k)
-      end
-      values.each do |k, v|
-        @values[k] = Util.convert_to_stripe_object(v, api_key)
-        @transient_values.delete(k)
-        @unsaved_values.delete(k)
-      end
-    end
-
-    def [](k)
-      k = k.to_sym if k.kind_of?(String)
-      @values[k]
-    end
-    def []=(k, v)
-      send(:"#{k}=", v)
-    end
-    def keys; @values.keys; end
-    def values; @values.values; end
-    def to_json(*a); Stripe::JSON.dump(@values); end
-    def as_json(*a); @values.as_json(*a); end
-    def to_hash; @values; end
-    def each(&blk); @values.each(&blk); end
-
-    protected
-
-    def metaclass
-      class << self; self; end
-    end
-
-    def remove_accessors(keys)
-      metaclass.instance_eval do
-        keys.each do |k|
-          next if @@permanent_attributes.include?(k)
-          k_eq = :"#{k}="
-          remove_method(k) if method_defined?(k)
-          remove_method(k_eq) if method_defined?(k_eq)
-        end
-      end
-    end
-
-    def add_accessors(keys)
-      metaclass.instance_eval do
-        keys.each do |k|
-          next if @@permanent_attributes.include?(k)
-          k_eq = :"#{k}="
-          define_method(k) { @values[k] }
-          define_method(k_eq) do |v|
-            @values[k] = v
-            @unsaved_values.add(k)
-          end
-        end
-      end
-    end
-
-    def method_missing(name, *args)
-      # TODO: only allow setting in updateable classes.
-      if name.to_s.end_with?('=')
-        attr = name.to_s[0...-1].to_sym
-        @values[attr] = args[0]
-        @unsaved_values.add(attr)
-        add_accessors([attr])
-        return
-      else
-        return @values[name] if @values.has_key?(name)
-      end
-
-      begin
-        super
-      rescue NoMethodError => e
-        if @transient_values.include?(name)
-          raise NoMethodError.new(e.message + ".  HINT: The '#{name}' attribute was set in the past, however.  It was then wiped when refreshing the object with the result returned by Stripe's API, probably as a result of a save().  The attributes currently available on this object are: #{@values.keys.join(', ')}")
-        else
-          raise
-        end
-      end
-    end
+  def self.api_base=(api_base)
+    @@api_base = api_base
   end
 
-  class APIResource < StripeObject
-    def self.url
-      if self == APIResource
-        raise NotImplementedError.new("APIResource is an abstract class.  You should perform actions on its subclasses (Charge, Customer, etc.)")
-      end
-      shortname = self.name.split('::')[-1]
-      "/#{CGI.escape(shortname.downcase)}s"
-    end
-    def url
-      id = self['id']
-      raise InvalidRequestError.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{id.inspect}", 'id') unless id
-      "#{self.class.url}/#{CGI.escape(id)}"
-    end
-
-    def refresh
-      response, api_key = Stripe.request(:get, url, @api_key)
-      refresh_from(response, api_key)
-      self
-    end
-
-    def self.retrieve(id, api_key=nil)
-      instance = self.new(id, api_key)
-      instance.refresh
-      instance
-    end
-
-    protected
-  end
-
-  class Customer < APIResource
-    include Stripe::APIOperations::Create
-    include Stripe::APIOperations::Delete
-    include Stripe::APIOperations::Update
-    include Stripe::APIOperations::List
-
-    def add_invoice_item(params)
-      InvoiceItem.create(params.merge(:customer => id), @api_key)
-    end
-
-    def invoices
-      Invoice.all({ :customer => id }, @api_key)
-    end
-
-    def invoice_items
-      InvoiceItem.all({ :customer => id }, @api_key)
-    end
-
-    def charges
-      Charge.all({ :customer => id }, @api_key)
-    end
-
-    def cancel_subscription(params={})
-      response, api_key = Stripe.request(:delete, subscription_url, @api_key, params)
-      refresh_from({ :subscription => response }, api_key, true)
-      subscription
-    end
-
-    def update_subscription(params)
-      response, api_key = Stripe.request(:post, subscription_url, @api_key, params)
-      refresh_from({ :subscription => response }, api_key, true)
-      subscription
-    end
-
-    def delete_discount
-      Stripe.request(:delete, discount_url, @api_key)
-      refresh_from({ :discount => nil }, api_key, true)
-    end
-
-    private
-
-    def discount_url
-      url + '/discount'
-    end
-
-    def subscription_url
-      url + '/subscription'
-    end
-  end
-
-  class Invoice < APIResource
-    include Stripe::APIOperations::List
-
-    def self.upcoming(params)
-      response, api_key = Stripe.request(:get, upcoming_url, @api_key, params)
-      Util.convert_to_stripe_object(response, api_key)
-    end
-
-    private
-
-    def self.upcoming_url
-      url + '/upcoming'
-    end
-  end
-
-  class InvoiceItem < APIResource
-    include Stripe::APIOperations::List
-    include Stripe::APIOperations::Create
-    include Stripe::APIOperations::Delete
-    include Stripe::APIOperations::Update
-  end
-
-  class Charge < APIResource
-    include Stripe::APIOperations::List
-    include Stripe::APIOperations::Create
-    include Stripe::APIOperations::Update
-
-    def refund(params={})
-      response, api_key = Stripe.request(:post, refund_url, @api_key, params)
-      refresh_from(response, api_key)
-      self
-    end
-
-    def capture(params={})
-      response, api_key = Stripe.request(:post, capture_url, @api_key, params)
-      refresh_from(response, api_key)
-      self
-    end
-
-    private
-
-    def refund_url
-      url + '/refund'
-    end
-
-    def capture_url
-      url + '/capture'
-    end
-  end
-
-  class Plan < APIResource
-    include Stripe::APIOperations::Create
-    include Stripe::APIOperations::Delete
-    include Stripe::APIOperations::List
-    include Stripe::APIOperations::Update
-  end
-
-  class Coupon < APIResource
-    include Stripe::APIOperations::Create
-    include Stripe::APIOperations::Delete
-    include Stripe::APIOperations::List
-  end
-
-  class Token < APIResource
-    include Stripe::APIOperations::Create
-  end
-
-  class Event < APIResource
-    include Stripe::APIOperations::List
-  end
-
-  class Transfer < APIResource
-    include Stripe::APIOperations::List
-
-    def transactions(params={})
-      response, api_key = Stripe.request(:get, transactions_url, @api_key, params)
-      Util.convert_to_stripe_object(response, api_key)
-    end
-
-    private
-
-    def transactions_url
-      url + '/transactions'
-    end
-  end
-
-  class StripeError < StandardError
-    attr_reader :message
-    attr_reader :http_status
-    attr_reader :http_body
-    attr_reader :json_body
-
-    def initialize(message=nil, http_status=nil, http_body=nil, json_body=nil)
-      @message = message
-      @http_status = http_status
-      @http_body = http_body
-      @json_body = json_body
-    end
-
-    def to_s
-      status_string = @http_status.nil? ? "" : "(Status #{@http_status}) "
-      "#{status_string}#{@message}"
-    end
+  def self.api_base
+    @@api_base
   end
 
-  class APIError < StripeError; end
-  class APIConnectionError < StripeError; end
-  class CardError < StripeError
-    attr_reader :param, :code
-
-    def initialize(message, param, code, http_status=nil, http_body=nil, json_body=nil)
-      super(message, http_status, http_body, json_body)
-      @param = param
-      @code = code
-    end
+  def self.verify_ssl_certs=(verify)
+    @@verify_ssl_certs = verify
   end
-  class InvalidRequestError < StripeError
-    attr_accessor :param
 
-    def initialize(message, param, http_status=nil, http_body=nil, json_body=nil)
-      super(message, http_status, http_body, json_body)
-      @param = param
-    end
+  def self.verify_ssl_certs
+    @@verify_ssl_certs
   end
-  class AuthenticationError < StripeError; end
-
-  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
@@ -658,10 +209,21 @@ module Stripe
     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.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