gocardless 1.6.0 → 1.6.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.6.1 - November 06, 2012
+
+- Fix - update Client references to base_url so custom base_urls work
+
 ## 1.6.0 - November 06, 2012
 
 - Allow setting custom base_urls per-client

data/lib/gocardless/client.rb

@@ -22,10 +22,6 @@ module GoCardless
       def base_url
         @base_url || BASE_URLS[GoCardless.environment || :production]
       end
-
-      def api_url
-        "#{base_url}#{API_PATH}"
-      end
     end
 
     def initialize(args = {})
@@ -36,7 +32,7 @@ module GoCardless
       raise ClientError.new("You must provide an app_secret") unless @app_secret
 
       @oauth_client = OAuth2::Client.new(@app_id, @app_secret,
-                                         :site => self.class.base_url,
+                                         :site => self.base_url,
                                          :token_url => '/oauth/access_token')
 
       self.access_token = args[:token] if args[:token]
@@ -237,8 +233,8 @@ module GoCardless
         headers = {
           'Authorization' => "Basic #{credentials}"
         }
-        request(:post, "#{self.class.api_url}/confirm", :data => data,
-                                                        :headers => headers)
+        request(:post, "#{api_url}/confirm", :data => data,
+                                                  :headers => headers)
 
         # Initialize the correct class according to the resource's type
         klass = GoCardless.const_get(Utils.camelize(params[:resource_type]))
@@ -283,6 +279,10 @@ module GoCardless
       @base_url || self.class.base_url
     end
 
+    def api_url
+      "#{base_url}#{API_PATH}"
+    end
+
   private
 
     # Return the merchant id, throwing a proper error if it's missing.
@@ -312,7 +312,7 @@ module GoCardless
       opts[:body] = MultiJson.encode(opts[:data]) if !opts[:data].nil?
 
       # Reset the URL in case the environment / base URL has been changed.
-      @oauth_client.site = self.class.base_url
+      @oauth_client.site = base_url
 
       header_keys = opts[:headers].keys.map(&:to_s)
       if header_keys.map(&:downcase).include?('authorization')
@@ -380,7 +380,7 @@ module GoCardless
     # @param [Hash] params the bill parameters
     # @return [String] the generated URL
     def new_limit_url(type, limit_params)
-      url = URI.parse("#{self.class.base_url}/connect/#{type}s/new")
+      url = URI.parse("#{base_url}/connect/#{type}s/new")
 
       limit_params[:merchant_id] = merchant_id
       redirect_uri = limit_params.delete(:redirect_uri)

data/lib/gocardless/version.rb

@@ -1,3 +1,3 @@
 module GoCardless
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gocardless
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors: