rack_global_session 0.2 → 0.3

data/lib/rack_global_session.rb

@@ -135,17 +135,30 @@ module Rack
         begin
           read_cookie(env)
           renew_ticket(env)
-          tuple = @app.call(env)
         rescue Exception => e
           wipe_cookie(env)
           $stderr.puts "Error while reading cookies: #{e.class} #{e} #{e.backtrace}"
           if env['rack.logger']
             env['rack.logger'].error("Error while reading cookies: #{e.class} #{e} #{e.backtrace}")
           end
-          return [503, {'Content-Type' => 'text/plain'}, "Invalid cookie"]
+          return [403, {'Content-Type' => 'text/plain'}, "Invalid cookie"]
         else
-          update_cookie(env)
-          return tuple
+          begin
+            tuple = @app.call(env)
+          rescue HasGlobalSession::NoAuthority => e
+            wipe_cookie(env)
+            $stderr.puts "Error during request: #{e.class} #{e} #{e.backtrace}"
+            if env['rack.logger']
+              env['rack.logger'].error("Error during request: #{e.class} #{e} #{e.backtrace}")
+            end
+            return [500, {'Content-Type' => 'text/plain'}, "Error"]
+          rescue Exception => e
+            wipe_cookie(env)
+            raise e
+          else
+            update_cookie(env)
+            return tuple
+          end
         end
       end
     end

data/lib/rack_global_session/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module GlobalSessions
-    VERSION = "0.2"
+    VERSION = "0.3"
   end
 end

data/spec/rack_global_session_spec.rb

@@ -71,7 +71,7 @@ module Rack
           "aCookie" => "foo"
         }}
       key, hash, value = Rack::GlobalSession.new(lambda {}, @configuration).call(environment)
-      key.should == 503
+      key.should == 403
       hash.should == {'Content-Type' => 'text/plain'}
       value.should == "Invalid cookie"
       $stderr.string.should =~ /HasGlobalSession::MalformedCookie/
@@ -91,7 +91,7 @@ module Rack
       base64 = HasGlobalSession::Encoding::Base64Cookie.dump(compressed)
       environment = {"rack.cookies" => {"aCookie" => base64}}
       key, hash, value = Rack::GlobalSession.new(lambda {}, @configuration).call(environment)
-      key.should == 503
+      key.should == 403
       hash.should == {'Content-Type' => 'text/plain'}
       value.should == "Invalid cookie"
       $stderr.string.should =~ /OpenSSL::PKey::RSAError/
@@ -146,18 +146,18 @@ module Rack
         it 'should not renew expired cookies' do
           key, hash, value = Rack::GlobalSession.new(lambda {|e| e['global_session'].renew!},
                                                      @configuration).call(@environment)
-          key.should == 503
+          key.should == 500
           hash.should == {'Content-Type' => 'text/plain'}
-          value.should == "Invalid cookie"
+          value.should == "Error"
           $stderr.string.should =~ /HasGlobalSession::NoAuthority/
         end
 
         it 'should not attempt to update the cookie when it is not an authority' do
           key, hash, value = Rack::GlobalSession.new(lambda {|e| e['global_session']['first'] = 4},
                                                      @configuration).call(@environment)
-          key.should == 503
+          key.should == 500
           hash.should == {'Content-Type' => 'text/plain'}
-          value.should == "Invalid cookie"
+          value.should == "Error"
           $stderr.string.should =~ /HasGlobalSession::NoAuthority/
         end
       end
@@ -179,10 +179,9 @@ module Rack
 
       it 'should unconditionally wipe the cookie if an error occurs' do
         @environment['rack.cookies']['aCookie'].should_not be_nil
-        key, hash, value = Rack::GlobalSession.new(lambda {raise "foo"}, @configuration).call(@environment)
-        key.should == 503
-        hash.should == {'Content-Type' => 'text/plain'}
-        value.should == "Invalid cookie"
+        lambda {
+          Rack::GlobalSession.new(lambda {raise "foo"}, @configuration).call(@environment)
+        }.should raise_exception(/foo/)
         @environment['rack.cookies']['aCookie'][:value].should be_nil
       end
 
@@ -190,7 +189,7 @@ module Rack
         @config_hash["common"]["trust"] = "second"
         dump_config(@config_hash)
         key, hash, value = Rack::GlobalSession.new(lambda {}, @configuration).call(@environment)
-        key.should == 503
+        key.should == 403
         hash.should == {'Content-Type' => 'text/plain'}
         value.should == "Invalid cookie"
         $stderr.string.should =~ /SecurityError/

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack_global_session
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Graham Hughes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency