cassiopeia 0.0.4 → 0.0.5

data/README.rdoc

@@ -7,9 +7,10 @@
 - Yet another custom CAS client/server implementation
 
 = Changelog:
-- 0.0.4: Fixed problem with default config
+- 0.0.5: Some important fixes for configuration exceptions handling.
+- 0.0.4: Fixed problem with default config.
 - 0.0.3: Added required dependency simple_rest. Doc extended.
-- 0.0.2: Added some doc
+- 0.0.2: Added some doc.
 
 
 == SYNOPSIS:

data/Rakefile

@@ -10,7 +10,7 @@ PKG_FILES = FileList[ '[a-zA-Z]*',  'lib/**/*' ]
 
 spec = Gem::Specification.new do |s|
   s.name = "cassiopeia"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.author = "smecsia"
   s.email = "smecsia@gmail.com"
   #s.homepage = ""

data/lib/cassiopeia/action_controller_client_mixin.rb

@@ -43,7 +43,7 @@ module Cassiopeia
         if cas_required_roles
           logger.debug "\nCas check required roles #{cas_required_roles}...\n" + "="*50
           cas_required_roles.each do |r|
-            raise Cassiopeia::AccessDeniedException.new "You don't have required roles for this controller" unless current_user.has_role? r
+            raise Cassiopeia::Exception::AccessDenied.new "You don't have required roles for this controller" unless current_user.has_role? r
           end
         end
       end

data/lib/cassiopeia/action_controller_server_mixin.rb

@@ -10,17 +10,19 @@ module Cassiopeia
         @@ticketClass = c
       end
       def cas_ticket_id
-        session[@ticket_id_key] || params[@ticket_id_key]
+        params[@ticket_id_key] || session[@ticket_id_key]
       end
       def cas_service_url
-        session[@service_url_key] || params[@service_url_key]
+        params[@service_url_key] || session[@service_url_key]
       end
       def cas_service_id
-        session[@service_id_key] || params[@service_id_key]
+        params[@service_id_key] || session[@service_id_key]
       end
 
       def cas_require_config
-        raise "ticketClass should be set to use this functionality" unless @@ticketClass
+        unless @@ticketClass
+          raise ConfigRequired.new "ticketClass should be set to use this functionality"
+        end
       end
 
       def cas_store_params
@@ -93,20 +95,28 @@ module Cassiopeia
         end
       end
 
+      def cas_redirect_to(url)
+        unless url
+          logger.debug "\n Cannot detect url (params = #{params.to_json}, session = #{session.to_json} \n" + "="*50
+          raise Cassiopeia::Exception::InvalidUrl.new "Cannot detect url for redirection! Please, check configuration."
+        end
+        redirect_to url
+      end
+
       def cas_proceed_auth
         if cas_current_ticket_valid? && current_user
           logger.debug "\nCurrentTicketValid, current_user exists redirecting to service...\n" + "="*50
-          return redirect_to Cassiopeia::Server::instance.service_url(session)
+          return cas_redirect_to Cassiopeia::Server::instance.service_url(session)
         elsif current_user
           logger.debug "\nCurrentTicketInvalid, but current_user exists, should create new ticket...\n" + "="*50
           cas_current_ticket.destroy
           cas_create_or_find_ticket
-          return redirect_to Cassiopeia::Server::instance.service_url(session)
+          return cas_redirect_to Cassiopeia::Server::instance.service_url(session)
         elsif cas_current_ticket_exists?
           logger.debug "\nCurrentTicketInvalid, but current_user exists, destroying ticket, redirecting to login...\n" + "="*50
           cas_current_ticket.destroy
         end
-        redirect_to login_url
+        cas_redirect_to login_url
       end
 
       def create

data/lib/cassiopeia/base.rb

@@ -15,6 +15,12 @@ module Cassiopeia
     end
   end
 
-  class AccessDeniedException < Exception
+  module Exception
+    class ConfigRequired < Object::Exception
+    end
+    class AccessDenied < Object::Exception
+    end
+    class InvalidUrl < Object::Exception
+    end
   end
 end

data/lib/cassiopeia/config.rb

@@ -6,9 +6,9 @@ module Cassiopeia
     :ticket_max_lifetime => 120,
     :server_controller => "cas",
     :session_id_key => "cassiopeia_sesion_id",
-    :ticket_id_key => "ticket_id",
-    :service_id_key => "service_id",
-    :service_url_key => "service_url",
+    :ticket_id_key => "cas_ticket_id",
+    :service_id_key => "cas_service_id",
+    :service_url_key => "cas_service_url",
     :server_url => "https://localhost/cassiopeia",
     :service_url => "https://localhost/test_rails",
     :service_id => "test",

data/lib/cassiopeia/server.rb

@@ -1,10 +1,12 @@
 module Cassiopeia
   class Server < Base
+    SERVICE_KEY = Cassiopeia::CONFIG[:service_url_key]
+    TICKET_KEY = Cassiopeia::CONFIG[:ticket_id_key]
     private
     @instance = nil
     def cas_data(session)
       {
-        Cassiopeia::CONFIG[:ticket_id_key] => session[Cassiopeia::CONFIG[:ticket_id_key]]
+        TICKET_KEY => session[TICKET_KEY]
       }
     end
     public 
@@ -14,9 +16,11 @@ module Cassiopeia
     end
 
     def service_url(session)
-      session[Cassiopeia::CONFIG[:service_url_key]] + "?" + hash_to_query(cas_data(session))
+      if session && session[SERVICE_KEY] && session[TICKET_KEY]
+        session[SERVICE_KEY] + "?" + hash_to_query(cas_data(session))
+      end
     end
 
   end
-  
+
 end

data/lib/cassiopeia.rb

@@ -4,7 +4,7 @@ module Cassiopeia
   VERSION = '0.0.1'
   autoload :User, 'cassiopeia/user'
   autoload :Base, 'cassiopeia/base'
-  autoload :AccessDeniedException, 'cassiopeia/base'
+  autoload :Exception, 'cassiopeia/base'
   autoload :Server, 'cassiopeia/server'
   autoload :Client, 'cassiopeia/client'
   autoload :CONFIG, 'cassiopeia/config'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassiopeia
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - smecsia