maestrano 1.0.0.pre.RC5 → 1.0.0.pre.RC6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 026f33b3cb669405a068fd77f74860e6767950d8
-  data.tar.gz: 6a04ca35d44ddeb69ba115f09d43157c6cb55b6a
+  metadata.gz: b720f84401056435fcd026e06a127783a0dc3c07
+  data.tar.gz: 5e6e7e0b88f4aefe47de983c8bf178e5056fa8fb
 SHA512:
-  metadata.gz: 83aa95476fd6c663d3a091fe521c6f917fc925dbd16b315663b47cc486ddd301af58b01a987421992feb99714d8aa5b368a62a150e803c657f4210879a6bde06
-  data.tar.gz: a2b69dadf460026c307716e57466225071a34fbd01cd6d98bdc80226ffe481c6b8630eb6def6824b4d372283430f1184711d0289926745026b25261a10502545
+  metadata.gz: 24c500254104e9935c15a349989936e8fb3e51f6c726af7e28668f9c2e40691dd5e805a87db610bf9964f02893dce8412655745f5655c90941284d09c290fff3
+  data.tar.gz: 8d012ab2d904f05737e72695584dddea8175957d7d924040537a138823889d2df5812fb008ea0eb676b3c0df4305f192796fa51ccb14ab52274742b601673028

data/lib/maestrano.rb

@@ -188,8 +188,8 @@ module Maestrano
         token: nil,
         version: nil,
         verify_ssl_certs: false,
-        lang: nil, #set in post_initialize
-        lang_version: nil #set in post_initialize
+        lang: nil, # set in post_initialize
+        lang_version: nil # set in post_initialize
       })
 
       # SSO Config
@@ -199,6 +199,7 @@ module Maestrano
         creation_mode: 'real',
         init_path: '/maestrano/auth/saml/init',
         consume_path: '/maestrano/auth/saml/consume',
+        name_id_format: nil, # set in post_initialize
         idm: nil
       })
 
@@ -228,7 +229,10 @@ module Maestrano
       self.api.lang = 'ruby'
       self.api.lang_version = "#{RUBY_VERSION} p#{RUBY_PATCHLEVEL} (#{RUBY_RELEASE_DATE})"
       self.sso.idm ||= self.app.host
+      self.sso.name_id_format ||= Maestrano::Saml::Settings::NAMEID_PERSISTENT
       self.sso.slo_enabled &&= self.sso.enabled
+      self.connec.base_path ||= '/api/v2' unless self.environment == 'test' # Sandbox has a different endpoint
+      self.connec.timeout ||= 60
     end
 
     # Transform legacy parameters into new parameter

data/lib/maestrano/sso.rb

@@ -60,7 +60,7 @@ module Maestrano
       return "#{host}#{api_base}#{endpoint}"
     end
 
-    def self.session_check_url(user_uid,sso_session)
+    def self.session_check_url(user_uid, sso_session)
       host = Maestrano[preset].param('api.host')
       api_base = Maestrano[preset].param('api.base')
       endpoint = 'auth/saml'

data/lib/maestrano/sso/user.rb

@@ -14,7 +14,7 @@ module Maestrano
         # end
         raise NoMethodError, "You need to override find_for_maestrano_auth in your #{self.class.name} model"
       end
-      
+
       # Check whether the user is a maestrano one
       def maestrano?
         if self.respond_to?(:provider)
@@ -23,12 +23,12 @@ module Maestrano
           raise NoMethodError, "You need to override maestrano? in your #{self.class.name} model"
         end
       end
-      
+
       # Check whether the SSO session is still valid
       # or not
-      def maestrano_session_valid?(session)
-        Maestrano::SSO::Session.new(session).valid?
+      def maestrano_session_valid?(session, preset = nil)
+        Maestrano::SSO::Session[preset].new(session).valid?
       end
     end
   end
-end
+end

data/lib/maestrano/version.rb

@@ -1,3 +1,3 @@
 module Maestrano
-  VERSION = '1.0.0.pre.RC5'
+  VERSION = '1.0.0.pre.RC6'
 end

data/test/maestrano/maestrano_test.rb

@@ -94,6 +94,7 @@ class MaestranoTest < Test::Unit::TestCase
 
     context "with environment params" do
       should "return the right test parameters" do
+        Maestrano.reset!
         Maestrano.configure { |config| config.environment = 'test' }
 
         ['api.host', 'api.base', 'sso.idp', 'sso.name_id_format', 'sso.x509_certificate', 'connec.host', 'connec.base_path'].each do |parameter|
@@ -230,6 +231,7 @@ class MaestranoTest < Test::Unit::TestCase
 
     context "with environment params" do
       should "return the right test parameters" do
+        @preset = 'test'
         Maestrano[@preset].configure { |config| config.environment = 'test' }
 
         ['api.host','api.base','sso.idp', 'sso.name_id_format', 'sso.x509_certificate', 'connec.host','connec.base_path'].each do |parameter|
@@ -509,5 +511,4 @@ class MaestranoTest < Test::Unit::TestCase
       assert_equal expected, Maestrano.to_metadata
     end
   end
-
 end

data/test/maestrano/sso/user_test.rb

@@ -9,14 +9,14 @@ module Maestrano
           include Maestrano::SSO::User
         end
       end
-  
+
       context "find_for_maestrano_auth" do
         should "raise an error if not overriden" do
           assert_raise(NoMethodError.new("You need to override find_for_maestrano_auth in your Mocha::Mock model")) do
             @user.find_for_maestrano_auth({})
           end
         end
-    
+
         should "execute properly otherwise" do
           def @user.find_for_maestrano_auth(auth); return true; end
           assert_nothing_thrown do
@@ -24,25 +24,25 @@ module Maestrano
           end
         end
       end
-  
+
       context "maestrano?" do
         should "raise an error if no provider attribute and not overriden" do
           assert_raise(NoMethodError.new("You need to override maestrano? in your Mocha::Mock model")) do
             @user.maestrano?
           end
         end
-    
+
         should "return true if the provider is 'maestrano'" do
           @user.stubs(:provider).returns('maestrano')
           assert @user.maestrano?
         end
-    
+
         should "return false if the provider is something else" do
           @user.stubs(:provider).returns('someprovider')
           assert !@user.maestrano?
         end
       end
-  
+
       context "maestrano_session_valid?" do
         should "return true if the sso session is valid" do
           session = {}
@@ -51,7 +51,7 @@ module Maestrano
           sso_session.stubs(:valid?).returns(true)
           assert @user.maestrano_session_valid?(session)
         end
-    
+
         should "return false if the sso session is invalid" do
           session = {}
           sso_session = mock('sso_session')
@@ -62,4 +62,4 @@ module Maestrano
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.RC5
+  version: 1.0.0.pre.RC6
 platform: ruby
 authors:
 - Arnaud Lachaume
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client