gocardless 1.8.0 → 1.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ed8ff8ba2e1109b3ec370bd8c52e2d1f2dc0ae70
+  data.tar.gz: 4321b58cabecafefbf4a5257ae6ee6e218d49364
+SHA512:
+  metadata.gz: f8594375ca0b9ea638fedf5d2fc4ef137b81b791e2248307277eb4459e941b1606abd49f53e86a4829acd2fd3f09d72ca5a3fd5dbaadda148784d65df24d6a0e
+  data.tar.gz: c92b6f3708f2595533dcc368f904fbd83593f8eabf7059b8b9955cfe5bb964792335e584fd129da8b150773f1c0e9a317e70948a374974682ec12c69d23bd214

data/.travis.yml

@@ -1,13 +1,13 @@
 script: "rake spec"
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
   - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
-  - ruby-head
+  - rbx-2
   - ree
 notifications:
   email:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.9.0 - May 23, 2014
+
+- Add ability to refund bills
+- Add ability to cancel bills
+- Add Payout API support
+- Stop using the deprecated OpenSSL::Digest::Digest
+
 ## 1.8.0 - June 12, 2013
 
 - Add Client#api_delete

data/README.md

@@ -11,5 +11,4 @@ you want to support multiple merchant accounts, see the
 The full API reference is available at on
 [rubydoc.info](http://rubydoc.info/github/gocardless/gocardless-ruby/master/frames).
 
-[![Build Status](https://secure.travis-ci.org/gocardless/gocardless-ruby.png?branch=master)](http://travis-ci.org/gocardless/gocardless-ruby)
-
+[![Build Status](https://secure.travis-ci.org/gocardless/gocardless-ruby.png?branch=master)](http://travis-ci.org/gocardless/gocardless-ruby) [![Gem Version](https://badge.fury.io/rb/gocardless.svg)](http://badge.fury.io/rb/gocardless)

data/gocardless.gemspec

@@ -4,9 +4,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'oauth2', '~> 0.7'
   gem.add_runtime_dependency 'multi_json', '~> 1.0'
 
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'mocha', '~> 0.9.12'
-  gem.add_development_dependency 'yard', '~> 0.7.3'
+  gem.add_development_dependency 'rspec', '~> 2.13'
+  gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'activesupport', '~> 3.1'
   gem.add_development_dependency 'rake', '~> 10.0'
 
@@ -20,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.summary = %q{Ruby wrapper for the GoCardless API}
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.version = GoCardless::VERSION.dup
+  gem.licenses = ['MIT']
 end

data/lib/gocardless.rb

@@ -10,6 +10,7 @@ module GoCardless
   require 'gocardless/payment'
   require 'gocardless/merchant'
   require 'gocardless/client'
+  require 'gocardless/payout'
 
   class << self
     attr_accessor :environment

data/lib/gocardless/bill.rb

@@ -17,7 +17,7 @@ module GoCardless
     # @return [String] the ID of the bill's source (eg subscription, pre_authorization)
     attr_accessor :source_id
 
-    reference_accessor :merchant_id, :user_id, :payment_id
+    reference_accessor :merchant_id, :user_id, :payment_id, :payout_id
     date_accessor :created_at, :paid_at
 
     def source
@@ -40,6 +40,20 @@ module GoCardless
       client.api_post(path)
     end
 
+    def cancel!
+      path = self.class.endpoint.gsub(':id', id.to_s) + '/cancel'
+      client.api_put(path)
+    end
+
+    # The ability to refund a payment is disabled by default.
+    #
+    # Please contact help@gocardless.com if you require access to 
+    # the refunds API endpoint.
+    def refund!
+      path = self.class.endpoint.gsub(':id', id.to_s) + '/refund'
+      client.api_post(path)
+    end
+
     def save
       save_data({
         :bill => {

data/lib/gocardless/client.rb

@@ -195,7 +195,8 @@ module GoCardless
     # Create a new bill under a given pre-authorization
     # @see PreAuthorization#create_bill
     #
-    # @param [Hash] attrs must include +:pre_authorization_id+ and +:amount+
+    # @param [Hash] attrs must include +:source_id+ (the id of the
+    # pre_authorization you want to bill from) and +:amount+
     # @return [Bill] the created bill object
     def create_bill(attrs)
       Bill.new_with_client(self, attrs).save

data/lib/gocardless/payout.rb

@@ -0,0 +1,11 @@
+module GoCardless
+  class Payout < Resource
+    self.endpoint = '/payouts/:id'
+
+    attr_accessor :amount,
+                  :bank_reference,
+                  :transaction_fees
+
+    date_accessor :created_at, :paid_at
+  end
+end

data/lib/gocardless/utils.rb

@@ -90,7 +90,7 @@ module GoCardless
     # @return [String] the resulting signature
     def sign_params(params, key)
       msg = Utils.normalize_params(params)
-      digest = OpenSSL::Digest::Digest.new('sha256')
+      digest = OpenSSL::Digest.new('sha256')
       OpenSSL::HMAC.hexdigest(digest, key, msg)
     end
 

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.9.0'.freeze
 end

data/spec/bill_spec.rb

@@ -28,56 +28,68 @@ describe GoCardless::Bill do
 
   it "should be able to be retried" do
     b = GoCardless::Bill.new(:id => 123)
-    @client.expects(:api_post).with('/bills/123/retry')
+    @client.should_receive(:api_post).with('/bills/123/retry')
     b.retry!
   end
 
+  it "should be able to be cancelled" do
+    b = GoCardless::Bill.new(:id => 123)
+    @client.should_receive(:api_put).with('/bills/123/cancel')
+    b.cancel!
+  end
+
+  it "should be able to be refunded" do
+    b = GoCardless::Bill.new(:id => 123)
+    @client.should_receive(:api_post).with('/bills/123/refund')
+    b.refund!
+  end
+
   describe "pending query method" do
-    it "returns true when the subscription status is pending" do
+    it "and_return true when the subscription status is pending" do
       GoCardless::Bill.new(:status => 'pending').pending?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Bill.new.pending?.should be_false
     end
   end
 
   describe "paid query method" do
-    it "returns true when the subscription status is paid" do
+    it "and_return true when the subscription status is paid" do
       GoCardless::Bill.new(:status => 'paid').paid?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Bill.new.paid?.should be_false
     end
   end
 
   describe "failed query method" do
-    it "returns true when the subscription status is failed" do
+    it "and_return true when the subscription status is failed" do
       GoCardless::Bill.new(:status => 'failed').failed?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Bill.new.failed?.should be_false
     end
   end
 
   describe "withdrawn query method" do
-    it "returns true when the subscription status is withdrawn" do
+    it "and_return true when the subscription status is withdrawn" do
       GoCardless::Bill.new(:status => 'withdrawn').withdrawn?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Bill.new.withdrawn?.should be_false
     end
   end
 
   describe "refunded query method" do
-    it "returns true when the subscription status is refunded" do
+    it "and_return true when the subscription status is refunded" do
       GoCardless::Bill.new(:status => 'refunded').refunded?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Bill.new.refunded?.should be_false
     end
   end

data/spec/client_spec.rb

@@ -8,17 +8,17 @@ describe GoCardless::Client do
   end
 
   describe ".base_url" do
-    it "returns the correct url for the production environment" do
+    it "and_return the correct url for the production environment" do
       GoCardless.environment = :production
       GoCardless::Client.base_url.should == 'https://gocardless.com'
     end
 
-    it "returns the correct url for the sandbox environment" do
+    it "and_return the correct url for the sandbox environment" do
       GoCardless.environment = :sandbox
       GoCardless::Client.base_url.should == 'https://sandbox.gocardless.com'
     end
 
-    it "returns the correct url when it's set manually" do
+    it "and_return the correct url when it's set manually" do
       GoCardless::Client.base_url = 'https://abc.gocardless.com'
       GoCardless::Client.base_url.should == 'https://abc.gocardless.com'
     end
@@ -38,8 +38,8 @@ describe GoCardless::Client do
     end
 
     it "does not raise an error if the credentials are provided as environment variables" do
-      ENV.expects(:[]).with('GOCARDLESS_APP_ID').returns(@app_id)
-      ENV.expects(:[]).with('GOCARDLESS_APP_SECRET').returns(@app_secret)
+      ENV.should_receive(:[]).with('GOCARDLESS_APP_ID').and_return(@app_id)
+      ENV.should_receive(:[]).with('GOCARDLESS_APP_SECRET').and_return(@app_secret)
 
       GoCardless::Client.new
     end
@@ -104,14 +104,14 @@ describe GoCardless::Client do
         stub(:params => {'scope' => 'manage_merchant:x'}, :token  => 'abc')
       end
 
-      before { oauth_client.auth_code.stubs(:get_token).returns(fake_token) }
+      before { oauth_client.auth_code.stub(:get_token).and_return(fake_token) }
 
       it "calls correct method with correct args" do
         auth_code = 'fakecode'
 
-        oauth_client.auth_code.expects(:get_token).with(
-          auth_code, has_entry(:redirect_uri => @redirect_uri)
-        ).returns(fake_token)
+        oauth_client.auth_code.should_receive(:get_token).with(
+          auth_code, hash_including(:redirect_uri => @redirect_uri)
+        ).and_return(fake_token)
 
         @client.fetch_access_token(auth_code, {:redirect_uri => @redirect_uri})
       end
@@ -140,13 +140,13 @@ describe GoCardless::Client do
       @client.access_token.should == 'TOKEN123 a:1 b:2'
     end
 
-    it "returns nil when there's no token" do
+    it "and_return nil when there's no token" do
       @client.access_token.should be_nil
     end
   end
 
   describe "#access_token=" do
-    before { @client.stubs(:warn) }
+    before { @client.stub(:warn) }
 
     it "deserializes access token correctly" do
       @client.access_token = 'TOKEN123 a:1 b:2'
@@ -161,12 +161,12 @@ describe GoCardless::Client do
     end
 
     it "issues a deprecation warning when the scope is present" do
-      @client.expects(:warn)
+      @client.should_receive(:warn)
       @client.access_token = 'TOKEN123 manage_merchant:xyz'
     end
 
     it "doesn't issue a deprecation warning when the scope is missing" do
-      @client.expects(:warn).never
+      @client.should_receive(:warn).never
       @client.access_token = 'TOKEN123'
     end
 
@@ -183,8 +183,8 @@ describe GoCardless::Client do
       @client.access_token = 'TOKEN123'
       token = @client.instance_variable_get(:@access_token)
       r = mock
-      r.stubs(:parsed)
-      token.expects(:get).with { |p,o| p =~ %r|/api/v1/test| }.returns(r)
+      r.stub(:parsed)
+      token.should_receive(:get).with { |p,o| p =~ %r|/api/v1/test| }.and_return(r)
       @client.api_get('/test')
     end
 
@@ -198,8 +198,8 @@ describe GoCardless::Client do
       @client.access_token = 'TOKEN123'
       token = @client.instance_variable_get(:@access_token)
       r = mock
-      r.stubs(:parsed)
-      token.expects(:post).with { |p,opts| opts[:body] == '{"a":1}' }.returns(r)
+      r.stub(:parsed)
+      token.should_receive(:post).with { |p,opts| opts[:body] == '{"a":1}' }.and_return(r)
       @client.api_post('/test', {:a => 1})
     end
 
@@ -213,8 +213,8 @@ describe GoCardless::Client do
       @client.access_token = 'TOKEN123'
       token = @client.instance_variable_get(:@access_token)
       r = mock
-      r.stubs(:parsed)
-      token.expects(:delete).with { |p,opts| opts[:body] == '{"a":1}' }.returns(r)
+      r.stub(:parsed)
+      token.should_receive(:delete).with { |p,opts| opts[:body] == '{"a":1}' }.and_return(r)
       @client.api_delete('/test', {:a => 1})
     end
 
@@ -228,13 +228,13 @@ describe GoCardless::Client do
       @client.access_token = 'TOKEN'
       @client.merchant_id = '123'
       response = mock
-      response.expects(:parsed)
+      response.should_receive(:parsed)
 
       token = @client.instance_variable_get(:@access_token)
       merchant_url = '/api/v1/merchants/123'
-      token.expects(:get).with { |p,o| p == merchant_url }.returns response
+      token.should_receive(:get).with { |p,o| p == merchant_url }.and_return response
 
-      GoCardless::Merchant.stubs(:new_with_client)
+      GoCardless::Merchant.stub(:new_with_client)
 
       @client.merchant
     end
@@ -243,10 +243,10 @@ describe GoCardless::Client do
       @client.access_token = 'TOKEN'
       @client.merchant_id = '123'
       response = mock
-      response.expects(:parsed).returns({:name => 'test', :id => 123})
+      response.should_receive(:parsed).and_return({:name => 'test', :id => 123})
 
       token = @client.instance_variable_get(:@access_token)
-      token.expects(:get).returns response
+      token.should_receive(:get).and_return response
 
       merchant = @client.merchant
       merchant.should be_an_instance_of GoCardless::Merchant
@@ -257,7 +257,7 @@ describe GoCardless::Client do
 
   %w{subscription pre_authorization user bill payment}.each do |resource|
     describe "##{resource}" do
-      it "returns the correct #{GoCardless::Utils.camelize(resource)} object" do
+      it "and_return the correct #{GoCardless::Utils.camelize(resource)} object" do
         @client.access_token = 'TOKEN'
         @client.merchant_id = '123'
         stub_get(@client, {:id => 123})
@@ -299,7 +299,7 @@ describe GoCardless::Client do
     end
 
     it "doesn't confirm the resource when the signature is invalid" do
-      @client.expects(:request).never
+      @client.should_receive(:request).never
       @client.confirm_resource({:signature => 'xxx'}.merge(@params)) rescue nil
     end
 
@@ -311,14 +311,14 @@ describe GoCardless::Client do
 
     it "confirms the resource when the signature is valid" do
       # Once for confirm, once to fetch result
-      @client.expects(:request).twice.returns(stub(:parsed => {}))
+      @client.should_receive(:request).twice.and_return(stub(:parsed => {}))
       @client.confirm_resource(@client.send(:sign_params, @params))
     end
 
-    it "returns the correct object when the signature is valid" do
-      @client.stubs(:request).returns(stub(:parsed => {}))
+    it "and_return the correct object when the signature is valid" do
+      @client.stub(:request).and_return(stub(:parsed => {}))
       subscription = GoCardless::Subscription.new_with_client @client
-      GoCardless::Subscription.expects(:find_with_client).returns subscription
+      GoCardless::Subscription.should_receive(:find_with_client).and_return subscription
 
       # confirm_resource should use the Subcription class because
       # the :response_type is set to subscription
@@ -327,9 +327,9 @@ describe GoCardless::Client do
     end
 
     it "includes valid http basic credentials" do
-      GoCardless::Subscription.stubs(:find_with_client)
+      GoCardless::Subscription.stub(:find_with_client)
       auth = 'Basic YWJjOnh5eg=='
-      @client.expects(:request).once.with do |type, path, opts|
+      @client.should_receive(:request).once.with do |type, path, opts|
         opts.should include :headers
         opts[:headers].should include 'Authorization'
         opts[:headers]['Authorization'].should == auth
@@ -338,8 +338,8 @@ describe GoCardless::Client do
     end
 
     it "works with string params" do
-      @client.stubs(:request)
-      GoCardless::Subscription.stubs(:find_with_client)
+      @client.stub(:request)
+      GoCardless::Subscription.stub(:find_with_client)
       params = Hash[@params.dup.map { |k,v| [k.to_s, v] }]
       params.keys.each { |p| p.should be_a String }
       # No ArgumentErrors should be raised
@@ -377,20 +377,20 @@ describe GoCardless::Client do
     end
 
     it "rejects other params not required for the signature" do
-      @client.expects(:signature_valid?).returns(true).with(hash) do |hash|
+      @client.should_receive(:signature_valid?) do |hash|
         !hash.keys.include?(:foo) && !hash.keys.include?('foo')
-      end
+      end.and_return(true)
 
       params = @client.send(:sign_params, @params).merge('foo' => 'bar')
       @client.response_params_valid?(params)
     end
 
-    it "returns false when the signature is invalid" do
+    it "and_return false when the signature is invalid" do
       params = {:signature => 'xxx'}.merge(@params)
       @client.response_params_valid?(params).should be_false
     end
 
-    it "returns true when the signature is valid" do
+    it "and_return true when the signature is valid" do
       params = @client.send(:sign_params, @params)
       @client.response_params_valid?(params).should be_true
     end
@@ -468,7 +468,7 @@ describe GoCardless::Client do
     it "should include a timestamp" do
       # Time.now returning Pacific time
       time = Time.parse('Sat Jan 01 2011 00:00:00 -0800')
-      Time.expects(:now).returns time
+      Time.should_receive(:now).and_return time
       params = get_params(@client.send(:new_limit_url, :subscription, :x => 1))
       # Check that timezone is ISO formatted UTC
       params['timestamp'].should == "2011-01-01T08:00:00Z"
@@ -476,7 +476,7 @@ describe GoCardless::Client do
   end
 
   describe "#merchant_id" do
-    it "returns the merchant id when an access token is set" do
+    it "and_return the merchant id when an access token is set" do
       @client.merchant_id = '123'
       @client.send(:merchant_id).should == '123'
     end
@@ -489,12 +489,12 @@ describe GoCardless::Client do
   end
 
   describe "#webhook_valid?" do
-    it "returns false when the webhook signature is invalid" do
+    it "and_return false when the webhook signature is invalid" do
       @client.webhook_valid?({:some => 'stuff', :signature => 'invalid'}).
         should be_false
     end
 
-    it "returns true when the webhook signature is valid" do
+    it "and_return true when the webhook signature is valid" do
       valid_signature = '175e814f0f64e5e86d41fb8fe06a857cedda715a96d3dc3d885e6d97dbeb7e49'
       @client.webhook_valid?({:some => 'stuff', :signature => valid_signature}).
         should be_true
@@ -502,13 +502,13 @@ describe GoCardless::Client do
   end
 
   describe "base_url" do
-    it "returns a custom base URL when one has been set" do
+    it "and_return a custom base URL when one has been set" do
       @client.base_url = 'http://test.com/'
       @client.base_url.should == 'http://test.com/'
     end
 
-    it "returns the default value when base_url is not set for the instance" do
-      GoCardless::Client.stubs(:base_url => 'http://gc.com/')
+    it "and_return the default value when base_url is not set for the instance" do
+      GoCardless::Client.stub(:base_url => 'http://gc.com/')
       @client.base_url.should == 'http://gc.com/'
     end
   end

data/spec/gocardless_spec.rb

@@ -10,7 +10,7 @@ describe GoCardless do
 
   describe ".account_details=" do
     it "creates a Client instance" do
-      GoCardless::Client.expects :new
+      GoCardless::Client.should_receive :new
       subject.account_details = @details
     end
 
@@ -26,7 +26,7 @@ describe GoCardless do
     %w(new_subscription_url new_pre_authorization_url new_bill_url confirm_resource webhook_valid?).each do |name|
       it "#{name} delegates to @client" do
         subject.account_details = @details
-        subject.instance_variable_get(:@client).expects(name.to_sym)
+        subject.instance_variable_get(:@client).should_receive(name.to_sym)
         subject.send(name)
       end
 

data/spec/pre_authorization_spec.rb

@@ -11,46 +11,46 @@ describe GoCardless::PreAuthorization do
 
   it "should be cancellable" do
     s = GoCardless::PreAuthorization.new_with_client(@client, :id => '009988')
-    @client.expects(:api_put).with('/pre_authorizations/009988/cancel')
+    @client.should_receive(:api_put).with('/pre_authorizations/009988/cancel')
     s.cancel!
   end
 
   describe "inactive query method" do
-    it "returns true when the subscription status is inactive" do
+    it "and_return true when the subscription status is inactive" do
       GoCardless::PreAuthorization.new(:status => 'inactive').inactive?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::PreAuthorization.new.inactive?.should be_false
     end
   end
 
   describe "active query method" do
-    it "returns true when the subscription status is active" do
+    it "and_return true when the subscription status is active" do
       GoCardless::PreAuthorization.new(:status => 'active').active?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::PreAuthorization.new.active?.should be_false
     end
   end
 
   describe "cancelled query method" do
-    it "returns true when the subscription status is cancelled" do
+    it "and_return true when the subscription status is cancelled" do
       GoCardless::PreAuthorization.new(:status => 'cancelled').cancelled?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::PreAuthorization.new.cancelled?.should be_false
     end
   end
 
   describe "expired query method" do
-    it "returns true when the subscription status is expired" do
+    it "and_return true when the subscription status is expired" do
       GoCardless::PreAuthorization.new(:status => 'expired').expired?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::PreAuthorization.new.expired?.should be_false
     end
   end

data/spec/resource_spec.rb

@@ -64,7 +64,7 @@ describe GoCardless::Resource do
         self.endpoint = '/test/:id'
       end
       mock_client = mock
-      mock_client.expects(:api_get).returns({:id => 123})
+      mock_client.should_receive(:api_get).and_return({:id => 123})
       resource = test_resource.find_with_client(mock_client, 123)
       resource.should be_a test_resource
       resource.id.should == 123
@@ -76,8 +76,8 @@ describe GoCardless::Resource do
       test_resource = Class.new(GoCardless::Resource) do
         self.endpoint = '/test/:id'
       end
-      GoCardless.stubs(:client => mock)
-      test_resource.expects(:find_with_client).with(GoCardless.client, 1)
+      GoCardless.stub(:client => mock)
+      test_resource.should_receive(:find_with_client).with(GoCardless.client, 1)
       test_resource.find(1)
       unset_ivar GoCardless, :client
     end
@@ -214,28 +214,28 @@ describe GoCardless::Resource do
         client = mock
         data = {:x => 1, :y => 2}
         resource = @test_resource.new_with_client(client, data)
-        client.expects(:api_post).with(anything, data)
+        client.should_receive(:api_post).with(anything, data)
         resource.save
       end
 
       it "sends the correct path" do
         client = mock
         resource = @test_resource.new_with_client(client)
-        client.expects(:api_post).with('/test', anything)
+        client.should_receive(:api_post).with('/test', anything)
         resource.save
       end
 
       it "POSTs when not persisted" do
         client = mock
         resource = @test_resource.new_with_client(client)
-        client.expects(:api_post)
+        client.should_receive(:api_post)
         resource.save
       end
 
       it "PUTs when already persisted" do
         client = mock
         resource = @test_resource.new_with_client(client, :id => 1)
-        client.expects(:api_put)
+        client.should_receive(:api_put)
         resource.save
       end
     end
@@ -246,7 +246,7 @@ describe GoCardless::Resource do
         creatable
       end
 
-      client = mock('client') { stubs :api_post }
+      client = double('client', :api_post => nil)
       test_resource.new_with_client(client).save
     end
 
@@ -256,7 +256,7 @@ describe GoCardless::Resource do
         updatable
       end
 
-      client = mock('client') { stubs :api_put }
+      client = double('client', :api_put => nil)
       test_resource.new_with_client(client, :id => 1).save
     end
 
@@ -357,14 +357,14 @@ describe GoCardless::Resource do
 
     it "use the correct uri path" do
       client = mock()
-      client.expects(:api_get).with('/api/bills/', anything).returns([])
+      client.should_receive(:api_get).with('/api/bills/', anything).and_return([])
       r = @test_resource.new_with_client(client, @attrs)
       r.bills
     end
 
     it "strips the api prefix from the path" do
       client = mock()
-      client.expects(:api_get).with('/bills/', anything).returns([])
+      client.should_receive(:api_get).with('/bills/', anything).and_return([])
       uris = {'bills' => 'https://test.com/api/v123/bills/'}
       r = @test_resource.new_with_client(client, 'sub_resource_uris' => uris)
       r.bills
@@ -372,7 +372,7 @@ describe GoCardless::Resource do
 
     it "use the correct query string params" do
       client = mock()
-      client.expects(:api_get).with(anything, 'merchant_id' => '1').returns([])
+      client.should_receive(:api_get).with(anything, 'merchant_id' => '1').and_return([])
       r = @test_resource.new_with_client(client, @attrs)
       r.bills
     end
@@ -380,7 +380,7 @@ describe GoCardless::Resource do
     it "adds provided params to existing query string params" do
       client = mock()
       params = { 'merchant_id' => '1', :amount => '10.00' }
-      client.expects(:api_get).with(anything, params).returns([])
+      client.should_receive(:api_get).with(anything, params).and_return([])
       r = @test_resource.new_with_client(client, @attrs)
       r.bills(:amount => '10.00')
     end
@@ -388,7 +388,7 @@ describe GoCardless::Resource do
     it "adds provided params when there are no existing query string params" do
       client = mock()
       params = { :source_id => 'xxx' }
-      client.expects(:api_get).with(anything, params).returns([])
+      client.should_receive(:api_get).with(anything, params).and_return([])
       r = @test_resource.new_with_client(client, {
         'sub_resource_uris' => {
           'bills' => 'https://test.com/merchants/1/bills'

data/spec/spec_helper.rb

@@ -1,17 +1,12 @@
-require 'mocha'
 require 'active_support/hash_with_indifferent_access'
 require 'gocardless'
 
-RSpec.configure do |config|
-  config.mock_with :mocha
-end
-
 def stub_get(client, data)
   response = mock
-  response.stubs(:parsed).returns(data)
+  response.stub(:parsed).and_return(data)
 
   token = client.instance_variable_get(:@access_token)
-  token.stubs(:get).returns response
+  token.stub(:get).and_return response
 end
 
 def unset_ivar(obj, var)

data/spec/subscription_spec.rb

@@ -11,46 +11,46 @@ describe GoCardless::Subscription do
 
   it "should be cancellable" do
     s = GoCardless::Subscription.new_with_client(@client, :id => '009988')
-    @client.expects(:api_put).with('/subscriptions/009988/cancel')
+    @client.should_receive(:api_put).with('/subscriptions/009988/cancel')
     s.cancel!
   end
 
   describe "inactive query method" do
-    it "returns true when the subscription status is inactive" do
+    it "and_return true when the subscription status is inactive" do
       GoCardless::Subscription.new(:status => 'inactive').inactive?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Subscription.new.inactive?.should be_false
     end
   end
 
   describe "active query method" do
-    it "returns true when the subscription status is active" do
+    it "and_return true when the subscription status is active" do
       GoCardless::Subscription.new(:status => 'active').active?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Subscription.new.active?.should be_false
     end
   end
 
   describe "cancelled query method" do
-    it "returns true when the subscription status is cancelled" do
+    it "and_return true when the subscription status is cancelled" do
       GoCardless::Subscription.new(:status => 'cancelled').cancelled?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Subscription.new.cancelled?.should be_false
     end
   end
 
   describe "expired query method" do
-    it "returns true when the subscription status is expired" do
+    it "and_return true when the subscription status is expired" do
       GoCardless::Subscription.new(:status => 'expired').expired?.should be_true
     end
 
-    it "returns false otherwise" do
+    it "and_return false otherwise" do
       GoCardless::Subscription.new.expired?.should be_false
     end
   end

data/spec/utils_spec.rb

@@ -108,7 +108,7 @@ describe GoCardless::Utils do
     describe ".flatten_params" do
       subject { GoCardless::Utils.method(:flatten_params) }
 
-      it "returns an empty array when provided with an empty hash" do
+      it "and_return an empty array when provided with an empty hash" do
         subject[{}].should == []
       end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gocardless
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Harry Marr
@@ -10,120 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    none: false
-  name: oauth2
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
-  name: multi_json
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    none: false
   name: rspec
-  type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.6'
-    none: false
-- !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-    none: false
-  name: mocha
+        version: '2.13'
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
-    none: false
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
-    none: false
-  name: yard
+        version: '0.7'
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
-    none: false
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
-  name: activesupport
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
 description: A Ruby wrapper for the GoCardless API
 email:
 - developers@gocardless.com
@@ -147,6 +118,7 @@ files:
 - lib/gocardless/errors.rb
 - lib/gocardless/merchant.rb
 - lib/gocardless/payment.rb
+- lib/gocardless/payout.rb
 - lib/gocardless/pre_authorization.rb
 - lib/gocardless/resource.rb
 - lib/gocardless/subscription.rb
@@ -163,28 +135,28 @@ files:
 - spec/user_spec.rb
 - spec/utils_spec.rb
 homepage: https://github.com/gocardless/gocardless-ruby
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper for the GoCardless API
 test_files:
 - spec/bill_spec.rb
@@ -196,4 +168,3 @@ test_files:
 - spec/subscription_spec.rb
 - spec/user_spec.rb
 - spec/utils_spec.rb
-has_rdoc: