has_global_session 0.8.9 → 0.8.10

data/has_global_session.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'has_global_session'
-  s.version = '0.8.9'
-  s.date    = '2010-06-29'
+  s.version = '0.8.10'
+  s.date    = '2010-07-01'
 
   s.authors = ['Tony Spataro']
   s.email   = 'code@tracker.xeger.net'

data/lib/has_global_session/integrated_session.rb

@@ -1,51 +1,53 @@
 module HasGlobalSession
   class IntegratedSession
-    def initialize(local_session, global_session)
-      @local_session = local_session
-      @global_session = global_session
+    attr_reader :local, :global
+    
+    def initialize(local, global)
+      @local = local
+      @global = global
     end
 
     def [](key)
       key = key.to_s
-      if @global_session.supports_key?(key)
-        @global_session[key]
+      if @global.supports_key?(key)
+        @global[key]
       else
-        @local_session[key]
+        @local[key]
       end
     end
 
     def []=(key, value)
       key = key.to_s
-      if @global_session.supports_key?(key)
-        @global_session[key] = value
+      if @global.supports_key?(key)
+        @global[key] = value
       else
-        @local_session[key] = value
+        @local[key] = value
       end
     end
 
     def has_key?(key)
       key = key.to_s
-      @global_session.has_key(key) || @local_session.has_key?(key)
+      @global.has_key(key) || @local.has_key?(key)
     end
 
     def keys
-      @global_session.keys + @local_session.keys
+      @global.keys + @local.keys
     end
 
     def values
-      @global_session.values + @local_session.values
+      @global.values + @local.values
     end
 
     def each_pair(&block)
-      @global_session.each_pair(&block)
-      @local_session.each_pair(&block)
+      @global.each_pair(&block)
+      @local.each_pair(&block)
     end
 
     def method_missing(meth, *args)
-      if @global_session.respond_to?(meth)
-        return @global_session.send(meth, *args)
-      elsif @local_session.respond_to?(meth)
-        return @local_session.send(meth, *args)
+      if @global.respond_to?(meth)
+        return @global.send(meth, *args)
+      elsif @local.respond_to?(meth)
+        return @local.send(meth, *args)
       else
         super
       end

data/rails/action_controller_instance_methods.rb

@@ -12,7 +12,10 @@ module HasGlobalSession
 
     def session_with_global_session
       if global_session
-        @integrated_session ||= IntegratedSession.new(session_without_global_session, global_session)
+        unless @integrated_session && (@integrated_session.global == @global_session)
+          @integrated_session =
+            IntegratedSession.new(session_without_global_session, global_session)
+        end
         return @integrated_session
       else
         return session_without_global_session
@@ -38,9 +41,9 @@ module HasGlobalSession
       rescue Exception => e
         #silently recover from any error by initializing a new global session
         @global_session = GlobalSession.new(directory)
-        global_session_update_cookie
         #give the Rails app a chance to handle the exception
-        raise e
+        #unless it's an ExpiredSession, which we handle transparently
+        raise e unless e.is_a?(ExpiredSession)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_global_session
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-07-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency