maestrano 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94146280a117fc153c4747915002c5697c060788
-  data.tar.gz: 6ed575bd6107b474f198e8ca06dc05368d4486ff
+  metadata.gz: 6a4a440ceef4d8beb0f34cd2b0969c9547568120
+  data.tar.gz: 0386626517b5da4d14258d9a47aa9d9b7ce91ddb
 SHA512:
-  metadata.gz: e3f33f2d0360c1afca5cdd73dd987156e773eb363db502f5f272f92c2736af38f0d143b26c49847edec71b034c69f4d9aa803acbba7645746b1cf3a6f11335e4
-  data.tar.gz: a9d42f25ed6d85c22411cf58f5a2d2eba675c7bb1cfd6eda711675bbc659713503224b687607e3f98ffeb897638a0758d50359d01d5bccf503e766ff44c81f78
+  metadata.gz: 22a20f362b25e45debc2a744d2a9cc19c9511001bc771a9eca695527e8e2ee15dcd8ce4a2f3ae091da722e0904a16cbf17d5332b8fa48cc58a807135fb126aff
+  data.tar.gz: ddf8ad3e3b0f2b47606325c1b8a60c23c9a450f2e7f0d1d66f4a9897d3fa8ff04a498bc4841543442fbcd8b1839f9bfd38407567f2901dcba003eea259ca7ca4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maestrano (0.10.0)
+    maestrano (0.12.0)
       httparty (~> 0.13)
       json (~> 1.8)
       mime-types (~> 1.25)
@@ -12,10 +12,14 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    httparty (0.13.3)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    httparty (0.13.5)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    json (1.8.2)
+    json (1.8.3)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     metaclass (0.0.4)
@@ -24,21 +28,26 @@ GEM
     mocha (0.13.3)
       metaclass (~> 0.0.1)
     multi_xml (0.5.5)
-    netrc (0.10.2)
-    nokogiri (1.6.5)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     rake (10.3.2)
-    rest-client (1.7.2)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     shoulda (2.11.3)
-    systemu (2.6.4)
+    systemu (2.6.5)
     test-unit (2.5.5)
     timecop (0.6.0)
-    uuid (2.3.7)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    uuid (2.3.8)
       macaddr (~> 1.0)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Maestrano Pty. Ltd.
+Copyright (c) 2015 Maestrano Pty. Ltd.
 
 The MIT License (MIT)
 

data/README.md

@@ -68,6 +68,12 @@ gem 'maestrano'
 ### Configuration
 Once installed the first step is to create an initializer to configure the behaviour of the Maestrano gem - including setting your API key.
 
+You can add configuration presets by putting additional configuration blocks in your maestrano.rb initializer. These additional presets can then be specified when doing particular action, such as initializing a Connec!™ client or triggering a SSO handshake. These presets are particularly useful if you are dealing with multiple Maestrano-style marketplaces (multi-enterprise integration).
+
+If this is the first time you integrate with Maestrano, we recommend adopting a multi-tenant approach. All code samples in this documentation provide examples on how to handle multi-tenancy by scoping method calls to a specific configuration preset.
+
+More information about multi-tenant integration can be found on [Our Multi-Tenant Integration Guide](https://maestrano.atlassian.net/wiki/display/CONNECAPIV2/Multi-Tenant+Integration)
+
 The initializer should look like this:
 ```ruby
 # Use this block to configure the behaviour of Maestrano
@@ -204,18 +210,52 @@ Maestrano.configure do |config|
   # notified upon creation/update in Connec!™
   # 
   # config.webhook.connec.subscriptions = {
-  #   accounts: false,
-  #   company: false,
-  #   invoices: false,
-  #   items: false,
-  #   organizations: false,
-  #   people: false,
-  #   tax_codes: false,
-  #   tax_rates: false
+  #   accounts: true,
+  #   company: true,
+  #   employees: false,
+  #   events: false,
+  #   event_orders: false,
+  #   invoices: true,
+  #   items: true,
+  #   journals: false,
+  #   opportunities: true,
+  #   organizations: true,
+  #   payments: false,
+  #   pay_items: false,
+  #   pay_schedules: false,
+  #   pay_stubs: false,
+  #   pay_runs: false,
+  #   people: true,
+  #   projects: false,
+  #   purchase_orders: false,
+  #   quotes: false,
+  #   sales_orders: false,
+  #   tax_codes: true,
+  #   tax_rates: false,
+  #   time_activities: false,
+  #   time_sheets: false,
+  #   venues: false,
+  #   warehouses: false,
+  #   work_locations: false
   # }
 end
 ```
 
+If you need to support multiple marketplace providers, you can define configuration presets and switch between these at runtime:
+```ruby
+Maestrano['my-preset1'].configure do |config|
+  config.environment = 'production'
+  config.app.host = 'https://my-custom-provider1.com'
+  ...
+end
+
+Maestrano['my-preset2'].configure do |config|
+  config.environment = 'production'
+  config.app.host = 'https://my-custom-provider2.com'
+  ...
+end
+```
+
 ### Metadata Endpoint
 Your configuration initializer is now all setup and shiny. Great! But need to know about it. Of course
 we could propose a long and boring form on maestrano.com for you to fill all these details (especially the webhooks) but we thought it would be more convenient to fetch that automatically.
@@ -235,6 +275,8 @@ class MaestranoMetaDataController < ApplicationController
   
   def metadata
     render json: Maestrano.to_metadata
+    # Or using presets
+    # render json: Maestrano['my-preset'].to_metadata
   end
   
   private
@@ -252,6 +294,9 @@ end
 ```
 
 ## Single Sign-On Setup
+
+> **Heads up!** Prefer to use OpenID rather than our SAML implementation? Just look at our [OpenID Guide](https://maestrano.atlassian.net/wiki/display/CONNECAPIV2/SSO+via+OpenID) to get started!
+
 In order to get setup with single sign-on you will need a user model and a group model. It will also require you to write a controller for the init phase and consume phase of the single sign-on handshake.
 
 You might wonder why we need a 'group' on top of a user. Well Maestrano works with businesses and as such expects your service to be able to manage groups of users. A group represents 1) a billing entity 2) a collaboration group. During the first single sign-on handshake both a user and a group should be created. Additional users logging in via the same group should then be added to this existing group (see controller setup below)
@@ -342,7 +387,7 @@ Your controller will need to have two actions: init and consume. The init action
 The init action is all handled via Maestrano methods and should look like this:
 ```ruby
 def init
-  redirect_to Maestrano::Saml::Request.new(params,session).redirect_url
+  redirect_to Maestrano::Saml::Request['my-preset'].new(params,session).redirect_url
 end
 ```
 The params variable should contain the GET parameters of the request. The session variable should be the actual client session.
@@ -351,7 +396,7 @@ Based on your application requirements the consume action might look like this:
 ```ruby
 def consume
   # Process the response and extract information
-  saml_response = Maestrano::Saml::Response.new(params[:SAMLResponse])
+  saml_response = Maestrano::Saml::Response['my-preset'].new(params[:SAMLResponse])
   user_hash = Maestrano::SSO::BaseUser.new(saml_response).to_hash
   group_hash = Maestrano::SSO::BaseGroup.new(saml_response).to_hash
   membership_hash = Maestrano::SSO::BaseMembership.new(saml_response).to_hash
@@ -383,9 +428,9 @@ If you want your users to benefit from single logout then you should define the
 
 ```ruby
 def verify_maestrano_session
-  if Maestrano.param(:sso_enabled)
-    if session && session[:maestrano] && !Maestrano::SSO::Session.new(session).valid?
-      redirect_to Maestrano::SSO.init_url
+  if Maestrano['my-preset'].param(:sso_enabled)
+    if session && session[:maestrano] && !Maestrano::SSO['my-preset']::Session.new(session).valid?
+      redirect_to Maestrano::SSO['my-preset'].init_url
     end
   end
   true
@@ -658,6 +703,14 @@ bill = Maestrano::Account::Bill.retrieve("bill-f1d2s54")
 bill.cancel
 ```
 
+##### Using presets
+
+All actions can be performed with presets, for instance to list all bills with presets
+```ruby
+bills = Maestrano::Account::Bill['my-preset'].all
+bills.each { |b| puts b.id }
+```
+
 #### Recurring Bill
 A recurring bill charges a given customer at a regular interval without you having to do anything.
 
@@ -822,6 +875,13 @@ rec_bill = Maestrano::Account::RecurringBill.retrieve("rbill-f1d2s54")
 rec_bill.cancel
 ```
 
+##### Using presets
+
+All actions can be performed with presets, for instance to list all recurring bills with presets
+```ruby
+rec_bills = Maestrano::Account::RecurringBill['my-preset'].all
+rec_bills.each { |b| puts b.id }
+```
 
 ### Membership API
  
@@ -930,6 +990,13 @@ Access a single user by id
 user = Maestrano::Account::User.retrieve("usr-f1d2s54");
 ```
 
+##### Using presets
+
+All actions can be performed with presets, for instance to list all users with presets
+```ruby
+users = Maestrano::Account::User['my-preset'].all
+```
+
 #### Group
 A group represents a customer account and is composed of members (users) having access to your application. A group also represents a chargeable account (see Bill/RecurringBill). Typically you can remotely check if a group has entered a credit card on Maestrano.
 
@@ -1065,6 +1132,12 @@ Access a single group by id
 group = Maestrano::Account::Group.retrieve("usr-f1d2s54");
 ```
 
+##### Using presets
+
+All actions can be performed with presets, for instance to list all groups with presets
+```ruby
+groups = Maestrano::Account::Group['my-preset'].all
+```
 
 ## Connec!™ Data Sharing
 Maestrano offers the capability to share actual business data between applications via its data sharing platform Connec!™.
@@ -1096,6 +1169,10 @@ client.post('/organizations', { organizations: { name: "DoeCorp Inc."} })
 
 # Update an organization
 client.put('/organizations/e32303c1-5102-0132-661e-600308937d74', { organizations: { is_customer: true} })
+
+# With presets
+client_presets = Maestrano::Connec::Client['my-preset'].new("cld-f7f5g4")
+client_presets.get('/organizations')
 ```
 
 
@@ -1127,6 +1204,6 @@ So if you have any question or need help integrating with us just let us know at
 
 ## License
 
-MIT License. Copyright 2014 Maestrano Pty Ltd. https://maestrano.com
+MIT License. Copyright 2015 Maestrano Pty Ltd. https://maestrano.com
 
 You are not granted rights or licenses to the trademarks of Maestrano.

data/lib/maestrano/account/bill.rb

@@ -5,7 +5,7 @@ module Maestrano
       include Maestrano::API::Operation::Create
 
       def cancel
-        response, api_token = Maestrano::API::Operation::Base.request(:delete, url, @api_token)
+        response, api_token = Maestrano::API::Operation::Base[self.class.preset].request(:delete, url, @api_token)
         refresh_from(response, api_token)
         self
       end

data/lib/maestrano/account/recurring_bill.rb

@@ -5,7 +5,7 @@ module Maestrano
       include Maestrano::API::Operation::Create
 
       def cancel
-        response, api_token = Maestrano::API::Operation::Base.request(:delete, url, @api_token)
+        response, api_token = Maestrano::API::Operation::Base[self.class.preset].request(:delete, url, @api_token)
         refresh_from(response, api_token)
         self
       end

data/lib/maestrano/api/object.rb

@@ -1,6 +1,7 @@
 module Maestrano
   module API
     class Object
+      include Preset
       include Enumerable
 
       attr_accessor :api_token

data/lib/maestrano/api/operation/base.rb

@@ -2,17 +2,15 @@ module Maestrano
   module API
     module Operation
       module Base
-        # class << self
-        #   attr_accessor :api_token, :api_base, :verify_ssl_certs, :api_version
-        # end
-        
+        include Preset
+
         def self.api_url(url='')
-          Maestrano.param('api.host') + Maestrano.param('api.base') + url
+          Maestrano[self.preset].param('api.host') + Maestrano[self.preset].param('api.base') + url
         end
         
         # Perform remote request
         def self.request(method, url, api_token, params={}, headers={})
-          unless api_token ||= Maestrano.param('api_token')
+          unless api_token ||= Maestrano[self.preset].param('api_token')
             raise Maestrano::API::Error::AuthenticationError.new('No API key provided.')
           end
 
@@ -21,7 +19,7 @@ module Maestrano
           if self.ssl_preflight_passed?
             request_opts.update(
               verify_ssl: OpenSSL::SSL::VERIFY_PEER,
-              ssl_ca_file: Maestrano.param('ssl_bundle_path')
+              ssl_ca_file: Maestrano[self.preset].param('ssl_bundle_path')
             )
           end
 
@@ -69,13 +67,13 @@ module Maestrano
         private
 
         def self.ssl_preflight_passed?
-          if !Maestrano.param('api.verify_ssl_certs')
+          if !Maestrano[self.preset].param('api.verify_ssl_certs')
             #$stderr.puts "WARNING: Running without SSL cert verification. " +
             #  "Execute 'Maestrano.configure { |config| config.verify_ssl_certs = true' } to enable verification."
             return false
-          elsif !Util.file_readable(Maestrano.param('ssl_bundle_path'))
+          elsif !Util.file_readable(Maestrano[self.preset].param('ssl_bundle_path'))
             $stderr.puts "WARNING: Running without SSL cert verification " +
-              "because #{Maestrano.param('ssl_bundle_path')} isn't readable"
+              "because #{Maestrano[self.preset].param('ssl_bundle_path')} isn't readable"
 
             return false
           end
@@ -87,9 +85,9 @@ module Maestrano
           @uname ||= get_uname
 
           {
-            :bindings_version => Maestrano.param('api.version'),
-            :lang => Maestrano.param('api.lang'),
-            :lang_version => Maestrano.param('api.lang_version'),
+            :bindings_version => Maestrano[self.preset].param('api.version'),
+            :lang => Maestrano[self.preset].param('api.lang'),
+            :lang_version => Maestrano[self.preset].param('api.lang_version'),
             :platform => RUBY_PLATFORM,
             :publisher => 'maestrano',
             :uname => @uname
@@ -110,12 +108,12 @@ module Maestrano
 
         def self.request_headers(api_token)
           headers = {
-            :user_agent => "Maestrano/v1 RubyBindings/#{Maestrano.param('api.version')}",
+            :user_agent => "Maestrano/v1 RubyBindings/#{Maestrano[self.preset].param('api.version')}",
             :authorization => "Basic #{Base64.strict_encode64(api_token)}",
             :content_type => 'application/x-www-form-urlencoded'
           }
 
-          api_version = Maestrano.param('api_version')
+          api_version = Maestrano[self.preset].param('api_version')
           headers[:maestrano_version] = api_version if api_version
 
           begin

data/lib/maestrano/api/operation/create.rb

@@ -4,7 +4,7 @@ module Maestrano
       module Create
         module ClassMethods
           def create(params={}, api_token=nil)
-            response, api_token = Maestrano::API::Operation::Base.request(:post, self.url, api_token, params)
+            response, api_token = Maestrano::API::Operation::Base[self.preset].request(:post, self.url, api_token, params)
             Util.convert_to_maestrano_object(response, api_token)
           end
         end

data/lib/maestrano/api/operation/delete.rb

@@ -3,7 +3,7 @@ module Maestrano
     module Operation
       module Delete
         def delete(params = {})
-          response, api_token = Maestrano::API::Operation::Base.request(:delete, url, @api_token, params)
+          response, api_token = Maestrano::API::Operation::Base[self.class.preset].request(:delete, url, @api_token, params)
           refresh_from(response, api_token)
           self
         end

data/lib/maestrano/api/operation/list.rb

@@ -4,7 +4,7 @@ module Maestrano
       module List
         module ClassMethods
           def all(filters={}, api_token=nil)
-            response, api_token = Maestrano::API::Operation::Base.request(:get, url, api_token, filters)
+            response, api_token = Maestrano::API::Operation::Base[self.preset].request(:get, url, api_token, filters)
             Util.convert_to_maestrano_object(response, api_token)
           end
         end

data/lib/maestrano/api/operation/update.rb

@@ -12,7 +12,7 @@ module Maestrano
           if values.length > 0
             values.delete(:id)
 
-            response, api_token = Maestrano::API::Operation::Base.request(:put, url, @api_token, values)
+            response, api_token = Maestrano::API::Operation::Base[self.class.preset].request(:put, url, @api_token, values)
             refresh_from(response, api_token)
           end
           self

data/lib/maestrano/connec/client.rb

@@ -2,8 +2,8 @@ require 'httparty'
 
 module Maestrano
   module Connec
-    
     class Client
+      include Preset
       include ::HTTParty
       headers 'Accept' => 'application/vnd.api+json'
       headers 'Content-Type' => 'application/vnd.api+json'
@@ -13,7 +13,7 @@ module Maestrano
       
       def initialize(group_id)
         @group_id = group_id
-        self.class.base_uri("#{Maestrano.param('connec.host')}#{Maestrano.param('connec.base_path')}")
+        self.class.base_uri("#{Maestrano[self.class.preset].param('connec.host')}#{Maestrano[self.class.preset].param('connec.base_path')}")
       end
       
       # Return the default options which includes
@@ -21,9 +21,10 @@ module Maestrano
       def default_options
         {
           basic_auth: { 
-            username: Maestrano.param('api.id'), 
-            password: Maestrano.param('api.key')
-          } 
+            username: Maestrano[self.class.preset].param('api.id'), 
+            password: Maestrano[self.class.preset].param('api.key')
+          },
+          timeout: Maestrano[self.class.preset].param('connec.timeout')
         }
       end
       

data/lib/maestrano/preset.rb

@@ -0,0 +1,23 @@
+# When included, this module allows another module to be called setting a default preset
+#
+# Examples:
+# Maestrano::Settings.new               # Uses 'default' preset
+# Maestrano['mypreset']::Settings.new   # Uses 'mypreset'
+module Maestrano
+  module Preset
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def [](preset)
+        define_singleton_method(:preset) { preset }        
+        self
+      end
+
+      def preset
+        'default'
+      end
+    end
+  end
+end

data/lib/maestrano/saml/request.rb

@@ -7,12 +7,13 @@ require "rexml/xpath"
 
 module Maestrano
   module Saml
-  include REXML
+    include REXML
     class Request
+      include Preset
       attr_accessor :settings, :params, :session
-      
+
       def initialize(params = {}, session = {})
-        self.settings = Maestrano::SSO.saml_settings
+        self.settings = Maestrano::SSO[self.class.preset].saml_settings
         self.params = params
         self.session = session
       end

data/lib/maestrano/saml/response.rb

@@ -4,8 +4,9 @@ require "nokogiri"
 # Only supports SAML 2.0
 module Maestrano
   module Saml
-
     class Response
+      include Preset
+
       ASSERTION = "urn:oasis:names:tc:SAML:2.0:assertion"
       PROTOCOL  = "urn:oasis:names:tc:SAML:2.0:protocol"
       DSIG      = "http://www.w3.org/2000/09/xmldsig#"
@@ -22,7 +23,7 @@ module Maestrano
         @options  = options
         @response = (response =~ /^</) ? response : Base64.decode64(response)
         @document = Maestrano::XMLSecurity::SignedDocument.new(@response)
-        @settings = Maestrano::SSO.saml_settings
+        @settings = Maestrano::SSO[self.class.preset].saml_settings
       end
 
       def is_valid?

data/lib/maestrano/sso/base_user.rb

@@ -1,6 +1,7 @@
 module Maestrano
   module SSO
     class BaseUser
+      include Preset
       attr_accessor :local_id
       attr_reader :sso_session,:sso_session_recheck,
         :group_uid,:group_role,:uid,:virtual_uid,:email,
@@ -26,7 +27,7 @@ module Maestrano
       end
       
       def to_uid
-        if Maestrano.param('sso.creation_mode') == 'real'
+        if Maestrano[self.class.preset].param('sso.creation_mode') == 'real'
           return self.uid
         else
           return self.virtual_uid
@@ -34,7 +35,7 @@ module Maestrano
       end
       
       def to_email
-        if Maestrano.param('sso.creation_mode') == 'real'
+        if Maestrano[self.class.preset].param('sso.creation_mode') == 'real'
           return self.email
         else
           return self.virtual_email

data/lib/maestrano/sso/session.rb

@@ -1,6 +1,7 @@
 module Maestrano
   module SSO
     class Session
+      include Preset
       attr_accessor :session, :uid, :session_token, :recheck, :group_uid
       
       # Load a Maestrano::SSO::Session object from a
@@ -49,7 +50,7 @@ module Maestrano
       # false otherwise
       def perform_remote_check
         # Get remote session info
-        url = Maestrano::SSO.session_check_url(self.uid, self.session_token)
+        url = Maestrano::SSO[self.class.preset].session_check_url(self.uid, self.session_token)
         begin
           response = RestClient.get(url)
           response = JSON.parse(response)
@@ -78,7 +79,7 @@ module Maestrano
       # a session should be restricted to maestrano users only
       # within an application
       def valid?(opts = {})
-        return true unless Maestrano.param('sso.slo_enabled')
+        return true unless Maestrano[self.class.preset].param('sso.slo_enabled')
         return true if opts[:if_session] && (!self.session || (!self.session[:maestrano] && !self.session['maestrano']))
         return false unless self.session 
         

data/lib/maestrano/sso.rb

@@ -1,66 +1,67 @@
 module Maestrano
   module SSO
+    include Preset
     
     # Return the saml_settings based on
     # Maestrano configuration
     def self.saml_settings
       settings = Maestrano::Saml::Settings.new
       settings.assertion_consumer_service_url = self.consume_url
-      settings.issuer                         = Maestrano.param('api.id')
+      settings.issuer                         = Maestrano[preset].param('api.id')
       settings.idp_sso_target_url             = self.idp_url
-      settings.idp_cert_fingerprint           = Maestrano.param('sso_x509_fingerprint')
-      settings.name_identifier_format         = Maestrano.param('sso_name_id_format')
+      settings.idp_cert_fingerprint           = Maestrano[preset].param('sso_x509_fingerprint')
+      settings.name_identifier_format         = Maestrano[preset].param('sso_name_id_format')
       settings
     end
     
     # Build a new SAML Request
     def self.build_request(get_params = {})
-      Maestrano::Saml::Request.new(get_params)
+      Maestrano::Saml::Request[preset].new(get_params)
     end
     
     # Build a new SAML response
     def self.build_response(saml_post_param)
-      Maestrano::Saml::Response.new(saml_post_param)
+      Maestrano::Saml::Response[preset].new(saml_post_param)
     end
     
     def self.enabled?
-      !!Maestrano.param('sso.enabled')
+      !!Maestrano[preset].param('sso.enabled')
     end
     
     def self.init_url
-      host = Maestrano.param('sso.idm')
-      path = Maestrano.param('sso.init_path')
+      host = Maestrano[preset].param('sso.idm')
+      path = Maestrano[preset].param('sso.init_path')
       return "#{host}#{path}"
     end
     
     def self.consume_url
-      host = Maestrano.param('sso.idm')
-      path = Maestrano.param('sso.consume_path')
+      host = Maestrano[preset].param('sso.idm')
+      path = Maestrano[preset].param('sso.consume_path')
       return "#{host}#{path}"
     end
     
     def self.logout_url
-      host = Maestrano.param('api_host')
+      host = Maestrano[preset].param('api_host')
       path = '/app_logout'
       return "#{host}#{path}"
     end
     
     def self.unauthorized_url
-      host = Maestrano.param('api_host')
+      host = Maestrano[preset].param('api_host')
       path = '/app_access_unauthorized'
       return "#{host}#{path}";
     end
     
     def self.idp_url
-      host = Maestrano.param('api_host')
-      api_base = Maestrano.param('api_base')
+      host = Maestrano[preset].param('api_host')
+      api_base = Maestrano[preset].param('api_base')
       endpoint = 'auth/saml'
       return "#{host}#{api_base}#{endpoint}"
     end
     
     def self.session_check_url(user_uid,sso_session) 
-      host = Maestrano.param('api_host')
-      api_base = Maestrano.param('api_base')
+      host = Maestrano[preset].param('api_host')
+      api_base = Maestrano[preset].param('api_base')
       endpoint = 'auth/saml'
       return URI.escape("#{host}#{api_base}#{endpoint}/#{user_uid}?session=#{sso_session}")
     end
@@ -69,7 +70,7 @@ module Maestrano
     # Takes the BaseUser hash representation and current session
     # in arguments
     def self.set_session(session, auth)
-      Maestrano::SSO::Session.from_user_auth_hash(session,auth).save
+      Maestrano::SSO::Session[preset].from_user_auth_hash(session,auth).save
     end
     
     # Destroy the maestrano session in http session

data/lib/maestrano/version.rb

@@ -1,3 +1,3 @@
 module Maestrano
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end