rack-cas 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cf9f06c6db0201c3d5bcadb8158c390622630cf
-  data.tar.gz: 1fc8eb9bbf210d5de67d3e68d4b4f99a0f2118ad
+  metadata.gz: be59f7030ccb7a62223fbddaa9529f50765ba0b0
+  data.tar.gz: 8e1a4ea3773a8b7306f328a5406a61c01404812d
 SHA512:
-  metadata.gz: 253fa6cc882ad0f229f5ae470e422111949bd8255490c9db21f24a491df6d8f234915309b0fe59057ec727e3a15d9759d44bbcfe14455b3cbc4db026536d84f5
-  data.tar.gz: 1741c9fe41dc735907fc1a5483687302a9cee328c3787b483e440720d5f5c07f54c9a86589d4e9a2d10a6da6351d1faf1788d09f89da182156590f593f4a77e8
+  metadata.gz: 78f0a1a537f74cf2b9af832e8fa5262b8f9738a82b2d2d556f720f151cfb1bb61612d03bca63240e77ce21715e517c072cd632d60266fa4a9a7ee79c1c4722de
+  data.tar.gz: bb51611875bb791f5589b3ea2f0277afb9ac1d65ea3ff2f417b9e72fe9d3289b04184155c7b0e0ca7c92b9ac7b2334a5acb2d842f68bbb7317606ce4a057fce2

data/README.markdown

@@ -5,15 +5,15 @@ Rack-CAS is simple [Rack](http://rack.github.com/) middleware to perform [CAS](h
 Features
 ========
 * __Rack based__
-* __Framework independent__  
+* __Framework independent__
 Works with, but doesn't depend on Rails, Sinatra, etc.
-* __Minimal dependencies__  
+* __Minimal dependencies__
 Current gem dependencies are [rack](http://rubygems.org/gems/rack), [addressable](http://rubygems.org/gems/addressable) and [nokogiri](http://rubygems.org/gems/nokogiri).
-* __Supports CAS extra attributes__  
+* __Supports CAS extra attributes__
 Extra attributes are a mess though. So let me know if your brand of CAS server isn't supported.
-* __Single sign out__  
+* __Single sign out__
 One of the included session stores must be used.
-* __Rake tasks to prune stale sessions__  
+* __Rake tasks to prune stale sessions__
 `rack_cas:sessions:prune:active_record` and `rack_cas:sessions:prune:mongoid`
 
 Requirements
@@ -128,10 +128,19 @@ Integration testing using something like [Capybara](http://jnicklas.github.com/c
     require 'rack/fake_cas'
     use Rack::FakeCAS
 
+In addition you can pass a Hash to configure extra attributes for predefined
+usernames.
+
+    use Rack::FakeCAS, {}, {'john' => {'name' => 'John Doe'}}
+
 If you are using Rails, FakeCAS is automatically used in the test environment by default. If you would like to activate it in any other environment, add the following to the corresponding `config/environments/<env>.rb`:
 
     config.rack_cas.fake = true
 
+You can also configure extra attribute mappings through the Rails config:
+
+    config.rack_cas.fake_attributes = { 'john' => { 'name' => 'John Doe' } }
+
 Then you can simply do the following in your integration tests in order to log in.
 
     visit '/restricted_path'

data/lib/rack-cas/railtie.rb

@@ -5,7 +5,7 @@ module RackCAS
     initializer 'rack_cas.initialize' do |app|
       if config.rack_cas.fake || (config.rack_cas.fake.nil? && Rails.env.test?)
         require 'rack/fake_cas'
-        app.middleware.use Rack::FakeCAS, config.rack_cas
+        app.middleware.use Rack::FakeCAS, config.rack_cas, config.rack_cas.fake_attributes
       elsif !config.rack_cas.server_url.nil? # for backwards compatibility
         require 'rack/cas'
         app.middleware.use Rack::CAS, config.rack_cas
@@ -16,4 +16,4 @@ module RackCAS
       load File.expand_path('../../tasks/session_prune.rake', __FILE__)
     end
   end
-end
+end

data/lib/rack-cas/session_store/active_record.rb

@@ -30,18 +30,20 @@ module RackCAS
     def set_session(env, sid, session_data, options)
       cas_ticket = (session_data['cas']['ticket'] unless session_data['cas'].nil?)
 
-      session = if ActiveRecord.version >= Gem::Version.new('4.0.0')
+      session = if ActiveRecord.respond_to?(:version) && ActiveRecord.version >= Gem::Version.new('4.0.0')
         Session.where(session_id: sid).first_or_initialize
       else
         Session.find_or_initialize_by_session_id(sid)
       end
-      success = session.update_attributes(data: pack(session_data), cas_ticket: cas_ticket)
+      session.data = pack(session_data)
+      session.cas_ticket = cas_ticket
+      success = session.save
 
       success ? session.session_id : false
     end
 
     def destroy_session(env, sid, options)
-      session = Session.where(session_id: sid).delete_all
+      Session.where(session_id: sid).delete_all
 
       options[:drop] ? nil : generate_sid
     end

data/lib/rack-cas/version.rb

@@ -1,3 +1,3 @@
 module RackCAS
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/lib/rack/fake_cas.rb

@@ -2,9 +2,10 @@ require 'rack'
 require 'rack-cas/cas_request'
 
 class Rack::FakeCAS
-  def initialize(app, config={})
+  def initialize(app, config={}, attributes_config={})
     @app = app
     @config = config || {}
+    @attributes_config = attributes_config || {}
   end
 
   def call(env)
@@ -14,12 +15,13 @@ class Rack::FakeCAS
     if cas_request.path_matches? @config[:exclude_paths] || @config[:exclude_path]
       return @app.call(env)
     end
-    
+
     case @request.path_info
     when '/login'
+      username = @request.params['username']
       @request.session['cas'] = {}
-      @request.session['cas']['user'] = @request.params['username']
-      @request.session['cas']['extra_attributes'] = {}
+      @request.session['cas']['user'] = username
+      @request.session['cas']['extra_attributes'] = @attributes_config.fetch(username, {})
       redirect_to @request.params['service']
 
     when '/logout'
@@ -64,4 +66,4 @@ class Rack::FakeCAS
   def redirect_to(url)
     [ 302, { 'Content-Type' => 'text/plain', 'Location' => url }, ['Redirecting you...'] ]
   end
-end
+end

metadata

@@ -1,129 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: rack-cas
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Adam Crownoble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: Simple CAS authentication for Rails, Sinatra or any Rack-based site
 email: adam.crownoble@biola.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.markdown
 - MIT-LICENSE
-- lib/rack-cas/railtie.rb
-- lib/rack-cas/url.rb
-- lib/rack-cas/version.rb
-- lib/rack-cas/service_validation_response.rb
+- README.markdown
+- lib/generators/cas_session_store_migration_generator.rb
+- lib/generators/templates/migration.rb
+- lib/rack-cas.rb
 - lib/rack-cas/cas_request.rb
+- lib/rack-cas/railtie.rb
 - lib/rack-cas/server.rb
+- lib/rack-cas/service_validation_response.rb
 - lib/rack-cas/session_store/active_record.rb
-- lib/rack-cas/session_store/rails/active_record.rb
-- lib/rack-cas/session_store/rails/mongo.rb
-- lib/rack-cas/session_store/rails/mongoid.rb
 - lib/rack-cas/session_store/mongo.rb
 - lib/rack-cas/session_store/mongoid.rb
 - lib/rack-cas/session_store/rack/mongo.rb
 - lib/rack-cas/session_store/rack/mongoid.rb
-- lib/rack-cas.rb
-- lib/generators/cas_session_store_migration_generator.rb
-- lib/generators/templates/migration.rb
+- lib/rack-cas/session_store/rails/active_record.rb
+- lib/rack-cas/session_store/rails/mongo.rb
+- lib/rack-cas/session_store/rails/mongoid.rb
+- lib/rack-cas/url.rb
+- lib/rack-cas/version.rb
 - lib/rack/cas.rb
 - lib/rack/fake_cas.rb
 - lib/tasks/session_prune.rake
 homepage: https://github.com/biola/rack-cas
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -131,17 +132,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rack-based CAS client