stripe 1.8.3 → 1.8.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.8.3 2013-07-11
+
+* Add support for new cards API (Stripe API version 2013-07-05)
+
 === 1.8.3 2013-05-06
 
 * 1 bugfix:

data/VERSION

@@ -1 +1 @@
-1.8.3
+1.8.4

data/gemfiles/default-with-activesupport.gemfile

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

data/gemfiles/json.gemfile

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

data/gemfiles/yajl.gemfile

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

data/lib/stripe.rb

@@ -33,6 +33,7 @@ require 'stripe/token'
 require 'stripe/event'
 require 'stripe/transfer'
 require 'stripe/recipient'
+require 'stripe/card'
 
 # Errors
 require 'stripe/errors/stripe_error'

data/lib/stripe/card.rb

@@ -0,0 +1,14 @@
+module Stripe
+  class Card < APIResource
+    include Stripe::APIOperations::Update
+    include Stripe::APIOperations::Delete
+
+    def url
+      "#{Customer.url}/#{CGI.escape(customer)}/cards/#{CGI.escape(id)}"
+    end
+
+    def self.retrieve(id, api_key=nil)
+      raise NotImplementedError.new("Cards cannot be retrieved without a customer ID. Retrieve a card using customer.cards.retrieve('card_id')")
+    end
+  end
+end

data/lib/stripe/list_object.rb

@@ -1,14 +1,35 @@
 module Stripe
   class ListObject < StripeObject
 
+    def [](k)
+      case k
+      when String, Symbol
+        super
+      else
+        raise ArgumentError.new("You tried to access the #{k.inspect} index, but ListObject types only support String keys. (HINT: List calls return an object with a 'data' (which is the data array). You likely want to call #data[#{k.inspect}])")
+      end
+    end
+
     def each(&blk)
       self.data.each(&blk)
     end
 
-    def all(filters={})
-      response, api_key = Stripe.request(:get, url, api_key, filters)
+    def retrieve(id, api_key=nil)
+      api_key ||= @api_key
+      response, api_key = Stripe.request(:get,"#{url}/#{CGI.escape(id)}", api_key)
       Util.convert_to_stripe_object(response, api_key)
     end
 
+    def create(params={}, api_key=nil)
+      api_key ||= @api_key
+      response, api_key = Stripe.request(:post, url, api_key, params)
+      Util.convert_to_stripe_object(response, api_key)
+    end
+
+    def all(params={}, api_key=nil)
+      api_key ||= @api_key
+      response, api_key = Stripe.request(:get, url, api_key, params)
+      Util.convert_to_stripe_object(response, api_key)
+    end
   end
 end

data/lib/stripe/util.rb

@@ -15,8 +15,8 @@ module Stripe
       end
     end
 
-    def self.convert_to_stripe_object(resp, api_key)
-      types = {
+    def self.object_classes
+      @object_classes ||= {
         'charge' => Charge,
         'customer' => Customer,
         'invoiceitem' => InvoiceItem,
@@ -26,24 +26,27 @@ module Stripe
         'event' => Event,
         'transfer' => Transfer,
         'recipient' => Recipient,
+        'card' => Card,
         'list' => ListObject
       }
+    end
+
+    def self.convert_to_stripe_object(resp, api_key)
       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)
+        # Try converting to a known object class.  If none available, fall back to generic StripeObject
+        object_classes.fetch(resp[:object], StripeObject).construct_from(resp, api_key)
       else
         resp
       end
     end
 
     def self.file_readable(file)
+      # This is nominally equivalent to File.readable?, but that can
+      # report incorrect results on some more oddball filesystems
+      # (such as AFS)
       begin
         File.open(file) { |f| }
       rescue

data/lib/stripe/version.rb

@@ -1,3 +1,3 @@
 module Stripe
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 end

data/stripe.gemspec

@@ -16,8 +16,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('rest-client', '~> 1.4')
   s.add_dependency('multi_json', '>= 1.0.4', '< 2')
 
-  s.add_development_dependency('mocha')
-  s.add_development_dependency('shoulda')
+  s.add_development_dependency('mocha', '~> 0.13.2')
+  s.add_development_dependency('shoulda', '~> 3.4.0')
   s.add_development_dependency('test-unit')
   s.add_development_dependency('rake')
 

data/test/test_helper.rb

@@ -1,11 +1,11 @@
 require 'stringio'
 require 'test/unit'
 require 'stripe'
-require 'mocha'
+require 'mocha/setup'
 include Mocha
 
 #monkeypatch request methods
-module Stripe   
+module Stripe
   @mock_rest_client = nil
 
   def self.mock_rest_client=(mock_client)
@@ -42,16 +42,9 @@ def test_customer(params={})
     :livemode => false,
     :object => "customer",
     :id => "c_test_customer",
-    :active_card => {
-      :type => "Visa",
-      :last4 => "4242",
-      :exp_month => 11,
-      :country => "US",
-      :exp_year => 2012,
-      :id => "cc_test_card",
-      :object => "card"
-    },
-    :created => 1304114758
+    :default_card => "cc_test_card",
+    :created => 1304114758,
+    :cards => test_card_array('c_test_customer')
   }.merge(params)
 end
 
@@ -88,12 +81,20 @@ 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_array(customer_id)
+  {
+    :data => [test_card, test_card, test_card],
+    :object => 'list',
+    :url => '/v1/customers/' + customer_id + '/cards'
+  }
+end
+
 def test_card(params={})
   {
     :type => "Visa",
@@ -102,7 +103,8 @@ def test_card(params={})
     :country => "US",
     :exp_year => 2012,
     :id => "cc_test_card",
-    :object => "card"    
+    :customer => 'c_test_customer',
+    :object => "card"
   }.merge(params)
 end
 
@@ -112,7 +114,7 @@ def test_coupon(params={})
     :duration_in_months => 3,
     :percent_off => 25,
     :id => "co_test_coupon",
-    :object => "coupon"    
+    :object => "coupon"
   }.merge(params)
 end
 

data/test/test_stripe.rb

@@ -2,7 +2,7 @@
 require File.expand_path('../test_helper', __FILE__)
 require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'mocha/setup'
 require 'pp'
 require 'rest-client'
 require 'cgi'
@@ -454,12 +454,6 @@ class TestStripeRuby < Test::Unit::TestCase
           assert_equal c.mnemonic, "bar"
         end
 
-        should "customers should have Card objects associated with their active_ard property" do
-          @mock.expects(:get).once.returns(test_response(test_customer))
-          c = Stripe::Customer.retrieve("test_customer")
-          assert c.active_card.kind_of?(Stripe::StripeObject) && c.active_card.object == 'card'
-        end
-
         should "create should return a new customer" do
           @mock.expects(:post).once.returns(test_response(test_customer))
           c = Stripe::Customer.create
@@ -512,8 +506,51 @@ class TestStripeRuby < Test::Unit::TestCase
       end
 
       context "card tests" do
+        should "be able to create a new card for a customer" do
+          @mock.expects(:get).once.returns(test_response(test_customer))
+          customer = Stripe::Customer.retrieve("test_customer")
+
+          @mock.expects(:post).once.returns(test_response(test_card))
+          card = customer.cards.create(:card => 'card')
+          assert card.kind_of? Stripe::Card
+        end
+
+        should "be able to retrieve a card for a customer" do
+          @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).returns(test_response(test_customer))
+          customer = Stripe::Customer.retrieve("c_test_customer")
+
+          @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/cards/cc_test_card", nil, nil).returns(test_response(test_card))
+          card = customer.cards.retrieve("cc_test_card")
+          assert card.kind_of? Stripe::Card
+        end
+
+        should "be able to list all cards for a customer" do
+          @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).returns(test_response(test_customer))
+          customer = Stripe::Customer.retrieve("c_test_customer")
+
+          @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/cards", nil, nil).returns(test_response(test_card_array("c_test_customer")))
+          cards = customer.cards.all()
+          assert cards.data.kind_of? Array
+          cards.each do |card|
+            assert card.kind_of?(Stripe::Card)
+          end
+        end
+
+        should "be able to update a card for a customer" do
+          @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer", nil, nil).returns(test_response(test_customer))
+          customer = Stripe::Customer.retrieve("c_test_customer")
+          @mock.expects(:get).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/cards/cc_test_card", nil, nil).returns(test_response(test_card))
+          card = customer.cards.retrieve("cc_test_card")
+
+          @mock.expects(:post).once.with("#{Stripe.api_base}/v1/customers/c_test_customer/cards/cc_test_card", nil, "address_zip=zippy").returns(test_response(test_card(:address_zip => 'zippy')))
+          card.address_zip = "zippy"
+          card.save
+
+          assert_equal "zippy", card.address_zip
+        end
       end
 
+
       context "coupon tests" do
         should "create should return a new coupon" do
           @mock.expects(:post).once.returns(test_response(test_coupon))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -55,33 +55,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/stripe/api_operations/list.rb
 - lib/stripe/api_operations/update.rb
 - lib/stripe/api_resource.rb
+- lib/stripe/card.rb
 - lib/stripe/charge.rb
 - lib/stripe/coupon.rb
 - lib/stripe/customer.rb
@@ -199,4 +200,3 @@ test_files:
 - test/test_helper.rb
 - test/test_stripe.rb
 - test/test_stripe_with_active_support.rb
-has_rdoc: