gocardless 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.1 - June 07, 2012
+
+- Fix handling of cancel_uri
+
+
 ## 1.1.0 - May 25, 2012
 
 - Accept merchant_id as a client constructor param

data/lib/gocardless/client.rb

@@ -338,6 +338,7 @@ module GoCardless
 
       limit_params[:merchant_id] = merchant_id
       redirect_uri = limit_params.delete(:redirect_uri)
+      cancel_uri = limit_params.delete(:cancel_uri)
       state = limit_params.delete(:state)
 
       params = {
@@ -347,6 +348,7 @@ module GoCardless
         type         => limit_params,
       }
       params[:redirect_uri] = redirect_uri unless redirect_uri.nil?
+      params[:cancel_uri] = cancel_uri unless cancel_uri.nil?
       params[:state] = state unless state.nil?
 
       sign_params(params)

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/spec/client_spec.rb

@@ -64,6 +64,16 @@ describe GoCardless::Client do
       query['client_id'].first.should == @app_id
     end
 
+    it "includes the cancel uri if present" do
+      cancel_uri = 'http://test/cancel'
+      url = URI.parse(@client.authorize_url(
+        :redirect_uri => @redirect_uri,
+        :cancel_uri   => cancel_uri
+      ))
+      query = CGI.parse(url.query)
+      query['cancel_uri'].first.should == cancel_uri
+    end
+
     it "encodes prefilling parameters correctly" do
       params = {:merchant => {:user => {:email => "a@b.com"}}}
       url = @client.authorize_url(params.merge(:redirect_uri => @redirect_uri))
@@ -363,6 +373,12 @@ describe GoCardless::Client do
       get_params(url)["redirect_uri"].should == "http://www.google.com"
     end
 
+    it "should include the cancel_uri in the URL query" do
+      params = { 'a' => '1', 'b' => '2', :cancel_uri => "http://www.google.com" }
+      url = @client.send(:new_limit_url, :subscription, params)
+      get_params(url)["cancel_uri"].should == "http://www.google.com"
+    end
+
     it "should add merchant_id to the limit" do
       url = @client.send(:new_limit_url, :subscription, {})
       get_params(url)['subscription[merchant_id]'].should == @merchant_id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gocardless
 version: !ruby/object:Gem::Version 
-  hash: 3461773182973075480
+  hash: 4079999309947216651
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Harry Marr
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-25 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth2