gocardless 1.0.1 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0 - May 25, 2012
+
+- Accept merchant_id as a client constructor param
+
+
 ## 1.0.1 - May 14, 2012
 
 - Update oauth2 dependency version, fixes installation issue

data/lib/gocardless/client.rb

@@ -41,6 +41,7 @@ module GoCardless
                                          :token_url => '/oauth/access_token')
 
       self.access_token = args[:token] if args[:token]
+      @merchant_id = args[:merchant_id] if args[:merchant_id]
     end
 
     # Generate the OAuth authorize url
@@ -83,12 +84,15 @@ module GoCardless
     #   (as returned by {#access_token})
     def access_token=(token)
       token, scope = token.sub(/^bearer\s+/i, '').split(' ', 2)
-      if scope.nil?
-        raise ArgumentError, ('Access token missing scope. Use format '
-                              '<token> <scope>')
-      end
+      scope ||= ''
+
       @access_token = OAuth2::AccessToken.new(@oauth_client, token)
       @access_token.params['scope'] = scope
+
+      unless @merchant_id
+        perm = scope.split.select {|p| p.start_with?('manage_merchant:') }.first
+        @merchant_id = perm.split(':')[1] if perm
+      end
     end
 
     # Issue an GET request to the API server
@@ -260,6 +264,12 @@ module GoCardless
 
   private
 
+    # Return the merchant id, throwing a proper error if it's missing.
+    def merchant_id
+      raise ClientError, 'No merchant id set' unless @merchant_id
+      @merchant_id
+    end
+
     # Send a request to the GoCardless API servers
     #
     # @param [Symbol] method the HTTP method to use (e.g. +:get+, +:post+)
@@ -344,13 +354,6 @@ module GoCardless
       url.query = Utils.normalize_params(params)
       url.to_s
     end
-
-    def merchant_id
-      raise ClientError, 'Access token missing' unless @access_token
-      scope = @access_token.params['scope'].split
-      perm = scope.select {|p| p.start_with?('manage_merchant:') }.first
-      perm.split(':')[1]
-    end
   end
 end
 

data/lib/gocardless/version.rb

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

data/spec/client_spec.rb

@@ -30,11 +30,21 @@ describe GoCardless::Client do
         GoCardless::Client.new({:app_secret => @app_secret})
       end.should raise_exception(GoCardless::ClientError)
     end
+
     it "without an app_secret should raise an error" do
       lambda do
         GoCardless::Client.new({:app_id => @app_id})
       end.should raise_exception(GoCardless::ClientError)
     end
+
+    it "sets a merchant id if it's given" do
+      client = GoCardless::Client.new({
+        :app_id      => @app_id,
+        :app_secret  => @app_secret,
+        :merchant_id => 'xyz'
+      })
+      client.send('merchant_id').should == 'xyz'
+    end
   end
 
   before do
@@ -124,17 +134,17 @@ describe GoCardless::Client do
       token.params['scope'].should == 'a:1 b:2'
     end
 
+    it "pulls out the merchant_id when present" do
+      @client.access_token = 'TOKEN123 manage_merchant:xyz'
+      @client.send('merchant_id').should == 'xyz'
+    end
+
     it "ignores 'bearer' if it is present at the start of the string" do
       @client.access_token = 'Bearer TOKEN manage_merchant:123'
       token = @client.instance_variable_get(:@access_token)
       token.token.should == 'TOKEN'
       token.params['scope'].should == 'manage_merchant:123'
     end
-
-    it "handles invalid values correctly" do
-      token = 'TOKEN123'  # missing scope
-      expect { @client.access_token = token }.to raise_exception ArgumentError
-    end
   end
 
   describe "#api_get" do

metadata

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