sbsm 1.4.5 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c931f28d24233cb0c46c2f1e6341a8a451037918
-  data.tar.gz: abfdbcc5d3464f7ae2eeab161eaf02319f70e568
+  metadata.gz: 60f4a61bb07708b12676dc908a0de85f373c5b17
+  data.tar.gz: 496054938b87a49afb78c8269edc3ec77c1e6a19
 SHA512:
-  metadata.gz: c7f94a54e9f0e73fd5ad64747720302448c12717665a94f8c769f041a987b8a86ef1ce9967ef9932f1a758aedfec4d30fea6a3d1bff94cd93b18d378469fc918
-  data.tar.gz: 57e179ccda3ea1eb5053992b71311f939aee63a72db164d761ff128ac13823d1d1c90140461454974399e00f1ddad4734cfc1533bbc145ea95ab82321a5a7b36
+  metadata.gz: 3e048c7a06458e3327852f4a9a9a582fd44a476f8385a491c77352f54da1471de42d59968be3381b583587b097f5b964db12cfc063f50c64aa889a1212c51926
+  data.tar.gz: a4eb100131a6255fbe1c8fd0448d27ad061d70f3e33f9b5fbaa957f6b235bdfc984dfe74bd81397d55de8df8b320446c8e174f7aad735dae2cfc83cd778a560c

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.4.6 / 21.06.2017
+
+* Added  SessionStore.clear
+* Added reader unknown_user and session_store
+* Admin server is now multi_threaded by default
+
 === 1.4.5 / 13.06.2017
 
 * Fix unknown_user if passing a class and not an instance of it

data/lib/sbsm/admin_server.rb

@@ -37,8 +37,8 @@ require 'sbsm/session_store'
 module SBSM
   # AdminClass must be tied to an Rack app
   class AdminServer
-    def initialize(app:)
-      @session = SBSM::SessionStore.new(app: app)
+    def initialize(app:, multi_threaded: false)
+      @session = SBSM::SessionStore.new(app: app, multi_threaded: multi_threaded)
       @admin_threads = ThreadGroup.new
     end
     def _admin(src, result, priority=0)

data/lib/sbsm/app.rb

@@ -35,6 +35,7 @@ module SBSM
   ###
   # App as a member of session
   class App
+    attr_reader :unknown_user
 
     def initialize()
       SBSM.info "initialize"
@@ -43,6 +44,7 @@ module SBSM
 
   class RackInterface
     attr_accessor :session # thread variable!
+    attr_reader   :session_store, :unknown_user
     SESSION_ID = '_session_id'
 
     # Base class for a SBSM based WebRick HTTP server
@@ -84,6 +86,7 @@ module SBSM
                                         unknown_user: unknown_user,
                                         validator: validator,
                                         multi_threaded: multi_threaded)
+      @unknown_user = unknown_user
     end
 
     def last_session
@@ -143,7 +146,6 @@ module SBSM
         response.set_cookie(key,  { :value => value, :path => '/' })
       end
       response.set_cookie(SESSION_ID, { :value => session_id, :path => '/' }) unless request.cookies[SESSION_ID]
-
       # response.set_cookie(SBSM::Session.get_cookie_name, session_id)
       @@last_session = session
       if response.headers['Set-Cookie'].to_s.index(session_id)

data/lib/sbsm/session.rb

@@ -31,6 +31,7 @@ require 'sbsm/cgi'
 require 'sbsm/state'
 require 'sbsm/user'
 require 'sbsm/lookandfeelfactory'
+require 'sbsm/trans_handler'
 require 'delegate'
 
 module SBSM
@@ -571,16 +572,16 @@ module SBSM
       # nothing
     end
     def delete
-      @app.delete_session @key
+      @app.delete_session(@key)
     end
 		def zone
-			@valid_input[:zone] || @state.zone || self::class::DEFAULT_ZONE
+			@valid_input[:zone] || (@state && @state.zone) || self::class::DEFAULT_ZONE
 		end
 		def zones
 			@active_state.zones
 		end
 		def zone_navigation
-			@state.zone_navigation
+			@state.zone_navigation if @state
 		end
 		def ==(other)
 			super

data/lib/sbsm/session_store.rb

@@ -33,6 +33,7 @@ require 'thread'
 require 'digest/md5'
 require 'sbsm/logger'
 require 'sbsm/validator'
+require 'sbsm/session_store'
 
 module SBSM
   #
@@ -49,6 +50,8 @@ module SBSM
     UNKNOWN_USER = UnknownUser
     VALIDATOR = nil
     attr_reader :cleaner, :updater, :persistence_layer
+    @@mutex = Mutex.new
+    @@sessions = {}
     def initialize(app:,
                    persistence_layer: nil,
                    trans_handler: nil,
@@ -58,8 +61,6 @@ module SBSM
                    unknown_user: UNKNOWN_USER.new,
                    multi_threaded: nil)
       fail "You must specify an app!" unless app
-      @sessions = {}
-      @mutex = Mutex.new
       @cleaner = run_cleaner if(self.class.const_get(:RUN_CLEANER))
       @app = app
       @system = persistence_layer
@@ -74,13 +75,13 @@ module SBSM
       @validator = validator
     end
     def cap_max_sessions(now = Time.now)
-      if(@sessions.size > self::class::CAP_MAX_THRESHOLD)
+      if(@@sessions.size > self::class::CAP_MAX_THRESHOLD)
         SBSM.info "too many sessions! Keeping only #{self::class::MAX_SESSIONS}"
         sess = nil
-        sorted = @sessions.values.sort
+        sorted = @@sessions.values.sort
         sorted[0...(-self::class::MAX_SESSIONS)].each { |sess|
           sess.__checkout
-          @sessions.delete(sess.key)
+          @@sessions.delete(sess.key)
         }
         if(sess)
           age = sess.age(now)
@@ -90,7 +91,7 @@ module SBSM
     end
     def clean
       now = Time.now
-      @sessions.delete_if { |key, s|
+      @@sessions.delete_if { |key, s|
         begin
           if s.respond_to?(:expired?)
             if s.expired?(now)
@@ -109,18 +110,20 @@ module SBSM
       }
       #cap_max_sessions(now)
     end
-    def clear
-      @sessions.each_value { |sess| sess.__checkout }
-      @sessions.clear
+    def SessionStore.clear
+      @@mutex.synchronize do
+        @@sessions.each_value { |sess| sess.__checkout }
+        @@sessions.clear
+      end
     end
     def delete_session(key)
-      if(sess = @sessions.delete(key))
+      if(sess = @@sessions.delete(key))
         sess.__checkout
       end
     end
     def reset
-      @mutex.synchronize {
-        @sessions.clear
+      @@mutex.synchronize {
+        @@sessions.clear
       }
     end
     def run_cleaner
@@ -130,16 +133,16 @@ module SBSM
         #Thread.current.priority = 1
         loop do
           sleep self::class::CLEANING_INTERVAL
-          @mutex.synchronize do
+          @@mutex.synchronize do
             clean()
           end
         end
       end
     end
     def [](key)
-      @mutex.synchronize do
-        unless((s = @sessions[key]) && !s.expired?)
-          s = @sessions[key] = @session_class.new(app: @app, cookie_name: @cookie_name, trans_handler: @trans_handler, validator: @validator, unknown_user: @unknown_user)
+      @@mutex.synchronize do
+        unless((s = @@sessions[key]) && !s.expired?)
+          s = @@sessions[key] = @session_class.new(app: @app, cookie_name: @cookie_name, trans_handler: @trans_handler, validator: @validator, unknown_user: @unknown_user)
         end
         s.reset()
         s.touch()

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.4.5'
+  VERSION = '1.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack