stripe 1.7.3 → 1.7.4

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 1.8.7
+  - 1.9.2
   - 1.9.3
 gemfile:
   - gemfiles/default-with-activesupport.gemfile

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stripe (1.7.3)
+    stripe (1.7.4)
       multi_json (~> 1.1)
       rest-client (~> 1.4)
 

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.7.4 2012-10-08
+
+* Fix bug introduced in 1.7.3 calling API methods that take no
+  arguments, like Stripe::Invoice#pay (github issue #42)
+
 === 1.7.3 2012-09-14
 
 * Make sure that both keys and values of GET params are

data/VERSION

@@ -1 +1 @@
-1.7.3
+1.7.4

data/lib/stripe.rb

@@ -77,7 +77,7 @@ module Stripe
     @@verify_ssl_certs
   end
 
-  def self.request(method, url, api_key, params=nil, headers={})
+  def self.request(method, url, api_key, params={}, 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
 
@@ -115,7 +115,7 @@ module Stripe
     case method.to_s.downcase.to_sym
     when :get, :head, :delete
       # Make params into GET parameters
-      if params && params.count
+      if params && params.count > 0
         query_string = Util.flatten_params(params).collect{|key, value| "#{key}=#{Util.url_encode(value)}"}.join('&')
         url += "?#{query_string}"
       end

data/lib/stripe/version.rb

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

data/test/test_helper.rb

@@ -129,6 +129,58 @@ def test_subscription(plan_id="gold")
   }
 end
 
+def test_invoice
+  {
+    :id => 'in_test_invoice',
+    :object => 'invoice',
+    :livemode => false,
+    :amount_due => 1000,
+    :attempt_count => 0,
+    :attempted => false,
+    :closed => false,
+    :currency => 'usd',
+    :customer => 'c_test_customer',
+    :date => 1349738950,
+    :lines => {
+      "invoiceitems" => [
+        {
+          :id => 'ii_test_invoice_item',
+          :object => '',
+          :livemode => false,
+          :amount => 1000,
+          :currency => 'usd',
+          :customer => 'c_test_customer',
+          :date => 1349738950,
+          :description => "A Test Invoice Item",
+          :invoice => 'in_test_invoice'
+        },
+      ],
+    },
+    :paid => false,
+    :period_end => 1349738950,
+    :period_start => 1349738950,
+    :starting_balance => 0,
+    :subtotal => 1000,
+    :total => 1000,
+    :charge => nil,
+    :discount => nil,
+    :ending_balance => nil,
+    :next_payemnt_attempt => 1349825350,
+  }
+end
+
+def test_paid_invoice
+  test_invoice.merge({
+      :attempt_count => 1,
+      :attempted => true,
+      :closed => true,
+      :paid => true,
+      :charge => 'ch_test_charge',
+      :ending_balance => 0,
+      :next_payment_attempt => nil,
+    })
+end
+
 def test_invalid_api_key_error
   {
     "error" => {

data/test/test_stripe.rb

@@ -410,7 +410,7 @@ class TestStripeRuby < Test::Unit::TestCase
           @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')))
           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("https://api.stripe.com/v1/customers/c_test_customer/subscription", nil, nil).returns(test_response(test_subscription('silver')))
           s = c.cancel_subscription
         end
 
@@ -434,6 +434,24 @@ class TestStripeRuby < Test::Unit::TestCase
           assert_equal "co_test_coupon", c.id
         end
       end
+
+      context "invoice tests" do
+        should "retrieve should retrieve invoices" do
+          @mock.expects(:get).once.returns(test_response(test_invoice))
+          i = Stripe::Invoice.retrieve('in_test_invoice')
+          assert_equal 'in_test_invoice', i.id
+        end
+
+        should "pay should pay an invoice" do
+          @mock.expects(:get).once.returns(test_response(test_invoice))
+          i = Stripe::Invoice.retrieve('in_test_invoice')
+
+          @mock.expects(:post).once.with('https://api.stripe.com/v1/invoices/in_test_invoice/pay', nil, '').returns(test_response(test_paid_invoice))
+          i.pay
+          assert_equal i.next_payment_attempt, nil
+        end
+      end
+
       context "error checking" do
 
         should "404s should raise an InvalidRequestError" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stripe
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 7
-  - 3
-  version: 1.7.3
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - Ross Boucher
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-15 00:00:00 Z
+date: 2012-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false