stripe 1.7.11 → 1.8.1

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.8.1 2013-04-19
+
+* 1 minor enhancement:
+  * Add support for specifying an API key when retrieving an upcoming invoice
+
+=== 1.8.0 2013-04-11
+
+* 1 major enhancement:
+  * Add new Recipient API resource
+  * Allow Transfers to be createable
+
 === 1.7.11 2013-02-21
 * Add 'id' to the list of permanent attributes
 

data/VERSION

@@ -1 +1 @@
-1.7.11
+1.8.1

data/lib/stripe.rb

@@ -2,10 +2,7 @@
 # API spec at https://stripe.com/docs/api
 require 'cgi'
 require 'set'
-require 'rubygems'
 require 'openssl'
-
-gem 'rest-client', '~> 1.4'
 require 'rest_client'
 require 'multi_json'
 
@@ -35,6 +32,7 @@ require 'stripe/coupon'
 require 'stripe/token'
 require 'stripe/event'
 require 'stripe/transfer'
+require 'stripe/recipient'
 
 # Errors
 require 'stripe/errors/stripe_error'
@@ -127,7 +125,7 @@ module Stripe
       # Make params into GET parameters
       if params && params.count > 0
         query_string = Util.flatten_params(params).collect{|key, value| "#{key}=#{Util.url_encode(value)}"}.join('&')
-        url += "?#{query_string}"
+        url += "#{URI.parse(url).query ? '&' : '?'}#{query_string}"
       end
       payload = nil
     else

data/lib/stripe/invoice.rb

@@ -4,8 +4,8 @@ module Stripe
     include Stripe::APIOperations::Update
     include Stripe::APIOperations::Create
 
-    def self.upcoming(params)
-      response, api_key = Stripe.request(:get, upcoming_url, @api_key, params)
+    def self.upcoming(params, api_key = nil)
+      response, api_key = Stripe.request(:get, upcoming_url, api_key, params)
       Util.convert_to_stripe_object(response, api_key)
     end
 

data/lib/stripe/recipient.rb

@@ -0,0 +1,12 @@
+module Stripe
+  class Recipient < APIResource
+    include Stripe::APIOperations::Create
+    include Stripe::APIOperations::Delete
+    include Stripe::APIOperations::Update
+    include Stripe::APIOperations::List
+
+    def transfers
+      Transfer.all({ :recipient => id }, @api_key)
+    end
+  end
+end

data/lib/stripe/transfer.rb

@@ -1,5 +1,6 @@
 module Stripe
   class Transfer < APIResource
     include Stripe::APIOperations::List
+    include Stripe::APIOperations::Create
   end
 end

data/lib/stripe/util.rb

@@ -25,6 +25,7 @@ module Stripe
         'coupon' => Coupon,
         'event' => Event,
         'transfer' => Transfer,
+        'recipient' => Recipient,
         'list' => ListObject
       }
       case resp

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.7.11'
+  VERSION = '1.8.1'
 end

data/test/test_helper.rb

@@ -189,6 +189,69 @@ def test_paid_invoice
     })
 end
 
+def test_invoice_customer_array
+  {
+    :data => [test_invoice],
+    :object => 'list',
+    :url => '/v1/invoices?customer=test_customer'
+  }
+end
+
+def test_recipient(params={})
+  {
+    :name => "Stripe User",
+    :type => "individual",
+    :livemode => false,
+    :object => "recipient",
+    :id => "rp_test_recipient",
+    :active_account => {
+      :last4 => "6789",
+      :bank_name => "STRIPE TEST BANK",
+      :country => "US",
+      :object => "bank_account"
+    },
+    :created => 1304114758,
+    :verified => true
+  }.merge(params)
+end
+
+def test_recipient_array
+  {
+    :data => [test_recipient, test_recipient, test_recipient],
+    :object => 'list',
+    :url => '/v1/recipients'
+  }
+end
+
+def test_transfer(params={})
+  {
+    :status => 'pending',
+    :amount => 100,
+    :account => {
+      :object => 'bank_account',
+      :country => 'US',
+      :bank_name => 'STRIPE TEST BANK',
+      :last4 => '6789'
+    },
+    :recipient => 'test_recipient',
+    :fee => 0,
+    :fee_details => [],
+    :id => "tr_test_transfer",
+    :livemode => false,
+    :currency => "usd",
+    :object => "transfer",
+    :date => 1304114826
+  }.merge(params)
+end
+
+def test_transfer_array
+  {
+    :data => [test_transfer, test_transfer, test_transfer],
+    :object => 'list',
+    :url => '/v1/transfers'
+  }
+end
+
 def test_invalid_api_key_error
   {
     "error" => {

data/test/test_stripe.rb

@@ -120,6 +120,15 @@ class TestStripeRuby < Test::Unit::TestCase
         assert charges.kind_of? Array
       end
 
+      should "construct URL properly with base query parameters" do
+        response = test_response(test_invoice_customer_array)
+        @mock.expects(:get).with("#{Stripe.api_base}/v1/invoices?customer=test_customer", nil, nil).returns(response)
+        invoices = Stripe::Invoice.all(:customer => 'test_customer')
+
+        @mock.expects(:get).with("#{Stripe.api_base}/v1/invoices?customer=test_customer&paid=true", nil, nil).returns(response)
+        invoices.all(:paid => true)
+      end
+
       should "a 400 should give an InvalidRequestError with http status, body, and JSON body" do
         response = test_response(test_missing_id_error, 400)
         @mock.expects(:get).once.raises(RestClient::ExceptionWithResponse.new(response, 404))
@@ -468,6 +477,89 @@ class TestStripeRuby < Test::Unit::TestCase
         end
       end
 
+      context "transfer tests" do
+
+        should "transfers should be listable" do
+          @mock.expects(:get).once.returns(test_response(test_transfer_array))
+          t = Stripe::Transfer.all
+          assert t.data.kind_of? Array
+          t.each do |transfer|
+            assert transfer.kind_of?(Stripe::Transfer)
+          end
+        end
+
+        should "transfers should not be deletable" do
+          assert_raises NoMethodError do
+            @mock.expects(:get).once.returns(test_response(test_transfer))
+            t = Stripe::Transfer.retrieve("test_transfer")
+            t.delete
+          end
+        end
+
+        should "transfers should have BankAccount objects associated with their account property" do
+          @mock.expects(:get).once.returns(test_response(test_transfer))
+          t = Stripe::Transfer.retrieve("test_transfer")
+          assert t.account.kind_of?(Stripe::StripeObject) && t.account.object == 'bank_account'
+        end
+
+        should "create a transfer should return a new transfer when passed correct parameters" do
+          @mock.expects(:post).with do |url, api_key, params|
+            url == "#{Stripe.api_base}/v1/transfers" && api_key.nil? && CGI.parse(params) == {
+              'currency' => ['usd'], 'amount' => ['100'],
+              'recipient' => ['test_recipient']
+            }
+          end.once.returns(test_response(test_transfer))
+
+          t = Stripe::Transfer.create({
+            :amount => 100,
+            :currency => "usd",
+            :recipient => "test_recipient"
+          })
+
+          assert_equal 'pending', t.status
+        end
+
+      end
+
+      context "recipient tests" do
+
+        should "recipients should be listable" do
+          @mock.expects(:get).once.returns(test_response(test_recipient_array))
+          r = Stripe::Recipient.all.data
+          assert r.kind_of? Array
+          assert r[0].kind_of? Stripe::Recipient
+        end
+
+        should "recipients should be deletable" do
+          @mock.expects(:delete).once.returns(test_response(test_recipient({:deleted => true})))
+          r = Stripe::Recipient.new("test_recipient")
+          r.delete
+          assert r.deleted
+        end
+
+        should "recipients should be updateable" do
+          @mock.expects(:get).once.returns(test_response(test_recipient({:description => "foo"})))
+          @mock.expects(:post).once.returns(test_response(test_recipient({:description => "bar"})))
+          r = Stripe::Recipient.new("test_recipient").refresh
+          assert_equal r.description, "foo"
+          r.description = "bar"
+          r.save
+          assert_equal r.description, "bar"
+        end
+
+        should "recipients should have BankAccount objects associated with their active_account property" do
+          @mock.expects(:get).once.returns(test_response(test_recipient))
+          r = Stripe::Recipient.retrieve("test_recipient")
+          assert r.active_account.kind_of?(Stripe::StripeObject) && r.active_account.object == 'bank_account'
+        end
+
+        should "create should return a new recipient" do
+          @mock.expects(:post).once.returns(test_response(test_recipient))
+          r = Stripe::Recipient.create(:name => 'Stripe User', :type => 'individual')
+          assert_equal "rp_test_recipient", r.id
+        end
+      end
+
       context "error checking" do
 
         should "404s should raise an InvalidRequestError" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70357453615120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,15 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70357453615120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70357453614600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +41,18 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70357453614600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70357453613960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,10 +60,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357453613960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70357453613500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -58,10 +76,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357453613500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70357453613080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,10 +92,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357453613080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70357453612660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -80,7 +108,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70357453612660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stripe is the easiest way to accept payments online.  See https://stripe.com
   for details.
 email:
@@ -127,6 +160,7 @@ files:
 - lib/stripe/json.rb
 - lib/stripe/list_object.rb
 - lib/stripe/plan.rb
+- lib/stripe/recipient.rb
 - lib/stripe/singleton_api_resource.rb
 - lib/stripe/stripe_object.rb
 - lib/stripe/token.rb
@@ -157,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for the Stripe API