stripe 1.7.4 → 1.7.6

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.7.6 2012-10-30
+* Add support for creating invoices.
+
+=== 1.7.5 2012-10-25
+* Add support for new API lists.
+
 === 1.7.4 2012-10-08
 
 * Fix bug introduced in 1.7.3 calling API methods that take no
@@ -56,7 +62,7 @@
 * A whole bunch of releases between 1.5.0 and 1.6.0, but few changes, mainly the addition of:
   - plans
   - coupons
-  - events 
+  - events
   - tokens
 * 1.6.0 also contains a new inspect/to_string implementation
 

data/VERSION

@@ -1 +1 @@
-1.7.4
+1.7.6

data/lib/stripe.rb

@@ -24,6 +24,7 @@ require 'stripe/json'
 require 'stripe/stripe_object'
 require 'stripe/api_resource'
 require 'stripe/singleton_api_resource'
+require 'stripe/list_object'
 require 'stripe/account'
 require 'stripe/customer'
 require 'stripe/invoice'
@@ -46,7 +47,7 @@ require 'stripe/errors/authentication_error'
 module Stripe
   @@ssl_bundle_path = File.join(File.dirname(__FILE__), 'data/ca-certificates.crt')
   @@api_key = nil
-  @@api_base = 'https://api.stripe.com/v1'
+  @@api_base = 'https://api.stripe.com'
   @@verify_ssl_certs = true
 
   def self.api_url(url='')

data/lib/stripe/api_resource.rb

@@ -8,7 +8,7 @@ module Stripe
       if self == APIResource
         raise NotImplementedError.new('APIResource is an abstract class.  You should perform actions on its subclasses (Charge, Customer, etc.)')
       end
-      "/#{CGI.escape(class_name.downcase)}s"
+      "/v1/#{CGI.escape(class_name.downcase)}s"
     end
 
     def url

data/lib/stripe/invoice.rb

@@ -2,6 +2,7 @@ module Stripe
   class Invoice < APIResource
     include Stripe::APIOperations::List
     include Stripe::APIOperations::Update
+    include Stripe::APIOperations::Create
 
     def self.upcoming(params)
       response, api_key = Stripe.request(:get, upcoming_url, @api_key, params)

data/lib/stripe/list_object.rb

@@ -0,0 +1,14 @@
+module Stripe
+  class ListObject < StripeObject
+
+    def each(&blk)
+      self.data.each(&blk)
+    end
+
+    def all(filters={})
+      response, api_key = Stripe.request(:get, url, api_key, filters)
+      Util.convert_to_stripe_object(response, api_key)
+    end
+
+  end
+end

data/lib/stripe/transfer.rb

@@ -1,16 +1,5 @@
 module Stripe
   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
 end

data/lib/stripe/util.rb

@@ -24,7 +24,8 @@ module Stripe
         'plan' => Plan,
         'coupon' => Coupon,
         'event' => Event,
-        'transfer' => Transfer
+        'transfer' => Transfer,
+        'list' => ListObject
       }
       case resp
       when Array

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.7.4'
+  VERSION = '1.7.6'
 end

data/test/test_helper.rb

@@ -56,7 +56,11 @@ def test_customer(params={})
 end
 
 def test_customer_array
-  {:data => [test_customer, test_customer, test_customer]}
+  {
+    :data => [test_customer, test_customer, test_customer],
+    :object => 'list',
+    :url => '/v1/customers'
+  }
 end
 
 def test_charge(params={})
@@ -83,7 +87,11 @@ def test_charge(params={})
 end
 
 def test_charge_array
-  {:data => [test_charge, test_charge, test_charge]}
+  {
+    :data => [test_charge, test_charge, test_charge], 
+    :object => 'list',
+    :url => '/v1/charges'
+  }
 end
 
 def test_card(params={})

data/test/test_stripe.rb

@@ -115,7 +115,7 @@ class TestStripeRuby < Test::Unit::TestCase
 
       should "urlencode values in GET params" do
         response = test_response(test_charge_array)
-        @mock.expects(:get).with('https://api.stripe.com/v1/charges?customer=test%20customer', nil, nil).returns(response)
+        @mock.expects(:get).with("#{Stripe.api_base}/v1/charges?customer=test%20customer", nil, nil).returns(response)
         charges = Stripe::Charge.all(:customer => 'test customer').data
         assert charges.kind_of? Array
       end
@@ -172,20 +172,20 @@ class TestStripeRuby < Test::Unit::TestCase
         @mock.expects(:get).with do |url, api_key, params|
           uri = URI(url)
           query = CGI.parse(uri.query)
-          (url =~ %r{^https://api.stripe.com/v1/charges?} &&
+          (url =~ %r{^#{Stripe.api_base}/v1/charges?} &&
            query.keys.sort == ['offset', 'sad'])
         end.returns(test_response({ :count => 1, :data => [test_charge] }))
         c = Stripe::Charge.all(:count => nil, :offset => 5, :sad => false)
 
         @mock.expects(:post).with do |url, api_key, params|
-          url == 'https://api.stripe.com/v1/charges' && api_key.nil? && CGI.parse(params) == { 'amount' => ['50'], 'currency' => ['usd'] }
+          url == "#{Stripe.api_base}/v1/charges" && api_key.nil? && CGI.parse(params) == { 'amount' => ['50'], 'currency' => ['usd'] }
         end.returns(test_response({ :count => 1, :data => [test_charge] }))
         c = Stripe::Charge.create(:amount => 50, :currency => 'usd', :card => { :number => nil })
       end
 
       should "requesting with a unicode ID should result in a request" do
         response = test_response(test_missing_id_error, 404)
-        @mock.expects(:get).once.with("https://api.stripe.com/v1/customers/%E2%98%83", nil, nil).raises(RestClient::ExceptionWithResponse.new(response, 404))
+        @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/%E2%98%83", nil, nil).raises(RestClient::ExceptionWithResponse.new(response, 404))
         c = Stripe::Customer.new("☃")
         assert_raises(Stripe::InvalidRequestError) { c.refresh }
       end
@@ -197,7 +197,7 @@ class TestStripeRuby < Test::Unit::TestCase
 
       should "making a GET request with parameters should have a query string and no body" do
         params = { :limit => 1 }
-        @mock.expects(:get).once.with("https://api.stripe.com/v1/charges?limit=1", nil, nil).returns(test_response([test_charge]))
+        @mock.expects(:get).once.with("#{Stripe.api_base}/v1/charges?limit=1", nil, nil).returns(test_response([test_charge]))
         c = Stripe::Charge.all(params)
       end
 
@@ -233,7 +233,7 @@ class TestStripeRuby < Test::Unit::TestCase
 
       should "updating an object should issue a POST request with only the changed properties" do
         @mock.expects(:post).with do |url, api_key, params|
-          url == "https://api.stripe.com/v1/customers/c_test_customer" && api_key.nil? && CGI.parse(params) == {'mnemonic' => ['another_mn']}
+          url == "#{Stripe.api_base}/v1/customers/c_test_customer" && api_key.nil? && CGI.parse(params) == {'mnemonic' => ['another_mn']}
         end.once.returns(test_response(test_customer))
         c = Stripe::Customer.construct_from(test_customer)
         c.mnemonic = "another_mn"
@@ -251,7 +251,7 @@ class TestStripeRuby < Test::Unit::TestCase
       should "deleting should send no props and result in an object that has no props other deleted" do
         @mock.expects(:get).never
         @mock.expects(:post).never
-        @mock.expects(:delete).with("https://api.stripe.com/v1/customers/c_test_customer", nil, nil).once.returns(test_response({ "id" => "test_customer", "deleted" => true }))
+        @mock.expects(:delete).with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).once.returns(test_response({ "id" => "test_customer", "deleted" => true }))
 
         c = Stripe::Customer.construct_from(test_customer)
         c.delete
@@ -287,12 +287,28 @@ class TestStripeRuby < Test::Unit::TestCase
         end
       end
 
+      context "list tests" do
+        should "be able to retrieve full lists given a listobject" do
+          @mock.expects(:get).twice.returns(test_response(test_charge_array))
+          c = Stripe::Charge.all
+          assert c.kind_of?(Stripe::ListObject)
+          assert_equal('/v1/charges', c.url)
+          all = c.all
+          assert all.kind_of?(Stripe::ListObject)
+          assert_equal('/v1/charges', all.url)
+          assert all.data.kind_of?(Array)
+        end
+      end
+
       context "charge tests" do
 
         should "charges should be listable" do
           @mock.expects(:get).once.returns(test_response(test_charge_array))
-          c = Stripe::Charge.all.data
-          assert c.kind_of? Array
+          c = Stripe::Charge.all
+          assert c.data.kind_of? Array
+          c.each do |charge|
+            assert charge.kind_of?(Stripe::Charge)
+          end
         end
 
         should "charges should be refundable" do
@@ -328,7 +344,7 @@ class TestStripeRuby < Test::Unit::TestCase
 
         should "execute should return a new, fully executed charge when passed correct parameters" do
           @mock.expects(:post).with do |url, api_key, params|
-            url == 'https://api.stripe.com/v1/charges' && api_key.nil? && CGI.parse(params) == {
+            url == "#{Stripe.api_base}/v1/charges" && api_key.nil? && CGI.parse(params) == {
               'currency' => ['usd'], 'amount' => ['100'],
               'card[exp_year]' => ['2012'],
               'card[number]' => ['4242424242424242'],
@@ -393,7 +409,7 @@ class TestStripeRuby < Test::Unit::TestCase
           c = Stripe::Customer.retrieve("test_customer")
 
           @mock.expects(:post).once.with do |url, api_key, params|
-            url == "https://api.stripe.com/v1/customers/c_test_customer/subscription" && api_key.nil? && CGI.parse(params) == {'plan' => ['silver']}
+            url == "#{Stripe.api_base}/v1/customers/c_test_customer/subscription" && api_key.nil? && CGI.parse(params) == {'plan' => ['silver']}
           end.returns(test_response(test_subscription('silver')))
           s = c.update_subscription({:plan => 'silver'})
 
@@ -407,10 +423,10 @@ class TestStripeRuby < Test::Unit::TestCase
 
           # Not an accurate response, but whatever
           
-          @mock.expects(:delete).once.with("https://api.stripe.com/v1/customers/c_test_customer/subscription?at_period_end=true", nil, nil).returns(test_response(test_subscription('silver')))
+          @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscription?at_period_end=true", nil, nil).returns(test_response(test_subscription('silver')))
           s = c.cancel_subscription({:at_period_end => 'true'})
 
-          @mock.expects(:delete).once.with("https://api.stripe.com/v1/customers/c_test_customer/subscription", nil, nil).returns(test_response(test_subscription('silver')))
+          @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/subscription", nil, nil).returns(test_response(test_subscription('silver')))
           s = c.cancel_subscription
         end
 
@@ -418,7 +434,7 @@ class TestStripeRuby < Test::Unit::TestCase
           @mock.expects(:get).once.returns(test_response(test_customer))
           c = Stripe::Customer.retrieve("test_customer")
 
-          @mock.expects(:delete).once.with("https://api.stripe.com/v1/customers/c_test_customer/discount", nil, nil).returns(test_response(test_delete_discount_response))
+          @mock.expects(:delete).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/discount", nil, nil).returns(test_response(test_delete_discount_response))
           s = c.delete_discount
           assert_equal nil, c.discount
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stripe
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 1
   - 7
-  - 4
-  version: 1.7.4
+  - 6
+  version: 1.7.6
 platform: ruby
 authors: 
 - Ross Boucher
@@ -16,12 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-09 00:00:00 Z
+date: 2012-10-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rest-client
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +29,12 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  requirement: *id001
+  name: rest-client
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id001
   prerelease: false
-  name: multi_json
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +44,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id002
+  name: multi_json
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
   prerelease: false
-  name: mocha
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: mocha
   type: :development
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
   prerelease: false
-  name: shoulda
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  name: shoulda
   type: :development
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id004
   prerelease: false
-  name: test-unit
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  name: test-unit
   type: :development
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id005
   prerelease: false
-  name: rake
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -102,8 +100,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: rake
   type: :development
+  version_requirements: *id006
+  prerelease: false
 description: Stripe is the easiest way to accept payments online.  See https://stripe.com for details.
 email: 
 - boucher@stripe.com
@@ -153,6 +153,7 @@ files:
 - lib/stripe/invoice.rb
 - lib/stripe/invoice_item.rb
 - lib/stripe/json.rb
+- lib/stripe/list_object.rb
 - lib/stripe/plan.rb
 - lib/stripe/singleton_api_resource.rb
 - lib/stripe/stripe_object.rb