torquebox-web 3.0.0-java → 3.0.1-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6f35e1566bb04c5dfba25ce12366ba816eed151f
+  data.tar.gz: a8e7fd9ae22b1a1ea0e8fa0cf922dd69e20cfcef
+SHA512:
+  metadata.gz: df555a30d5d17708ad0d380a82841c1c8ee3d59889370a23ee8f695c43bce168cee135895e0f3018e5a22126ba184baf8f06df2f065a3ac8c39cacdcabbd2a0b
+  data.tar.gz: b2d966690134749d027bbbc51e3ebbe4d730f46db860af006097864c4372031c08c3ba6ee2d79126df173cd3f29e12955a2a5fb647d774ab83edcfae1d65a7a7

data/lib/torquebox/session/servlet_store.rb

@@ -24,7 +24,7 @@ module TorqueBox
       def initialize(app, options={})
         @app = app
 
-        if defined? TORQUEBOX_APP_NAME
+        if ServletStore.torquebox_available?
           web_context = TorqueBox::MSC.java_web_context
           web_context.session_timeout = options[:timeout] / 60 if options[:timeout]
 
@@ -35,6 +35,10 @@ module TorqueBox
           cookie_config.http_only = !!options[:httponly]
           cookie_config.secure = !!options[:secure]
           cookie_config.max_age = options[:max_age] if options[:max_age]
+        else
+          # Fallback to just storing session data in a hash if we're
+          # running outside of TorqueBox
+          @test_session_data = SessionData.new
         end
       end
 
@@ -45,14 +49,28 @@ module TorqueBox
         return [ status, headers, body ]
       end
 
+      def self.torquebox_available?
+        defined? TORQUEBOX_APP_NAME
+      end
+
       def self.load_session(env)
-        env['rack.session'] = load_session_data( env['java.servlet_request'].getSession(true) )
+        if torquebox_available?
+          session_data = load_session_data(env['java.servlet_request'].getSession(true))
+        else
+          session_data = @test_session_data
+        end
+        env['rack.session'] = session_data
         env['rack.session.options' ] = {}
       end
 
       def self.commit_session(env, status, headers, body)
         session_data = env['rack.session' ]
-        ServletStore.store_session_data( env['java.servlet_request'].getSession(true), session_data )
+        if torquebox_available?
+          ServletStore.store_session_data(env['java.servlet_request'].getSession(true),
+                                          session_data)
+        else
+          @test_session_data = session_data
+        end
       end
 
       def self.load_session_data(session)
@@ -119,6 +137,7 @@ module TorqueBox
       end
 
       def destroy
+        clear
         @java_session.invalidate if @java_session
       end
 
@@ -134,7 +153,10 @@ module TorqueBox
       def [](key)
         super(key.to_s)
       end
-      alias :fetch :[]
+      
+      def fetch(key, *args, &block)
+        super(key.to_s, *args, &block)
+      end
 
       def has_key?(key)
         super(key.to_s)

data/lib/torquebox-web.rb

@@ -1,6 +1,6 @@
 module TorqueboxWeb
-  VERSION = '3.0.0'
-  MAVEN_VERSION = '3.0.0'
+  VERSION = '3.0.1'
+  MAVEN_VERSION = '3.0.1'
 end
 begin
   require 'java'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-web
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 3.0.0
+  version: 3.0.1
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,13 +17,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.10
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.10
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,11 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   prerelease: false
   type: :development
 description: ''
@@ -61,6 +56,7 @@ files:
 homepage: http://torquebox.org/
 licenses:
 - Public Domain
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -70,18 +66,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: TorqueBox Web Gem
 test_files:
 - spec/servlet_store_spec.rb