maestrano 0.11.0 → 0.12.0

data/lib/maestrano.rb

@@ -9,6 +9,9 @@ require 'maestrano/open_struct'
 # Version
 require 'maestrano/version'
 
+# Multiple providers support
+require 'maestrano/preset'
+
 # XMLSecurity
 require 'maestrano/xml_security/signed_document'
 
@@ -58,16 +61,18 @@ require 'maestrano/account/recurring_bill'
 require 'maestrano/connec/client'
 
 module Maestrano
+  include Preset
   
   class << self
-    attr_accessor :config
+    attr_accessor :configs
   end
   
   # Maestrano Configuration block
   def self.configure
-    self.config ||= Configuration.new
-    yield(config)
-    self.config.post_initialize
+    self.configs ||= {}
+    self.configs[preset] ||= Configuration.new
+    yield(configs[preset])
+    self.configs[preset].post_initialize
     return self
   end
   
@@ -85,7 +90,7 @@ module Maestrano
   # 'virtual': then the virtual user uid is returned (usr-4d5sfd.cld-g4f5d)
   def self.mask_user(user_uid,group_uid)
     sanitized_user_uid = self.unmask_user(user_uid)
-    if Maestrano.param('sso.creation_mode') == 'virtual'
+    if self.param('sso.creation_mode') == 'virtual'
       return "#{sanitized_user_uid}.#{group_uid}"
     else
       return sanitized_user_uid
@@ -102,8 +107,9 @@ module Maestrano
   # E.g:
   # Maestrano.param('api.key')
   # Maestrano.param(:api_key)
+  # Maestrano['preset'].param('api.key')
   def self.param(parameter)
-    self.config.param(parameter)
+    (self.configs[preset] || Configuration.new).param(parameter)
   end
   
   # Return a hash describing the current
@@ -118,7 +124,7 @@ module Maestrano
     blacklist = ['api.key','api.token']
     
     config_groups.each do |cgroup_name|
-      cgroup = self.config.send(cgroup_name)
+      cgroup = self.configs[preset].send(cgroup_name)
       
       attr_list = cgroup.attributes.map(&:to_s)
       attr_list += Configuration::EVT_CONFIG[hash['environment']].keys.select { |k| k =~ Regexp.new("^#{cgroup_name}\.") }.map { |k| k.gsub(Regexp.new("^#{cgroup_name}\."),'') }
@@ -149,7 +155,7 @@ module Maestrano
   end
 
   class Configuration
-    attr_accessor :environment, :app, :sso, :api, :webhook
+    attr_accessor :environment, :app, :sso, :api, :webhook, :connec
 
     def initialize
       @environment = 'test'
@@ -191,6 +197,11 @@ module Maestrano
           subscriptions: {}
         })
       })
+
+      # Connec! Config
+      @connec = OpenStruct.new({
+        enabled: true
+      })
     end
     
     # Force or default certain parameters
@@ -259,9 +270,29 @@ module Maestrano
     end
     
     EVT_CONFIG = {
+      'local' => {
+        'api.host'             => 'http://application.maestrano.io',
+        'api.base'             => '/api/v1/',
+        'connec.enabled'       => true,
+        'connec.host'          => 'http://connec.maestrano.io',
+        'connec.base_path'     => '/api',
+        'connec.v2_path'       => '/v2',
+        'connec.reports_path'  => '/reports',
+        'connec.timeout'       => 60,
+        'sso.idp'              => 'http://application.maestrano.io',
+        'sso.name_id_format'   => Maestrano::Saml::Settings::NAMEID_PERSISTENT,
+        'sso.x509_fingerprint' => '01:06:15:89:25:7d:78:12:28:a6:69:c7:de:63:ed:74:21:f9:f5:36',
+        'sso.x509_certificate' => "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAOehBr+YIrhjMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMjM5\nWhcNMzMxMjMwMDUyMjM5WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDVkIqo5t5Paflu\nP2zbSbzxn29n6HxKnTcsubycLBEs0jkTkdG7seF1LPqnXl8jFM9NGPiBFkiaR15I\n5w482IW6mC7s8T2CbZEL3qqQEAzztEPnxQg0twswyIZWNyuHYzf9fw0AnohBhGu2\n28EZWaezzT2F333FOVGSsTn1+u6tFwIDAQABo4HuMIHrMB0GA1UdDgQWBBSvrNxo\neHDm9nhKnkdpe0lZjYD1GzCBuwYDVR0jBIGzMIGwgBSvrNxoeHDm9nhKnkdpe0lZ\njYD1G6GBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA56EGv5giuGMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCc\nMPgV0CpumKRMulOeZwdpnyLQI/NTr3VVHhDDxxCzcB0zlZ2xyDACGnIG2cQJJxfc\n2GcsFnb0BMw48K6TEhAaV92Q7bt1/TYRvprvhxUNMX2N8PHaYELFG2nWfQ4vqxES\nRkjkjqy+H7vir/MOF3rlFjiv5twAbDKYHXDT7v1YCg==\n-----END CERTIFICATE-----"
+      },
       'test' => {
         'api.host'             => 'http://api-sandbox.maestrano.io',
         'api.base'             => '/api/v1/',
+        'connec.enabled'       => true,
+        'connec.host'          => 'http://api-sandbox.maestrano.io',
+        'connec.base_path'     => '/connec/api',
+        'connec.v2_path'       => '/v2',
+        'connec.reports_path'  => '/reports',
+        'connec.timeout'       => 60,
         'sso.idp'              => 'https://maestrano.com',
         'sso.name_id_format'   => Maestrano::Saml::Settings::NAMEID_PERSISTENT,
         'sso.x509_fingerprint' => '01:06:15:89:25:7d:78:12:28:a6:69:c7:de:63:ed:74:21:f9:f5:36',
@@ -269,9 +300,29 @@ module Maestrano
         'connec.host'          => 'http://api-sandbox.maestrano.io',
         'connec.base_path'     => '/connec/api/v2'
       },
+      'uat' => {
+        'api.host'             => 'https://uat.maestrano.io',
+        'api.base'             => '/api/v1/',
+        'connec.enabled'       => true,
+        'connec.host'          => 'https://api-connec-uat.maestrano.io',
+        'connec.base_path'     => '/api',
+        'connec.v2_path'       => '/v2',
+        'connec.reports_path'  => '/reports',
+        'connec.timeout'       => 180,
+        'sso.idp'              => 'https://uat.maestrano.io',
+        'sso.name_id_format'   => Maestrano::Saml::Settings::NAMEID_PERSISTENT,
+        'sso.x509_fingerprint' => '8a:1e:2e:76:c4:67:80:68:6c:81:18:f7:d3:29:5d:77:f8:79:54:2f',
+        'sso.x509_certificate' => "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAMzy+weDPp7qMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMzE0\nWhcNMzMxMjMwMDUyMzE0WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+2uyQeAOc/iro\nhCyT33RkkWfTGeJ8E/mu9F5ORWoCZ/h2J+QDuzuc69Rf1LoO4wZVQ8LBeWOqMBYz\notYFUIPlPfIBXDNL/stHkpg28WLDpoJM+46WpTAgp89YKgwdAoYODHiUOcO/uXOO\n2i9Ekoa+kxbvBzDJf7uuR/io6GERXwIDAQABo4HuMIHrMB0GA1UdDgQWBBTGRDBT\nie5+fHkB0+SZ5g3WY/D2RTCBuwYDVR0jBIGzMIGwgBTGRDBTie5+fHkB0+SZ5g3W\nY/D2RaGBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkAzPL7B4M+nuowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAw\nRxg3rZrML//xbsS3FFXguzXiiNQAvA4KrMWhGh3jVrtzAlN1/okFNy6zuN8gzdKD\nYw2n0c/u3cSpUutIVZOkwQuPCMC1hoP7Ilat6icVewNcHayLBxKgRxpBhr5Sc4av\n3HOW5Bi/eyC7IjeBTbTnpziApEC7uUsBou2rlKmTGw==\n-----END CERTIFICATE-----"
+      },
       'production' => {
         'api.host'             => 'https://maestrano.com',
         'api.base'             => '/api/v1/',
+        'connec.enabled'       => true,
+        'connec.host'          => 'https://api-connec.maestrano.io',
+        'connec.base_path'     => '/api',
+        'connec.v2_path'       => '/v2',
+        'connec.reports_path'  => '/reports',
+        'connec.timeout'       => 180,
         'sso.idp'              => 'https://maestrano.com',
         'sso.name_id_format'   => Maestrano::Saml::Settings::NAMEID_PERSISTENT,
         'sso.x509_fingerprint' => '2f:57:71:e4:40:19:57:37:a6:2c:f0:c5:82:52:2f:2e:41:b7:9d:7e',

data/test/maestrano/account/bill_test.rb

@@ -28,20 +28,61 @@ module Maestrano
         end
       end
 
+      context 'without presets' do
+        should "should successfully create a remote bill when passed correct parameters" do
+          @api_mock.expects(:post).with do |url, api_token, params|
+            url == "#{Maestrano.param('api.host')}#{Maestrano.param('api.base')}account/bills" && api_token.nil? && 
+            CGI.parse(params) == {"group_id"=>["cld-1"], "price_cents"=>["23000"], "currency"=>["AUD"], "description"=>["Some bill"]}
+          end.once.returns(test_response(test_account_bill))
 
-      should "should successfully create a remote bill when passed correct parameters" do
-        @api_mock.expects(:post).with do |url, api_token, params|
-          url == "#{Maestrano.param('api_host')}#{Maestrano.param('api_base')}account/bills" && api_token.nil? && 
-          CGI.parse(params) == {"group_id"=>["cld-1"], "price_cents"=>["23000"], "currency"=>["AUD"], "description"=>["Some bill"]}
-        end.once.returns(test_response(test_account_bill))
-
-        bill = Maestrano::Account::Bill.create({
-          group_id: 'cld-1',
-          price_cents: 23000,
-          currency: 'AUD',
-          description: 'Some bill'
-        })
-        assert bill.id
+          bill = Maestrano::Account::Bill.create({
+            group_id: 'cld-1',
+            price_cents: 23000,
+            currency: 'AUD',
+            description: 'Some bill'
+          })
+          assert bill.id
+        end
+      end
+
+      context 'with presets' do
+        setup do
+          @preset = 'mypreset'
+          Maestrano.configure do |config|
+            config.environment = 'production'
+            config.api.host = 'https://maestrano.com'
+            config.api.base = '/api'
+          end
+          Maestrano[@preset].configure do |config|
+            config.environment = 'production'
+            config.api.host = 'https://myprovider.com'
+            config.api.base = '/myapi'
+          end
+        end
+
+        should "should successfully create a remote bill when passed correct parameters" do
+          @api_mock.expects(:post).with do |url, api_token, params|
+            url == "#{Maestrano[@preset].param('api.host')}#{Maestrano[@preset].param('api.base')}account/bills" && api_token.nil? && 
+            CGI.parse(params) == {"group_id"=>["cld-1"], "price_cents"=>["23000"], "currency"=>["AUD"], "description"=>["Some bill"]}
+          end.once.returns(test_response(test_account_bill))
+
+          bill = Maestrano::Account::Bill[@preset].create({
+            group_id: 'cld-1',
+            price_cents: 23000,
+            currency: 'AUD',
+            description: 'Some bill'
+          })
+          assert bill.id
+        end
+
+        should "should successfully list remote bills" do
+          @api_mock.expects(:get).with do |url, api_token|
+            url == "#{Maestrano[@preset].param('api.host')}#{Maestrano[@preset].param('api.base')}account/bills" && api_token.nil?
+          end.once.returns(test_response(test_account_bill_array))
+
+          bills = Maestrano::Account::Bill[@preset].all
+          assert bills
+        end
       end
     end
   end

data/test/maestrano/account/user_test.rb

@@ -28,6 +28,26 @@ module Maestrano
           c = Maestrano::Account::User.create({name: "Bla"})
         end
       end
+
+      context 'with presets' do
+        setup do
+          @preset = 'mypreset'
+          Maestrano[@preset].configure do |config|
+            config.environment = 'production'
+            config.api.host = 'https://myprovider.com'
+            config.api.base = '/myapi'
+          end
+        end
+
+        should "should successfully list remote users" do
+          @api_mock.expects(:get).with do |url, api_token|
+            url == "#{Maestrano[@preset].param('api.host')}#{Maestrano[@preset].param('api.base')}account/users" && api_token.nil?
+          end.once.returns(test_response(test_account_user_array))
+
+          bills = Maestrano::Account::User[@preset].all
+          assert bills
+        end
+      end
     end
   end
 end

data/test/maestrano/connec/client_test.rb

@@ -4,89 +4,233 @@ module Maestrano
   module Connec
     class ClientTest < Test::Unit::TestCase
       
-      context 'initializer' do
-        context '.base_uri' do
-          context 'in test' do
-            setup { Maestrano.configure { |config| config.environment = 'test' } }
-            setup { @client = Maestrano::Connec::Client.new("cld-123") }
-            
-            should "return the right uri" do
-              assert_equal "http://api-sandbox.maestrano.io/connec/api/v2", Maestrano::Connec::Client.base_uri
+      context 'without preset' do
+        context 'initializer' do
+          context '.base_uri' do
+            context 'in test' do
+              setup { Maestrano.configs = {}; Maestrano.configure { |config| config.environment = 'test' } }
+              setup { @client = Maestrano::Connec::Client.new("cld-123") }
+              
+              should "return the right uri" do
+                assert_equal "http://api-sandbox.maestrano.io/connec/api/v2", Maestrano::Connec::Client.base_uri
+              end
+            end
+          
+            context 'in production' do
+              setup { Maestrano.configs = {}; Maestrano.configure { |config| config.environment = 'production' } }
+              setup { @client = Maestrano::Connec::Client.new("cld-123") }
+              
+              should "return the right uri" do
+                assert_equal "https://api-connec.maestrano.com/api/v2", Maestrano::Connec::Client.base_uri
+              end
             end
           end
+        end
         
-          context 'in production' do
-            setup { Maestrano.configure { |config| config.environment = 'production' } }
-            setup { @client = Maestrano::Connec::Client.new("cld-123") }
-            
-            should "return the right uri" do
-              assert_equal "https://api-connec.maestrano.com/api/v2", Maestrano::Connec::Client.base_uri
-            end
+        context 'scoped_path' do
+          setup { @client = Maestrano::Connec::Client.new("cld-123") }
+          
+          should "return the right scoped path" do
+            assert_equal "/cld-123/people", @client.scoped_path('/people')
+          end
+          
+          should "remove any leading or trailing slash" do
+            assert_equal "/cld-123/people", @client.scoped_path('/people/')
           end
         end
-      end
-      
-      context 'scoped_path' do
-        setup { @client = Maestrano::Connec::Client.new("cld-123") }
         
-        should "return the right scoped path" do
-          assert_equal "/cld-123/people", @client.scoped_path('/people')
+        context 'default_options' do
+          setup { @client = Maestrano::Connec::Client.new("cld-123") }
+          
+          should "return the right authentication options" do
+            expected_opts = {
+              basic_auth: { 
+                username: Maestrano.param('api.id'), 
+                password: Maestrano.param('api.key')
+              },
+              timeout: Maestrano.param('connec.timeout')
+            }
+            assert_equal expected_opts, @client.default_options
+          end
         end
         
-        should "remove any leading or trailing slash" do
-          assert_equal "/cld-123/people", @client.scoped_path('/people/')
+        context 'get' do
+          setup { @client = Maestrano::Connec::Client.new("cld-123") }
+          
+          should "perform the right query" do
+            path = '/people'
+            opts = { foo: 'bar' }
+            resp = mock('resp')
+            Maestrano::Connec::Client.expects(:get).with(@client.scoped_path(path),@client.default_options.merge(opts)).returns(resp)
+            assert_equal resp, @client.get(path,opts)
+          end
         end
-      end
-      
-      context 'default_options' do
-        setup { @client = Maestrano::Connec::Client.new("cld-123") }
         
-        should "return the right authentication options" do
-          expected_opts = {
-            basic_auth: { 
-              username: Maestrano.param('api.id'), 
-              password: Maestrano.param('api.key')
-            } 
-          }
-          assert_equal expected_opts, @client.default_options
+        context 'post' do
+          setup { @client = Maestrano::Connec::Client.new("cld-123") }
+          
+          should "perform the right query" do
+            path = '/people'
+            body = { some: 'data'}
+            opts = { foo: 'bar' }
+            resp = mock('resp')
+            Maestrano::Connec::Client.expects(:post).with(@client.scoped_path(path),@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
+            assert_equal resp, @client.post(path,body,opts)
+          end
         end
-      end
-      
-      context 'get' do
-        setup { @client = Maestrano::Connec::Client.new("cld-123") }
         
-        should "perform the right query" do
-          path = '/people'
-          opts = { foo: 'bar' }
-          resp = mock('resp')
-          Maestrano::Connec::Client.expects(:get).with(@client.scoped_path(path),@client.default_options.merge(opts)).returns(resp)
-          assert_equal resp, @client.get(path,opts)
+        context 'put' do
+          setup { @client = Maestrano::Connec::Client.new("cld-123") }
+          
+          should "perform the right query" do
+            path = '/people/123'
+            body = { some: 'data'}
+            opts = { foo: 'bar' }
+            resp = mock('resp')
+            Maestrano::Connec::Client.expects(:put).with(@client.scoped_path(path),@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
+            assert_equal resp, @client.put(path,body,opts)
+          end
         end
       end
-      
-      context 'post' do
-        setup { @client = Maestrano::Connec::Client.new("cld-123") }
+
+      context 'with preset' do
+        setup do
+          @preset = 'mypreset'
+
+          @config = {
+            'environment'       => 'production',
+            'app.host'          => 'http://mysuperapp.com',
+            
+            'api.id'            => 'app-f54ds4f8',
+            'api.key'           => 'someapikey',
+
+            'connec.enabled'    => true,
+            'connec.host'       => 'https://connec-api.com',
+            'connec.base_path'  => '/api'
+          }
+
+          @preset_config = {
+            'environment'       => 'production',
+            'app.host'          => 'http://myotherapp.com',
+            
+            'api.id'            => 'app-553941',
+            'api.key'           => 'otherapikey',
+
+            'connec.enabled'    => true,
+            'connec.host'       => 'https://other-provider.com',
+            'connec.base_path'  => '/data'
+          }
+
+          Maestrano.configure do |config|
+            config.environment = @config['environment']
+            config.app.host = @config['app.host']
+            
+            config.api.id = @config['api.id']
+            config.api.key = @config['api.key']
+
+            config.connec.enabled = @config['connec.enabled']
+            config.connec.host = @config['connec.host']
+            config.connec.base_path = @config['connec.base_path']
+          end
         
-        should "perform the right query" do
-          path = '/people'
-          body = { some: 'data'}
-          opts = { foo: 'bar' }
-          resp = mock('resp')
-          Maestrano::Connec::Client.expects(:post).with(@client.scoped_path(path),@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
-          assert_equal resp, @client.post(path,body,opts)
+          Maestrano[@preset].configure do |config|
+            config.environment = @preset_config['environment']
+            config.app.host = @preset_config['app.host']
+            
+            config.api.id = @preset_config['api.id']
+            config.api.key = @preset_config['api.key']
+
+            config.connec.enabled = @preset_config['connec.enabled']
+            config.connec.host = @preset_config['connec.host']
+            config.connec.base_path = @preset_config['connec.base_path']
+          end
+        end
+
+        context 'initializer' do
+          context '.base_uri' do
+            context 'in test' do
+              setup { Maestrano[@preset].configure { |config| config.environment = 'test' } }
+              setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+              
+              should "return the right uri" do
+                assert_equal "https://other-provider.com/data", Maestrano::Connec::Client[@preset].base_uri
+              end
+            end
+          
+            context 'in production' do
+              setup { Maestrano[@preset].configure { |config| config.environment = 'production' } }
+              setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+              
+              should "return the right uri" do
+                assert_equal "https://other-provider.com/data", Maestrano::Connec::Client[@preset].base_uri
+              end
+            end
+          end
         end
-      end
-      
-      context 'put' do
-        setup { @client = Maestrano::Connec::Client.new("cld-123") }
         
-        should "perform the right query" do
-          path = '/people/123'
-          body = { some: 'data'}
-          opts = { foo: 'bar' }
-          resp = mock('resp')
-          Maestrano::Connec::Client.expects(:put).with(@client.scoped_path(path),@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
-          assert_equal resp, @client.put(path,body,opts)
+        context 'scoped_path' do
+          setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+          
+          should "return the right scoped path" do
+            assert_equal "/cld-123/people", @client.scoped_path('/people')
+          end
+          
+          should "remove any leading or trailing slash" do
+            assert_equal "/cld-123/people", @client.scoped_path('/people/')
+          end
+        end
+        
+        context 'default_options' do
+          setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+          
+          should "return the right authentication options" do
+            expected_opts = {
+              basic_auth: { 
+                username: Maestrano[@preset].param('api.id'), 
+                password: Maestrano[@preset].param('api.key')
+              },
+              timeout: Maestrano[@preset].param('connec.timeout')
+            }
+            assert_equal expected_opts, @client.default_options
+          end
+        end
+        
+        context 'get' do
+          setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+          
+          should "perform the right query" do
+            path = '/people'
+            opts = { foo: 'bar' }
+            resp = mock('resp')
+            Maestrano::Connec::Client[@preset].expects(:get).with(@client.scoped_path(path),@client.default_options.merge(opts)).returns(resp)
+            assert_equal resp, @client.get(path,opts)
+          end
+        end
+        
+        context 'post' do
+          setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+          
+          should "perform the right query" do
+            path = '/people'
+            body = { some: 'data'}
+            opts = { foo: 'bar' }
+            resp = mock('resp')
+            Maestrano::Connec::Client[@preset].expects(:post).with(@client.scoped_path(path),@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
+            assert_equal resp, @client.post(path,body,opts)
+          end
+        end
+        
+        context 'put' do
+          setup { @client = Maestrano::Connec::Client[@preset].new("cld-123") }
+          
+          should "perform the right query" do
+            path = '/people/123'
+            body = { some: 'data'}
+            opts = { foo: 'bar' }
+            resp = mock('resp')
+            Maestrano::Connec::Client[@preset].expects(:put).with(@client.scoped_path(path),@client.default_options.merge(body: body.to_json).merge(opts)).returns(resp)
+            assert_equal resp, @client.put(path,body,opts)
+          end
         end
       end
     end