sbsm 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 098df1b1f3f9be3383dc1adbc44087a8662ac7e7
-  data.tar.gz: 3836d50af930294d0fa5bdacec1bcc04085880a4
+  metadata.gz: 90ce9f2b3daacd1a7a8e0cc6623a41d7fb42cc0d
+  data.tar.gz: 269a319d2fc83df3301b1d42ef7ff11e90b455f7
 SHA512:
-  metadata.gz: cefada511b938ff19624f587ccc16feca6a33ac34b8875f24d9881c9504bd7e6a87df46bef3492d18b3ed9bb2d409d68c7230f83d5d9f38e060ce20888bdd3af
-  data.tar.gz: ccf6801e741324e0fc11df4f53a103e43085996a1793d6ad9a5207843440621c1f4fd778aeb3146ca1f2d81e92e2b55cdc9699db0132d2ab95a69e8206efae35
+  metadata.gz: 207aaf6069ba9c21809fcd8c033d21efdf44b57ea7ed78bea51a4bbefd0d7cda3e34069f6173a3064b590b33b313a098261d276525aafe9c4e61d5d514afe102
+  data.tar.gz: e294f1c2010f4c9655bee932f5a83a7350d4f4a0f94f8baa6518146e905974be052af06bd2733b5889710e07b070930b273929c12c5407beac99851491295730

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.3.621.3.2017
+* Zeno wants a release when when we still have 10 failing unit tests
+* Made SBSM multithreading optional. Defaults to off
+* Answer with doc_root + '/index.html' if request-path is '/'
+* Introduce RackInterface to separate concerns between SBSM::App which is member variable of the SBSM::Session
+* An the RackInterface which is served as a Rack App object
+
 === 1.3.5 /14.12.2016
 * Refactored sbsm to work without DRb
 * Added test/config.ru to be able to run tests via wrk

data/Rakefile

@@ -28,10 +28,10 @@ desc "create RDoc documentation"
 
 task :rdoc do
   cmd = "bundle exec rdoc --exclude='/coverage|vendor|test|data|etc|Manifest|.*.lock|.*.css|.*.js|.*.gemspec|.*.patch/' --include=lib" +
-      " --main=lib/sbsm.rb --title='SBSM: a framework for state based session management'"
+      " --main=lib/sbsm.rb --title='SBSM: a framework for state based session management' --op=rdoc"
   puts cmd
   res = system(cmd)
-  puts "Running test/suite.rb returned #{res.inspect}. Output is found in the doc sub-directory"
+  puts "Running test/suite.rb returned #{res.inspect}. Output is found in the rdoc sub-directory"
   exit 1 unless res
 end
 

data/lib/sbsm/app.rb

@@ -33,11 +33,17 @@ require 'mimemagic'
 
 module SBSM
   ###
-  # App a base class for Webrick server
+  # App as a member of session
   class App
 
-    OPTIONS = [ :app, :config_file, :trans_handler, :validator, :persistence_layer, :server_uri, :unknown_user]
-    OPTIONS.each{ |opt| eval "attr_reader :#{opt}" }
+    def initialize()
+      SBSM.info "initialize"
+    end
+  end
+
+  class RackInterface
+    attr_accessor :session # thread variable!
+    SESSION_ID = '_session_id'
 
     # Base class for a SBSM based WebRick HTTP server
     # * offer a call(env) method form handling the WebRick requests
@@ -45,36 +51,41 @@ module SBSM
     #
     # === optional arguments
     #
+    # * +app+ -               A Ruby class used by the session
     # * +validator+ -         A Ruby class overriding the SBSM::Validator class
     # * +trans_handler+ -     A Ruby class overriding the SBSM::TransHandler class
     # * +session_class+ -     A Ruby class overriding the SBSM::Session class
     # * +unknown_user+ -      A Ruby class overriding the SBSM::UnknownUser class
     # * +persistence_layer+ - Persistence Layer to use
     # * +cookie_name+ -       The cookie to save persistent user data
+    # * +multi_threaded+ -    Allow multi_threaded SBSM (default is false)
     #
     # === Examples
     # Look at steinwies.ch
     # * https://github.com/zdavatz/steinwies.ch (simple, mostly static files, one form, no persistence layer)
     #
-    def initialize(validator: nil,
+    def initialize(app:,
+                   validator: nil,
                    trans_handler:  nil,
                    session_class: nil,
                    persistence_layer: nil,
                    unknown_user: nil,
-                   cookie_name: nil)
+                   cookie_name: nil,
+                   multi_threaded: nil
+                 )
       @@last_session = nil
-      SBSM.info "initialize validator #{validator} th #{trans_handler} cookie #{cookie_name} session #{session_class}"
-      @session_store = SessionStore.new(persistence_layer: persistence_layer,
+      @app = app
+      SBSM.info "initialize validator #{validator} th #{trans_handler} cookie #{cookie_name} session #{session_class} app #{app} multi_threaded #{multi_threaded}"
+      @session_store = SessionStore.new(app: app,
+                                        persistence_layer: persistence_layer,
                                         trans_handler: trans_handler,
                                         session_class: session_class,
                                         cookie_name: cookie_name,
                                         unknown_user: unknown_user,
-                                        app: self,
-                                        validator: validator)
+                                        validator: validator,
+                                        multi_threaded: multi_threaded)
     end
 
-    SESSION_ID = '_session_id'
-
     def last_session
       @@last_session
     end
@@ -87,7 +98,11 @@ module SBSM
       else
         session_id = rand((2**(0.size * 8 -2) -1)*10240000000000).to_s(16)
       end
-      file_name = File.expand_path(File.join('doc', request.path))
+      if '/'.eql?(request.path)
+        file_name = File.expand_path(File.join('doc', 'index.html'))
+      else
+        file_name = File.expand_path(File.join('doc', request.path))
+      end
       if File.file?(file_name)
         mime_type = MimeMagic.by_extension(File.extname(file_name)).type
         SBSM.info "file_name is #{file_name} checkin base #{File.basename(file_name)} MIME #{mime_type}"
@@ -97,17 +112,10 @@ module SBSM
       end
 
       return [400, {}, []] if /favicon.ico/i.match(request.path)
-      # https://www.tutorialspoint.com/ruby/ruby_cgi_sessions.htm
-      args = {
-        'database_manager'  =>  @session_store,
-        'session_path'      =>  '/',
-        @cookie_name => session_id,
-      }
-      session = @session_store[session_id]
-      session.app ||= self
+
+      Thread.current.thread_variable_set(:session, @session_store[session_id])
+      session = Thread.current.thread_variable_get(:session)
       SBSM.debug "starting session_id #{session_id}  session #{session.class} #{request.path}: cookies #{@cookie_name} are #{request.cookies} @cgi #{@cgi.class}"
-      @cgi = CGI.initialize_without_offline_prompt('html4') unless @cgi
-      session = CGI::Session.new(@cgi, args) unless session
       res = session.process_rack(rack_request: request)
       response.write res
       response.headers['Content-Type'] ||= 'text/html; charset=utf-8'
@@ -116,10 +124,18 @@ module SBSM
         response.status = result.last.to_i
         response.headers.delete(result.first)
       end
-      response.set_cookie(session.cookie_name, :value =>  session.cookie_input)
-      response.set_cookie(SESSION_ID, :value => session_id)
+      session.cookie_input.each do |key, value|
+        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
-      SBSM.debug "finish session_id #{session_id}: header with cookies #{response.headers} from #{session.cookie_input}"
+      if response.headers['Set-Cookie'].to_s.index(session_id)
+        SBSM.debug "finish session_id.1 #{session_id}: matches response.headers['Set-Cookie']"
+      else
+        SBSM.debug "finish session_id.2 #{session_id}: headers #{response.headers}"
+      end
       response.finish
     end
 

data/lib/sbsm/session.rb

@@ -50,6 +50,7 @@ module SBSM
 		MAX_STATES = 4
 		SERVER_NAME = nil
     UNKNOWN_USER = UnknownUser
+    @@mutex = Mutex.new
     def Session.reset_stats
       @@stats = {}
     end
@@ -106,8 +107,9 @@ module SBSM
                    trans_handler: nil,
                    validator: nil,
                    unknown_user: nil,
-                   cookie_name: nil)
-      SBSM.info "initialize th #{trans_handler} validator #{validator}"
+                   cookie_name: nil,
+                   multi_threaded: false)
+      SBSM.info "initialize th #{trans_handler} validator #{validator} app #{app.class}"
       @app = app
       @unknown_user = unknown_user
       @unknown_user ||=  self.class::UNKNOWN_USER
@@ -119,6 +121,7 @@ module SBSM
       fail "invalid trans_handler #{@trans_handler}" unless @trans_handler.is_a?(SBSM::TransHandler)
       @cookie_name =  cookie_name
       @cookie_name ||= self.class::PERSISTENT_COOKIE_NAME
+      @@cookie_name = @cookie_name
       @attended_states = {}
       @persistent_user_input = {}
       touch()
@@ -128,9 +131,17 @@ module SBSM
       @unknown_user_class
       @unknown_user_class = @unknown_user.class
       @variables = {}
-      @mutex = Mutex.new
       @cgi = CGI.initialize_without_offline_prompt('html4')
-      SBSM.debug "session initialized #{self} with @cgi #{@cgi}"
+      @multi_threaded = multi_threaded
+      @mutex = multi_threaded ? Mutex.new: @@mutex
+      @active_thread = nil
+      SBSM.debug "session initialized #{self} with @cgi #{@cgi} multi_threaded #{multi_threaded} app #{app.object_id}"
+    end
+    def self.get_cookie_name
+      @@cookie_name
+    end
+    def method_missing(symbol, *args, &block) # Replaces old dispatch to DRb
+      @app.send(symbol, *args, &block)
     end
     def unknown_user
       @unknown_user_class.new
@@ -159,7 +170,6 @@ module SBSM
 			@persistent_user_input.store(:language, lang)
 			@valid_input.clear
 			@unsafe_input.clear
-			@active_thread = nil
 			true
 		end
     @@msie_ptrn = /MSIE/
@@ -259,17 +269,17 @@ module SBSM
       age(now) > EXPIRES
 		end
 		def force_login(user)
-      binding.pry
 			@user = user
 		end
 		def import_cookies(request)
 			reset_cookie()
       if(cuki_str = request.cookies[self::class::PERSISTENT_COOKIE_NAME])
         SBSM.debug "cuki_str #{self::class::PERSISTENT_COOKIE_NAME} #{cuki_str}"
-        eval(cuki_str).each { |key, val|
-          valid = @validator.validate(key, val)
-          @cookie_input.store(key, valid)
-        }
+        request.cookies.each do |key, val|
+          key_sym = key.intern
+          valid = @validator.validate(key_sym, val)
+          @cookie_input.store(key_sym, valid) if valid
+        end
         SBSM.debug "@cookie_input now #{@cookie_input}"
       end
 		end
@@ -281,7 +291,7 @@ module SBSM
       hash = rack_req.env.merge rack_req.params
       hash.merge! rack_req.POST if rack_req.POST
       hash.delete('rack.request.form_hash')
-      SBSM.debug "hash has #{hash.size } items #{hash.keys}"
+      # SBSM.debug "hash has #{hash.size } items #{hash.keys}"
       hash.each do |key, value|
         next if /^rack\./.match(key)
 				index = nil

data/lib/sbsm/session_store.rb

@@ -56,13 +56,15 @@ module SBSM
                    session_class: nil,
                    validator: nil,
                    cookie_name: nil,
-                   unknown_user: nil)
+                   unknown_user: nil,
+                   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))
       @admin_threads = ThreadGroup.new
       @async = ThreadGroup.new
+      @app = app
       @system = persistence_layer
       @persistence_layer = persistence_layer
       @cookie_name = cookie_name

data/lib/sbsm/state.rb

@@ -124,7 +124,6 @@ module SBSM
 			end
 		end
     def extend(mod)
-      binding.pry
       if(mod.constants.include?(:VIRAL))
         @viral_modules.push(mod)
       end

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 end

data/test/simple_sbsm.rb

@@ -86,7 +86,7 @@ module Demo
       super(session, user)
     end
     def http_headers
-      {
+     {
         'Status'   => '303 See Other',
         'Location' => 'feedback',
       }
@@ -218,14 +218,25 @@ module Demo
     DEFAULT_STATE    = HomeState
   end
 
-  class SimpleSBSM < SBSM::App
-    SESSION = Session
-    def initialize(cookie_name: nil)
+  class SimpleSBSM < SBSM::RackInterface
+    def initialize
       SBSM.info "SimpleSBSM.new"
-      super(validator: Validator.new,
-            trans_handler: SBSM::TransHandler.instance,
-            session_class: SESSION,
-            cookie_name: cookie_name)
+      super(app: self)
+    end
+  end
+  class SimpleRackInterface < SBSM::RackInterface
+    SESSION = Session
+
+    def initialize(validator: SBSM::Validator.new,
+                   trans_handler: SBSM::TransHandler.instance,
+                   cookie_name: nil,
+                   session_class: SESSION)
+      SBSM.info "SimpleRackInterface.new SESSION #{SESSION}"
+      super(app: SimpleSBSM,
+            validator: validator,
+            trans_handler: trans_handler,
+            cookie_name: cookie_name,
+            session_class: session_class)
     end
   end
 end

data/test/test_application.rb

@@ -13,66 +13,55 @@ require 'sbsm/session'
 require 'simple_sbsm'
 require 'nokogiri'
 
-RUN_ALL_TESTS=true
+RUN_ALL_TESTS=true unless defined?(RUN_ALL_TESTS)
+
 # Here we test, whether setting various class constant have the desired effect
 
 class AppVariantTest < Minitest::Test
   include Rack::Test::Methods
   attr_reader :app
   def setup
-    @app = Demo::SimpleSBSM.new(cookie_name: TEST_COOKIE_NAME)
+    # @app = Demo::SimpleSBSM.new(cookie_name: TEST_COOKIE_NAME)
+    @app = Demo::SimpleRackInterface.new
   end
   def test_post_feedback
     get '/de/page' do # needed to set cookie
       last_response.set_cookie(TEST_COOKIE_NAME, :value =>  Hash.new('anrede' => 'value2'))
     end
+    clear_cookies
+    set_cookie 'anrede=value2'
+    set_cookie "_session_id=#{TEST_COOKIE_NAME}"
     get '/de/page/feedback' do
     end
-    assert_equal  ["_session_id", TEST_COOKIE_NAME], last_request.cookies.keys
-    skip "Cannot content for test cookie_input"
-    assert_equal ['anrede', 'name'],  @app.cookie_input.keys
-    assert_equal 'xxx', @app.persistent_user_input(:anrede)
-
-    assert_equal ['value2', 'value3'],  @app.cookie_input.values
-    assert_match /anrede=value2/, CGI.unescape(last_response.headers['Set-Cookie'])
+    assert_equal  ["_session_id", 'anrede'], last_request.cookies.keys
+    expected = {"_session_id"=>"test-cookie", "anrede"=>"value2"}
+    assert_equal expected, last_request.cookies
+    assert_equal 'value2',  @app.last_session.persistent_user_input('anrede')
   end
 end if RUN_ALL_TESTS
 
-class AppTest < Minitest::Test
+class AppTestSimple < Minitest::Test
   include Rack::Test::Methods
   attr_reader :app
 
   def setup
-    @app = Demo::SimpleSBSM.new
+    @app = Demo::SimpleRackInterface.new
   end
-
-  def test_session_redirect
-    get '/de/page/redirect'
-    assert_equal 303,last_response.status
-    assert_equal 'feedback',last_response.headers['Location']
-    assert_match REDIRECT_HTML_CONTENT, last_response.body
-    assert_match /utf-8/i, last_response.headers['Content-Type']
-  end if RUN_ALL_TESTS
   def test_post_feedback
-    get '/de/page' do # needed to set cookie
-      last_response.set_cookie(SBSM::Session::PERSISTENT_COOKIE_NAME, :value => Hash.new('anrede' => 'value2', 'name' => 'values'))
-    end
+    set_cookie "_session_id=#{TEST_COOKIE_NAME}"
+    set_cookie "#{SBSM::Session::PERSISTENT_COOKIE_NAME}=dummy"
     get '/de/page/feedback' do
     end
     # assert_match /anrede.*=.*value2/, CGI.unescape(last_response.headers['Set-Cookie'])
     assert last_response.ok?
     assert_equal  ["_session_id", SBSM::Session::PERSISTENT_COOKIE_NAME], last_request.cookies.keys
-    skip "Cannot test cookie_input"
-    assert_match /anrede.*=.*value2/, CGI.unescape(last_response.headers['Set-Cookie'])
-    assert_match FEEDBACK_HTML_CONTENT, last_response.body
-    assert_equal ['anrede'],  @app.cookie_input.keys
-    assert_equal ['value2'],  @app.cookie_input.values
-    assert_equal ['anrede', 'name'],  @app.cookie_input.keys
-    assert_equal ['value2', 'value3'],  @app.cookie_input.values
-    page = Nokogiri::HTML(last_response.body)
-    x = page.css('div')
-    skip 'We must add here an input form or we cannot continue testing'
+    assert_equal(FEEDBACK_HTML_CONTENT, last_response.body)
 
+    set_cookie "anrede=Herr"
+    post '/de/page/feedback', { anrede: 'Herr',  msg: 'SBSM rocks!',  state_id: '1245'} do
+    end
+    page = Nokogiri::HTML(last_response.body)
+    puts page.text
     assert  page.css('input').find{|x| x.attributes['name'].value.eql?('state_id') }.attributes['value'].value
     state_id = page.css('input').find{|x| x.attributes['name'].value.eql?('state_id') }.attributes['value'].value.to_i
     assert state_id > 0
@@ -93,14 +82,6 @@ if RUN_ALL_TESTS
     assert_match /utf-8/i, last_response.headers['Content-Type']
   end
 
-  def test_session_redirect
-    get '/de/page/redirect'
-    assert_equal 303,last_response.status
-    assert_equal 'feedback',last_response.headers['Location']
-    assert_match REDIRECT_HTML_CONTENT, last_response.body
-    assert_match /utf-8/i, last_response.headers['Content-Type']
-  end
-
   def test_css_file
     css_content = "html { max-width: 960px; margin: 0 auto; }"
     css_file = File.join('doc/sbsm.css')
@@ -184,4 +165,14 @@ if RUN_ALL_TESTS
     ::SBSM::Session.show_stats '/de/page'
   end if RUN_ALL_TESTS
 end
+  def test_session_home_then_fr_about
+    puts 888
+    get '/home'
+    assert last_response.ok?
+    assert_match /^request_path is \/home$/, last_response.body
+    assert_match HOME_HTML_CONTENT, last_response.body
+    get '/fr/page/about'
+    assert last_response.ok?
+    assert_match ABOUT_HTML_CONTENT, last_response.body
+  end
 end

data/test/test_customized_app.rb

@@ -12,7 +12,7 @@ require 'simple_sbsm'
 
 ENV['RACK_ENV'] = 'test'
 ENV['REQUEST_METHOD'] = 'GET'
-RUN_ALL_TESTS = true
+RUN_ALL_TESTS=true unless defined?(RUN_ALL_TESTS)
 
 # Overriding some stuff from the simple_sbsm
 module Demo
@@ -106,21 +106,28 @@ module Demo
       defined?(@@login_visited) ? @@login_visited : :not_initialized
     end
   end
-
   class CustomizedSBSM < SBSM::App
+    def initialize
+      SBSM.info "CustomizedSBSM.new"
+    end
+  end
+
+  class CustomizedRackInterface < SBSM::RackInterface
     SESSION = CustomizedSession
+
     def initialize(validator: CustomizedValidator.new,
                    trans_handler: SBSM::TransHandler.instance,
                    cookie_name: nil,
                    session_class: SESSION)
-      SBSM.info "CustomizedSBSM.new SESSION #{SESSION}"
-
-      super(validator: validator,
+      SBSM.info "CustomizedRackInterface.new SESSION #{SESSION}"
+      super(app: CustomizedSBSM.new,
+            validator: validator,
             trans_handler: trans_handler,
             cookie_name: cookie_name,
             session_class: session_class)
     end
   end
+
 end
 
 class CustomizedAppInvalidValidator < Minitest::Test
@@ -128,12 +135,12 @@ class CustomizedAppInvalidValidator < Minitest::Test
   attr_reader :app
 
   def test_raise_exeption_if_class
-    @app = Demo::CustomizedSBSM.new(validator: ::SBSM::Validator)
+    @app = Demo::CustomizedRackInterface.new(validator: ::SBSM::Validator)
     assert_raises {  get '/' do   end }
   end
 
   def test_valid_if_validator
-    @app = Demo::CustomizedSBSM.new(validator: ::SBSM::Validator.new)
+    @app = Demo::CustomizedRackInterface.new(validator: ::SBSM::Validator.new)
     get '/' do   end
   end
 end if RUN_ALL_TESTS
@@ -143,12 +150,12 @@ class CustomizedAppInvalidTranshandler < Minitest::Test
   attr_reader :app
 
   def test_raise_exeption_if_class
-    @app = Demo::CustomizedSBSM.new(trans_handler: ::SBSM::TransHandler)
+    @app = Demo::CustomizedRackInterface.new(trans_handler: ::SBSM::TransHandler)
     assert_raises {  get '/' do   end }
   end
 
   def test_valid_if_validator_instance
-    @app = Demo::CustomizedSBSM.new(trans_handler: ::SBSM::TransHandler.instance)
+    @app = Demo::CustomizedRackInterface.new(trans_handler: ::SBSM::TransHandler.instance)
     get '/' do   end
   end
 end if RUN_ALL_TESTS
@@ -157,7 +164,7 @@ class CustomizedAppSessionValidatorLnf < Minitest::Test
   include Rack::Test::Methods
   attr_reader :app
   def setup
-    @app = Demo::CustomizedSBSM.new
+    @app = Demo::CustomizedRackInterface.new
   end
 
   def test_customized_active_state
@@ -207,12 +214,15 @@ class CustomizedAppSessionValidatorLnf < Minitest::Test
   end
 
   def test_customized_cookie_name
-    @app = Demo::CustomizedSBSM.new(cookie_name: TEST_COOKIE_NAME)
+    my_cookey_name = 'my-cookie-name'
+    @app = Demo::CustomizedRackInterface.new(cookie_name: my_cookey_name)
     get '/' do
     end
     assert last_response.ok?
     # TEST_COOKIE_NAME set via param to app
-    assert_equal TEST_COOKIE_NAME, last_response.get_header('Set-Cookie').split("\n").first.split('=').first
+    cookie = last_response.get_header('Set-Cookie').split("\n").find_all{|x| x.index(my_cookey_name)}
+    assert_equal 1, cookie.size
+    assert_match my_cookey_name, cookie.first
   end if RUN_ALL_TESTS
 end
 
@@ -220,13 +230,16 @@ class CustomizedAppCookieName < Minitest::Test
   include Rack::Test::Methods
   attr_reader :app
   def setup
-    @app = SBSM::App.new(cookie_name: Demo::DEMO_PERSISTENT_COOKIE_NAME)
+    @sbsm_app = SBSM::App.new
+    @app = SBSM::RackInterface.new(app: @sbsm_app, cookie_name: Demo::DEMO_PERSISTENT_COOKIE_NAME)
   end
   def test_customized_cookie_name
     get '/' do
     end
     assert last_response.ok?
-    assert_equal Demo::DEMO_PERSISTENT_COOKIE_NAME, last_response.get_header('Set-Cookie').split("\n").first.split('=').first
+    cookie = last_response.get_header('Set-Cookie').split("\n").find_all{|x| x.index(Demo::DEMO_PERSISTENT_COOKIE_NAME)}
+    assert_equal 1, cookie.size
+    assert_match Demo::DEMO_PERSISTENT_COOKIE_NAME, cookie.first
   end if RUN_ALL_TESTS
 end
 

data/test/test_redirect.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+$: << File.dirname(__FILE__)
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+
+ENV['RACK_ENV'] = 'test'
+ENV['REQUEST_METHOD'] = 'GET'
+
+require 'minitest/autorun'
+require 'rack/test'
+require 'sbsm/app'
+require 'sbsm/session'
+require 'simple_sbsm'
+require 'nokogiri'
+
+RUN_ALL_TESTS=true unless defined?(RUN_ALL_TESTS)
+
+# Here we test, whether setting various class constant have the desired effect
+
+class AppTestRedirect < Minitest::Test
+  include Rack::Test::Methods
+  attr_reader :app
+
+  def setup
+    @app = Demo::SimpleRackInterface.new
+  end
+  def test_session_redirect
+    get '/de/page/redirect'
+    assert_equal 303,last_response.status
+    assert_equal 'feedback',last_response.headers['Location']
+    assert_match REDIRECT_HTML_CONTENT, last_response.body
+    assert_match /utf-8/i, last_response.headers['Content-Type']
+  end
+
+end

data/test/test_session.rb

@@ -46,10 +46,7 @@ class StubSessionApp < SBSM::App
   attr_accessor :trans_handler, :validator
   SESSION = StubSessionSession
   def initialize(args = {})
-    args[:session_class] ||= StubSessionSession
-    args[:validator] ||= StubSessionValidator.new
-    args[:unknown_user] ||= StubSessionUnknownUser.new
-    super(args)
+    super()
   end
   def login(session)
     false
@@ -136,10 +133,7 @@ class StubSessionSession < SBSM::Session
 		'sbb'	=>	'bbs',
 	}
 	def initialize(app: app)
-    args = { :app => app}
-    args[:app]       ||= StubSessionApp.new
-    args[:validator] ||= StubSessionValidator.new
-    super(args)
+    super(app: app, validator:  StubSessionValidator.new)
 		persistent_user_input = {}
 	end
 	def persistent_user_input(key)
@@ -155,10 +149,24 @@ class TestSession < Minitest::Test
     @session = StubSessionWithView.new(app: @app,
                            validator: StubSessionValidator.new,
                            unknown_user: StubSessionUnknownUser.new)
-		@request = StubSessionRequest.new
+    @request = StubSessionRequest.new
 		@state = StubSessionState.new(@session, nil)
 	end
-if true
+
+  def test_cookies
+    c_name =  SBSM::Session::PERSISTENT_COOKIE_NAME
+    c_value = "remember=63488f94c90813200f29e1a60de9a479ad52e71758f48e612e9f6390f80c7b7c\nname=juerg%40davaz.com\nlanguage=en"
+    @request.cookies[:remember] = 'my_remember_value'
+    @request.cookies[:language] = 'en'
+    @request.cookies['_session_id'] = '10e524151d7f0da819f4222ecc1'
+    @request.cookies[c_name] = 'my_cookie_id'
+    @request.set_header('Set-Cookie', c_value)
+    @session.process_rack(rack_request: @request)
+    assert_equal([:remember, :language, :_session_id, c_name.to_sym], @session.cookie_input.keys)
+    skip "Don't know how to test persistent_user_input"
+    assert_equal('@session.valid_input', @session.persistent_user_input(:language))
+    assert_equal('@session.valid_input', @session.valid_input)
+  end
   def test_user_input
     @request["foo"] = "bar"
     @request["baz"] = "zuv"
@@ -420,4 +428,3 @@ if true
 		assert_equal('gcc', session.flavor)
 	end
 end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -290,7 +290,6 @@ files:
 - lib/sbsm/version.rb
 - lib/sbsm/viralstate.rb
 - sbsm.gemspec
-- test/config.ru
 - test/data/dos_file.txt
 - test/data/lnf_file.txt
 - test/data/mac_file.txt
@@ -302,6 +301,7 @@ files:
 - test/test_index.rb
 - test/test_logger.rb
 - test/test_lookandfeel.rb
+- test/test_redirect.rb
 - test/test_session.rb
 - test/test_state.rb
 - test/test_trans_handler.rb
@@ -329,12 +329,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Application framework for state based session management from ywesee
 test_files:
-- test/config.ru
 - test/data/dos_file.txt
 - test/data/lnf_file.txt
 - test/data/mac_file.txt
@@ -346,6 +345,7 @@ test_files:
 - test/test_index.rb
 - test/test_logger.rb
 - test/test_lookandfeel.rb
+- test/test_redirect.rb
 - test/test_session.rb
 - test/test_state.rb
 - test/test_trans_handler.rb

data/test/config.ru

@@ -1,11 +0,0 @@
-#\ -w -p 6789
-# 6789 must be in sync with TEST_APP_URI from test_application.rb
-root_dir = File.expand_path(File.join(__FILE__, '..', '..'))
-$LOAD_PATH << File.join(root_dir, 'test')
-require 'simple_sbsm'
-use Rack::CommonLogger, TEST_LOGGER
-use Rack::Reloader, 0
-use Rack::ContentLength
-use(Rack::Static, urls: ["/doc/"])
-app = Rack::ShowExceptions.new(Rack::Lint.new(Demo::SimpleSBSM.new(cookie_name: ::TEST_COOKIE_NAME)))
-run app