remove initilize and move :url attribute processing into cas.rb

dlindahl · eriko · Nov 19, 2013 · Nov 19, 2013 · 90a2665e1d50dd658f6108de9e476901a5a283fc
commit 90a2665e1d50dd658f6108de9e476901a5a283fc
diff --git a/lib/omniauth/strategies/cas.rb b/lib/omniauth/strategies/cas.rb
@@ -55,10 +55,6 @@ class InvalidCASTicket < StandardError; end
         })
       end
 
-      def initialize( app, *args, &block )
-        super
-        @configuration = Configuration.new( @options )
-      end
 
       def callback_phase
         @ticket = request.params['ticket']
@@ -89,6 +85,10 @@ def request_phase
       #
       #
       def cas_url
+        extract_url if @options['url']
+
+        validate_cas_setup
+
         @cas_url ||= begin
           uri = Addressable::URI.new
           uri.host   = @options.host
@@ -100,6 +100,23 @@ def cas_url
         end
       end
 
+      def extract_url
+        url = Addressable::URI.parse( @options.delete('url') )
+
+        @options.merge!(
+            'host' => url.host,
+            'port' => url.port,
+            'path' => url.path,
+            'ssl'  => url.scheme == 'https'
+        )
+      end
+
+      def validate_cas_setup
+        if @options.host.nil? || @options.login_url.nil?
+          raise ArgumentError.new(":host and :login_url MUST be provided")
+        end
+      end
+
       # Build a service-validation URL from +service+ and +ticket+.
       # If +service+ has a ticket param, first remove it. URL-encode
       # +service+ and add it and the +ticket+ as paraemters to the

diff --git a/lib/omniauth/strategies/cas/configuration.rb b/lib/omniauth/strategies/cas/configuration.rb