gocardless 1.10.1 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e22096b949c5df3105ed9060a58824e185fd993
-  data.tar.gz: 1cc708492608cf07feb13e391e11c6b1e9411925
+  metadata.gz: bb186568bf3bab6c1d0baf10394a75ecd1b14534
+  data.tar.gz: 033069ff0faa53aa992680bd46bd0b0296b6f4c0
 SHA512:
-  metadata.gz: b5a4f60f99788d941ad2e0d5444fd3a83f9e26ffcb1e601fdc137de1b9c7a474f5101b183b83672180aae15bb9664393dbf5663234293defaef080c85299e099
-  data.tar.gz: 4e2e79bd303380b67722277a242f533887630d8f3cb9c4259a699c5da64d3aa24b48c9bd2c5ac18929c7facf97d87a3274aae65b2704d34e800e3871b585775b
+  metadata.gz: 979d094b2b639f33f92626feb7cff70da4b55cd241fae9dae12f049282c0c99bece3f2fee1f916a6ebb98c4d3eb3ac80600fe7757aab43cb5670c3981ddbc2db
+  data.tar.gz: cd6bfe4b1a8bf4fcb4ca8eda5357aeaa6459a03e64eabc3ae376f85a77a3718e0c07c98108b9465d7521e0ab820165b4587d2b31de5ad30b8673942712f980c0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.11.0 - July 07, 2014
+
+- URI encode path before making requests
+- Deprecate Client#access_token
+
+
 ## 1.10.1 - June 09, 2014
 
 - Use a more useful user agent header

data/lib/gocardless/client.rb

@@ -70,14 +70,31 @@ module GoCardless
       scope = @access_token.params[:scope] || @access_token.params['scope']
       set_merchant_id_from_scope(scope)
 
-      self.access_token
+      self.scoped_access_token
     end
 
     # @return [String] a serialized form of the access token with its scope
+    def scoped_access_token
+      "#{self.unscoped_access_token} #{self.scope}".strip if @access_token
+    end
+
     def access_token
+      warn "[DEPRECATION] (gocardless-ruby) the behaviour of " +
+           "Client#access_token is deprecated. In future releases it will " +
+           "return the unscoped access token. If you want the scoped access " +
+           "token, use 'scoped_access_token'"
+      self.scoped_access_token
+    end
+
+    # @return [String] a serialized form of the access token without its scope
+    def unscoped_access_token
+      @access_token.token if @access_token
+    end
+
+    # @return [String] the scope of the current access token
+    def scope
       if @access_token
-        scope = @access_token.params[:scope] || @access_token.params['scope']
-        "#{@access_token.token} #{scope}".strip
+        @access_token.params[:scope] || @access_token.params['scope']
       end
     end
 
@@ -347,6 +364,7 @@ module GoCardless
       opts[:headers]['Content-Type'] = 'application/json' unless method == :get
       opts[:headers]['User-Agent'] = user_agent
       opts[:body] = MultiJson.encode(opts[:data]) if !opts[:data].nil?
+      path = URI.encode(path)
 
       # Reset the URL in case the environment / base URL has been changed.
       @oauth_client.site = base_url

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.11.0'.freeze
 end

data/spec/client_spec.rb

@@ -130,7 +130,38 @@ describe GoCardless::Client do
     end
   end
 
+  describe "#scoped_access_token" do
+    it "serializes access token correctly" do
+      oauth_client = @client.instance_variable_get(:@oauth_client)
+      token = OAuth2::AccessToken.new(oauth_client, 'TOKEN123')
+      token.params['scope'] = 'a:1 b:2'
+      @client.instance_variable_set(:@access_token, token)
+
+      @client.scoped_access_token.should == 'TOKEN123 a:1 b:2'
+    end
+
+    it "and_return nil when there's no token" do
+      @client.scoped_access_token.should be_nil
+    end
+  end
+
+  describe "#unscoped_access_token" do
+    it "serializes access token correctly" do
+      oauth_client = @client.instance_variable_get(:@oauth_client)
+      token = OAuth2::AccessToken.new(oauth_client, 'TOKEN123')
+      token.params['scope'] = 'a:1 b:2'
+      @client.instance_variable_set(:@access_token, token)
+
+      @client.unscoped_access_token.should == 'TOKEN123'
+    end
+
+    it "and_return nil when there's no token" do
+      @client.unscoped_access_token.should be_nil
+    end
+  end
+
   describe "#access_token" do
+    before { @client.stub(:warn) }
     it "serializes access token correctly" do
       oauth_client = @client.instance_variable_get(:@oauth_client)
       token = OAuth2::AccessToken.new(oauth_client, 'TOKEN123')
@@ -143,6 +174,26 @@ describe GoCardless::Client do
     it "and_return nil when there's no token" do
       @client.access_token.should be_nil
     end
+
+    it "issues a deprecation warning" do
+      @client.should_receive(:warn)
+      @client.access_token
+    end
+  end
+
+  describe "#scope" do
+    it "serializes the access token correctly" do
+      oauth_client = @client.instance_variable_get(:@oauth_client)
+      token = OAuth2::AccessToken.new(oauth_client, 'TOKEN123')
+      token.params['scope'] = 'a:1 b:2'
+      @client.instance_variable_set(:@access_token, token)
+
+      @client.scope.should == 'a:1 b:2'
+    end
+
+    it "and_return nil when there's no token" do
+      @client.scope.should be_nil
+    end
   end
 
   describe "#access_token=" do
@@ -518,7 +569,6 @@ describe GoCardless::Client do
 
     it "includes the gem name" do
       expect(user_agent).to include("gocardless-ruby")
-      puts(user_agent)
     end
 
     it "includes the gem version" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gocardless
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.0
 platform: ruby
 authors:
 - Harry Marr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2