rack-cerberus 0.2.0 → 0.3.0

data/README.md

@@ -50,6 +50,16 @@ If you want to see a concrete example, go into the Cerberus directory and run:
 	
 It's gonna start the example at http://localhost:9292
 
+You can also use the 3rd argument which is the request object:
+
+use Cerberus, {:company_name => 'Nintendo'} do |login, pass, req|
+  pass=='secret' && req.xhr?
+end
+
+This is more if you use it as a gateway for an API or something and you want to check other values.
+Like the referer or another parameter.
+But bear in mind that `cerberus_login` and `cerberus_pass` are still mandatory.
+
 Logout
 ------
 
@@ -74,6 +84,7 @@ Changelog
 	0.1.5 Fix CSS and Javascript for IE (Yes I'm too kind)
 	0.1.6 Send an Array instead of a string to Rack so that it works on Ruby 1.9
 	0.2.0 External CSS file + `:text_color` option + keep details after login failure
+	0.3.0 Now sends request as a 3rd argument to the block
 
 Copyright
 ---------

data/cerberus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| 
   s.name = 'rack-cerberus'
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Rack middleware for form-based authentication"
   s.description = "A Rack middleware for form-based authentication. Aim is a compromise between fonctionality, beauty and customization."

data/cerberus.rb

@@ -85,7 +85,7 @@ PAGE
     login = req['cerberus_login']
     pass = req['cerberus_pass']
     err = req.post? ? "<p class='err'>Wrong login or password</p>" : ''
-    if ((env['rack.session']['cerberus_user']!=nil && env['PATH_INFO']!='/logout') || (login && pass && @block.call(login, pass)))
+    if ((env['rack.session']['cerberus_user']!=nil && env['PATH_INFO']!='/logout') || (login && pass && @block.call(login, pass, req)))
       env['rack.session']['cerberus_user'] ||= login
       if env['PATH_INFO']=='/logout'
         res = Rack::Response.new(env)

data/spec.rb

@@ -9,9 +9,9 @@ Bacon.summary_on_exit
 describe 'cerberus' do
   
   secret_app = lambda {|env| [200, {'Content-Type'=>'text/plain'}, env['rack.session'].inspect] }
-  app = Rack::Session::Cookie.new(Cerberus.new(secret_app, {}) {|login,pass| [login,pass]==['mario','bros']})
+  app = Rack::Session::Cookie.new(Cerberus.new(secret_app, {}) {|login,pass| [login,pass]==['mario@nintendo.com','bros']})
   req = Rack::MockRequest.new(app)
-  app_with_css = app = Rack::Session::Cookie.new(Cerberus.new(secret_app, {:css_location=>'/main.css'}) {|login,pass| [login,pass]==['mario','bros']})
+  app_with_css = Rack::Session::Cookie.new(Cerberus.new(secret_app, {:css_location=>'/main.css'}) {|login,pass| [login,pass]==['mario','bros']})
   req_with_css = Rack::MockRequest.new(app_with_css)
   cookie = ''
   
@@ -37,7 +37,7 @@ describe 'cerberus' do
   end
   
   should 'Give access with the appropriate login and pass' do
-    res = req.get('/', :params => {'cerberus_login' => 'mario', 'cerberus_pass' => 'bros'})
+    res = req.get('/', :params => {'cerberus_login' => 'mario@nintendo.com', 'cerberus_pass' => 'bros'})
     cookie = res["Set-Cookie"]
     res.status.should==200
   end
@@ -45,7 +45,7 @@ describe 'cerberus' do
   should 'Use session for persistent login' do
     res = req.get('/', "HTTP_COOKIE" => cookie)
     res.status.should==200
-    res.body.should=='{"cerberus_user"=>"mario"}'
+    res.body.should=='{"cerberus_user"=>"mario@nintendo.com"}'
     cookie = res["Set-Cookie"]
     req.get('/', "HTTP_COOKIE" => cookie).status.should==200
   end
@@ -59,12 +59,12 @@ describe 'cerberus' do
   end
   
   should 'Not send not_found when logging after a logout (because the path is /logout)' do
-    res = req.get('/logout', :params => {'cerberus_login' => 'mario', 'cerberus_pass' => 'bros'})
+    res = req.get('/logout', :params => {'cerberus_login' => 'mario@nintendo.com', 'cerberus_pass' => 'bros'})
     res.status.should==302
     res['Location'].should=='/'
     
     req = Rack::MockRequest.new(Rack::URLMap.new({'/backend' => app}))
-    res = req.get('/backend/logout', :params => {'cerberus_login' => 'mario', 'cerberus_pass' => 'bros'})
+    res = req.get('/backend/logout', :params => {'cerberus_login' => 'mario@nintendo.com', 'cerberus_pass' => 'bros'})
     res.status.should==302
     res['Location'].should=='/backend'
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-cerberus
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 +01:00
+date: 2011-10-07 00:00:00 +01:00
 default_executable: 
 dependencies: []