Merge pull request #9 from 3scale/add_service_id_support

Add service_id as an option

Author: mikz

lib/3scale/authorize_response.rb

@@ -10,6 +10,7 @@ def initialize
     attr_accessor :plan
     attr_accessor :app_key
     attr_accessor :redirect_url
+    attr_accessor :service_id
 
     class UsageReport
       attr_reader :metric
@@ -42,4 +43,4 @@ def add_usage_report(options)
       @usage_reports << UsageReport.new(options)
     end
   end
-end
+end

lib/3scale/client.rb

@@ -158,9 +158,10 @@ def report(*transactions)
     #
     # Hash with options:
     #
-    #   app_id::  id of the application to authorize. This is required.
-    #   app_key:: secret key assigned to the application. Required only if application has
-    #             a key defined.
+    #   app_id::     id of the application to authorize. This is required.
+    #   app_key::    secret key assigned to the application. Required only if application has
+    #                a key defined.
+    #   service_id:: id of the service (required if you have more than one service)
     #
     # == Return
     #
@@ -186,6 +187,7 @@ def authorize(options)
         "?provider_key=#{CGI.escape(provider_key)}" +
         "&app_id=#{CGI.escape(options[:app_id].to_s)}"
         path += "&app_key=#{CGI.escape(options[:app_key])}" if options[:app_key]
+      path += "&service_id=#{CGI.escape(options[:service_id])}" if options[:service_id]
 
       uri = URI.parse("http://#{host}#{path}")
       http_response = Net::HTTP.get_response(uri)
@@ -207,6 +209,7 @@ def authorize(options)
     # Hash with options:
     #
     #   app_id::  id of the application to authorize. This is required.
+    #   service_id:: id of the service (required if you have more than one service)
     #
     # == Return
     #
@@ -235,6 +238,7 @@ def oauth_authorize(options)
         "?provider_key=#{CGI.escape(provider_key)}" +
         "&app_id=#{CGI.escape(options[:app_id].to_s)}"
         path += "&app_key=#{CGI.escape(options[:app_key])}" if options[:app_key]
+      path += "&service_id=#{CGI.escape(options[:service_id])}" if options[:service_id]
       path += "&redirect_url=#{CGI.escape(options[:redirect_url])}" if options[:redirect_url]
 
       uri = URI.parse("http://#{host}#{path}")
@@ -316,4 +320,4 @@ def build_error_response(body)
       response
     end
   end
-end
+end

test/client_test.rb

@@ -55,6 +55,12 @@ def test_authrep_supports_app_id_app_key_auth_mode
     @client.authrep(:app_id => "appid", :app_key => "appkey")
   end
 
+  def test_authrep_supports_service_id
+    assert_authrep_url_with_params "&%5Busage%5D%5Bhits%5D=1&service_id=serviceid"
+
+    @client.authrep(:service_id => "serviceid")
+  end
+
   #TODO these authrep tests
   def test_authrep_supports_api_key_auth_mode; end
   def test_authrep_log_is_encoded;end
@@ -358,4 +364,4 @@ def assert_authrep_url_with_params(str)
     # this is the actual assertion, if fakeweb raises the client is submiting with wrong params
     FakeWeb.register_uri(:get, parsed_authrep_url, :status => ['200', 'OK'], :body => body)
   end
-end
+end