cassiopeia 0.1.7 → 0.2.0

data/README.rdoc

@@ -7,6 +7,9 @@
 - Yet another custom CAS client/server implementation. This plugin allows you to perform single-server authorization between two different rails applications. 
 
 = Changelog:
+- 0.2.0: Rails 3 support implemented (no backward compatibility with Rails 2)
+- 0.1.7: First stage of compatibility with Rails 3 (RAILS_ROOT replaced with Rails.root)
+- 0.1.6: Minor hot-fixes
 - 0.1.5: Method to_json of User class fixed.
 - 0.1.3: Removing request after return made optional
 - 0.1.2: Added some new parameters of request saving to the default configuration.

data/Rakefile

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = "Rails plugin for custom CAS(Cassiopeia) server/client implementation"
   s.add_dependency('uuidtools')
-  s.add_dependency('rails', '>=2.3.5')
+  s.add_dependency('rails', '>=3.0.0')
   s.files = PKG_FILES.to_a 
   s.require_path = "lib"
   s.has_rdoc = false

data/lib/cassiopeia.rb

@@ -1,31 +1,28 @@
 $:.unshift(File.dirname(__FILE__)) unless
 $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require "cassiopeia/railtie"
+
 module Cassiopeia
-  VERSION = '0.1.7'
+  VERSION = '0.2.0'
   autoload :User, 'cassiopeia/user'
   autoload :Base, 'cassiopeia/base'
   autoload :Exception, 'cassiopeia/base'
   autoload :Server, 'cassiopeia/server'
   autoload :Client, 'cassiopeia/client'
-  autoload :CONFIG, 'cassiopeia/config'
   autoload :ActiveRecordServerMixin, 'cassiopeia/active_record_server_mixin'
   autoload :ActionControllerServerMixin, 'cassiopeia/action_controller_server_mixin'
   autoload :ActionControllerClientMixin, 'cassiopeia/action_controller_client_mixin'
   autoload :RackRestoreRequest, 'cassiopeia/rack_restore_request'
   autoload :BaseRack, 'cassiopeia/base_rack'
   autoload :CassiopeiaRequest, 'cassiopeia/client'
+  autoload :CONFIG, 'cassiopeia/config'
 
   class << self
     def enable
       ActionController::Base.send :extend, ActionControllerServerMixin
       ActiveRecord::Base.send :extend, ActiveRecordServerMixin
       ActionController::Base.send :extend, ActionControllerClientMixin
-      Rails.configuration.middleware.use RackRestoreRequest if CONFIG[:service_id]
       puts "Cassiopeia #{VERSION} enabled"
     end
   end
 end
-
-if defined? Rails && defined? Rails.root
-  Cassiopeia.enable
-end

data/lib/cassiopeia/action_controller_client_mixin.rb

@@ -22,9 +22,10 @@ module Cassiopeia
         session[CAS_TICKET_ID_KEY] = nil
       end
       def cas_current_ticket_valid?
+        utc = ActiveSupport::TimeZone['UTC']
         logger.debug "\n Ticket.expires_at= #{cas_current_ticket[:expires_at]} \n" + "="*50 if cas_current_ticket
-        logger.debug "\nCurrent ticket valid: #{DateTime.parse(cas_current_ticket[:expires_at])} >= #{DateTime.now}\n" + "="*50 if cas_current_ticket && cas_current_ticket[:expires_at]
-        cas_current_ticket && DateTime.parse(cas_current_ticket[:expires_at]) >= DateTime.now if cas_current_ticket && cas_current_ticket[:expires_at]
+        logger.debug "\nCurrent ticket valid: #{utc.parse(cas_current_ticket[:expires_at])} >= #{Time.now.utc}\n" + "="*50 if cas_current_ticket && cas_current_ticket[:expires_at]
+        cas_current_ticket && utc.parse(cas_current_ticket[:expires_at]) >= Time.now.utc if cas_current_ticket && cas_current_ticket[:expires_at]
       end
       def cas_request_ticket_id
         logger.debug "\nStoring current request:...#{params[CAS_UNIQUE_REQ_KEY]} \n" + "="*50

data/lib/cassiopeia/base.rb

@@ -2,7 +2,9 @@ module Cassiopeia
   class Base
     protected
     def query_to_hash(query)
-      CGI.parse(query)
+      h = CGI.parse(query)
+      h.each { |k, v| h[k] = *v }
+      h
     end
 
     def hash_to_query(hash)

data/lib/cassiopeia/base_rack.rb

@@ -23,7 +23,7 @@ module Cassiopeia
 
     def cas_current_ticket_valid?(env)
       @ticket = cas_current_ticket(env)
-      @ticket && DateTime.parse(@ticket[:expires_at]) >= DateTime.now if @ticket && @ticket[:expires_at]
+      @ticket && ActiveSupport::TimeZone['UTC'].parse(@ticket[:expires_at]) >= Time.now.utc if @ticket && @ticket[:expires_at]
     end
 
     def enabled
@@ -48,7 +48,7 @@ module Cassiopeia
     end
 
     def generate_expiration
-      DateTime.now() + CAS_REQ_TIMEOUT / 24.0 / 60.0
+      Time.now.utc + CAS_REQ_TIMEOUT / 24.0 / 60.0
     end
 
     def generate_req_key

data/lib/cassiopeia/railtie.rb

@@ -0,0 +1,10 @@
+require "rails"
+
+module Cassiopeia
+  class Railtie < Rails::Railtie
+    initializer 'cassiopeia.init_config' do
+      Cassiopeia.enable
+      Rails::Application.middleware.use Cassiopeia::RackRestoreRequest if Cassiopeia::CONFIG[:service_id]
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cassiopeia
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - smecsia
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +03:00
+date: 2010-11-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 description: 
@@ -57,20 +57,21 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- README.rdoc
 - Rakefile
-- lib/cassiopeia.rb
+- README.rdoc
+- lib/cassiopeia/action_controller_client_mixin.rb
+- lib/cassiopeia/rack_restore_request.rb
+- lib/cassiopeia/user.rb
+- lib/cassiopeia/server.rb
+- lib/cassiopeia/client.rb
 - lib/cassiopeia/active_record_server_mixin.rb
-- lib/cassiopeia/base_rack.rb
 - lib/cassiopeia/action_controller_server_mixin.rb
+- lib/cassiopeia/base_rack.rb
 - lib/cassiopeia/config.rb
-- lib/cassiopeia/server.rb
-- lib/cassiopeia/user.rb
-- lib/cassiopeia/rack_restore_request.rb
-- lib/cassiopeia/client.rb
 - lib/cassiopeia/tickets_controller_config.rb
-- lib/cassiopeia/action_controller_client_mixin.rb
 - lib/cassiopeia/base.rb
+- lib/cassiopeia/railtie.rb
+- lib/cassiopeia.rb
 has_rdoc: true
 homepage: 
 licenses: []