sbsm 1.3.4 → 1.3.5

data/test/test_session.rb

@@ -28,23 +28,37 @@
 require 'minitest/autorun'
 require 'sbsm/session'
 require 'sbsm/validator'
+require 'sbsm/trans_handler'
+require 'sbsm/app'
 require 'rack'
 require 'rack/test'
 
+begin
+  require 'pry'
+rescue LoadError
+end
+
 class StubSessionUnknownUser
 end
-class StubSessionApp
-	def unknown_user
-		StubSessionUnknownUser.new
-	end
-	def login(session)
-		false
-	end
-	def async(&block)
-		block.call
-	end
+class StubSessionSession < SBSM::Session
 end
-class StubSessionValidator
+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)
+  end
+  def login(session)
+    false
+  end
+  def async(&block)
+    block.call
+  end
+end
+class StubSessionValidator < SBSM::Validator
 	def reset_errors; end
 	def validate(key, value, mandatory=false)
 		value
@@ -64,13 +78,11 @@ class StubSessionRequest < Rack::Request
   end
 end
 class StubSessionView 
-	def http_headers 
-		{
-			"foo"	=>	"bar"
-		}
-	end
 	def initialize(foo, bar)
 	end
+  def http_headers
+    { "foo"   =>      "bar" }
+  end
 	def to_html(context)
 		'0123456789' * 3
 	end
@@ -98,9 +110,8 @@ end
 class StubVolatileState < SBSM::State
 	VOLATILE = true
 end
-class Session < SBSM::Session
+class StubSessionWithView < SBSM::Session
 	DEFAULT_STATE = StubSessionState
-	DRB_LOAD_LIMIT = 10
 	CAP_MAX_THRESHOLD = 3
 	MAX_STATES = 3
 	DEFAULT_FLAVOR = 'gcc'
@@ -109,17 +120,26 @@ class Session < SBSM::Session
 	attr_writer :lookandfeel, :persistent_user_input
 	attr_writer :active_state
 	public :active_state
+  def initialize(args)
+    args[:app]       ||= StubSessionApp.new
+    args[:validator] ||= StubSessionValidator.new
+    super(args)
+    persistent_user_input = {}
+  end
 end
 class StubSessionSession < SBSM::Session
 	attr_accessor :lookandfeel
-	attr_accessor :persistent_user_input
+  attr_accessor :persistent_user_input
 	DEFAULT_FLAVOR = 'gcc'
 	LF_FACTORY = {
 		'gcc'	=>	'ccg',
 		'sbb'	=>	'bbs',
 	}
-	def initialize(*args)
-		super
+	def initialize(app: app)
+    args = { :app => app}
+    args[:app]       ||= StubSessionApp.new
+    args[:validator] ||= StubSessionValidator.new
+    super(args)
 		persistent_user_input = {}
 	end
 	def persistent_user_input(key)
@@ -130,16 +150,47 @@ end
 class TestSession < Minitest::Test
   include Rack::Test::Methods
 	def setup
-		@session = Session.new("test", StubSessionApp.new, StubSessionValidator.new)
+    @app = StubSessionApp.new(validator: StubSessionValidator.new,
+                           unknown_user: StubSessionUnknownUser.new)
+    @session = StubSessionWithView.new(app: @app,
+                           validator: StubSessionValidator.new,
+                           unknown_user: StubSessionUnknownUser.new)
 		@request = StubSessionRequest.new
 		@state = StubSessionState.new(@session, nil)
 	end
+if true
+  def test_user_input
+    @request["foo"] = "bar"
+    @request["baz"] = "zuv"
+    # next line checks whether we did setup correctly the session
+    assert_equal(@session.validator.class, StubSessionValidator)
+    @session.process_rack(rack_request: @request)
+    assert_equal(['foo', 'bar'], @session.valid_values('foo'))
+    assert_equal("zuv", @session.user_input(:baz))
+    assert_equal("zuv", @session.user_input(:baz))
+    result = @session.user_input(:foo, :baz)
+    expected = {
+      :foo  =>  'bar',
+      :baz  =>  'zuv',
+    }
+    assert_equal(expected, result)
+  end
+  def test_persistent_user_input
+    @request["baz"] = "zuv"
+    @session.process_rack(rack_request: @request)
+    assert_equal("zuv", @session.persistent_user_input(:baz))
+    @session.process_rack(StubSessionRequest.new)
+    assert_equal("zuv", @session.persistent_user_input(:baz))
+    @request["baz"] = "bla"
+    @session.process_rack(rack_request: @request)
+    assert_equal("bla", @session.persistent_user_input(:baz))
+  end
   def test_user_input_hash
     @request["hash[1]"] = "4"
     @request["hash[2]"] = "5"
     @request.params["hash[3]"] = "6"
     @request.params['real_hash'] = {'1' => 'a', '2' => 'b'}
-    @session.process(@request)
+    @session.process_rack(rack_request: @request)
     hash = @session.user_input(:hash)
     assert_equal(Hash, hash.class)
     assert_equal(3, hash.size)
@@ -152,7 +203,7 @@ class TestSession < Minitest::Test
     assert_equal("b", real_hash['2'])
   end
 	def test_attended_states_store
-		@session.process(@request)
+		@session.process_rack(rack_request: @request)
 		state = @session.state
 		expected = {
 			state.object_id => state
@@ -163,16 +214,16 @@ class TestSession < Minitest::Test
 	end
 	def test_attended_states_cap_max
 		req1 = StubSessionRequest.new
-		@session.process(req1)
+		@session.process_rack(:rack_request =>req1)
 		state1 = @session.state
 		req2 = StubSessionRequest.new
 		req2["event"] = "foo"	
-		@session.process(req2)
+		@session.process_rack(:rack_request =>req2)
 		state2 = @session.state
 		refute_equal(state1, state2)
 		req3 = StubSessionRequest.new
 		req3["event"] = :bar	
-		@session.process(req3)
+		@session.process_rack(:rack_request =>req3)
 		state3 = @session.state
 		refute_equal(state1, state3)
 		refute_equal(state2, state3)
@@ -184,7 +235,7 @@ class TestSession < Minitest::Test
 		assert_equal(attended, @session.attended_states)
 		req4 = StubSessionRequest.new
 		req4["event"] = :foobar	
-		@session.process(req4)
+		@session.process_rack(:rack_request =>req4)
 		@session.cap_max_states
 		state4 = @session.state
 		refute_equal(state1, state4)
@@ -222,7 +273,7 @@ class TestSession < Minitest::Test
 		}
 		@session.active_state = @state
 		# @request.params.store('state_id', state.object_id.next)
-		@session.process(@request)
+		@session.process_rack(rack_request: @request)
 		assert_equal(@state, @session.active_state)
 	end
 	def test_active_state3
@@ -237,8 +288,8 @@ class TestSession < Minitest::Test
 		}
 		@session.state = @state
 		@request.params.store('state_id', state.object_id)
-		@session.process(@request)
-		assert_equal(state, @session.active_state)
+		@session.process_rack(rack_request: @request)
+		assert_equal(state.class, @session.active_state.class)
 	end
 	def test_volatile_state
 		state = StubSessionState.new(@session, nil)
@@ -247,12 +298,12 @@ class TestSession < Minitest::Test
 		@session.active_state = state
 		@session.state = state
 		@request.params.store('event', :volatile)
-		newstate = @session.process(@request)
+		newstate = @session.process_rack(rack_request: @request)
 		assert_equal(:volatile, @session.event)
 		assert_equal(volatile, @session.state)
 		assert_equal(state, @session.active_state)
 		@request.params.store('event', :foo)
-		newstate = @session.process(@request)
+		newstate = @session.process_rack(rack_request: @request)
 		assert_equal(state.foo, @session.state)
 		assert_equal(state.foo, @session.active_state)
 	end
@@ -263,19 +314,19 @@ class TestSession < Minitest::Test
     assert_respond_to(@session, :delete)
   end
   def test_restore
-    assert_instance_of(Session, @session.restore[:proxy])
+    assert_instance_of(NilClass, @session.restore[:proxy])
   end
 	def test_user_input_no_request
 		assert_nil(@session.user_input(:no_input))
 	end
 	def test_user_input_nil
-		@session.process(@request)
+		@session.process_rack(rack_request: @request)
 		assert_nil(@session.user_input(:no_input))
 	end
   def test_user_input
 		@request["foo"] = "bar"
 		@request["baz"] = "zuv"
-    @session.process(@request)
+    @session.process_rack(rack_request: @request)
     assert_equal("bar", @session.user_input(:foo))
     assert_equal("zuv", @session.user_input(:baz))
     assert_equal("zuv", @session.user_input(:baz))
@@ -290,7 +341,7 @@ class TestSession < Minitest::Test
 		@request["hash[1]"] = "4"
 		@request["hash[2]"] = "5"
 		@request["hash[3]"] = "6"
-		@session.process(@request)
+		@session.process_rack(rack_request: @request)
 		hash = @session.user_input(:hash)
 		assert_equal(Hash, hash.class)
 		assert_equal(3, hash.size)
@@ -298,12 +349,6 @@ class TestSession < Minitest::Test
 		assert_equal("5", hash["2"])
 		assert_equal("6", hash["3"])
 	end
-	def test_http_headers
-		expected = {
-			"foo"	=>	"bar"
-		}
-		assert_equal(expected, @session.http_headers)
-	end
 	def test_http_protocol
 		assert_equal("http", @session.http_protocol)
 	end
@@ -321,27 +366,14 @@ class TestSession < Minitest::Test
 	end
 	def test_persistent_user_input
 		@request["baz"] = "zuv"
-    @session.process(@request)
+    @session.process_rack(rack_request: @request)
 		assert_equal("zuv", @session.persistent_user_input(:baz))
-		@session.process(StubSessionRequest.new)
+		@session.process_rack(rack_request: StubSessionRequest.new)
 		assert_equal("zuv", @session.persistent_user_input(:baz))
 		@request["baz"] = "bla"
-    @session.process(@request)
+    @session.process_rack(rack_request: @request)
 		assert_equal("bla", @session.persistent_user_input(:baz))
 	end
-	def test_process
-		state = StubSessionState.new(@session, nil)
-		@session.attended_states = {
-			state.object_id =>	state,
-		}
-		@session.state = @state
-		expected = state.foo
-		@request.params.store('state_id', state.object_id)
-		@request.params.store('event', :foo)
-		@session.process(@request)
-		assert_equal(expected, @session.state) 
-		assert_equal(expected, @session.attended_states[expected.object_id])
-	end
 	def test_logout
 		state = StubSessionBarState.new(@session, nil)
 		@session.attended_states.store(state.object_id, state)
@@ -370,7 +402,7 @@ class TestSession < Minitest::Test
     assert_equal('en', lnf3.language) ## flavor does not change!
 	end
 	def test_lookandfeel2
-    session = StubSessionSession.new("test", StubSessionApp.new, StubSessionValidator.new)
+    session = StubSessionSession.new(app: StubSessionApp.new)
 		session.lookandfeel=nil
 		session.persistent_user_input = {
 			:flavor => 'gcc',
@@ -379,7 +411,7 @@ class TestSession < Minitest::Test
 		assert_equal('gcc', session.flavor)
 	end
   def test_lookandfeel3
-		session = StubSessionSession.new("test", StubSessionApp.new, StubSessionValidator.new)
+		session = StubSessionSession.new(app: StubSessionApp.new)
 		session.lookandfeel=nil
 		lnf2 = session.lookandfeel
 		session.persistent_user_input = {
@@ -388,3 +420,4 @@ class TestSession < Minitest::Test
 		assert_equal('gcc', session.flavor)
 	end
 end
+end

data/test/wrk_visit.lua

@@ -0,0 +1,12 @@
+#!/usr/bin/lua
+-------------------------------------------------------------
+-- NOTE: each wrk thread has an independent Lua scripting
+-- context and thus there will be one counter per thread
+
+counter = 0
+paths_to_visit = {"/de/page/feedback", "/de/page/about", "/"}
+request = function()
+   counter = counter + 1
+   return wrk.format(nil,  paths_to_visit[(counter % table.getn(paths_to_visit))+ 1])
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbsm
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -269,12 +269,9 @@ files:
 - data/uri.grammar
 - data/zone_uri.grammar
 - install.rb
-- lib/cgi/drbsession.rb
 - lib/sbsm.rb
 - lib/sbsm/app.rb
 - lib/sbsm/cgi.rb
-- lib/sbsm/drb.rb
-- lib/sbsm/drbserver.rb
 - lib/sbsm/exception.rb
 - lib/sbsm/index.rb
 - lib/sbsm/logger.rb
@@ -283,6 +280,7 @@ files:
 - lib/sbsm/lookandfeelwrapper.rb
 - lib/sbsm/redirector.rb
 - lib/sbsm/session.rb
+- lib/sbsm/session_store.rb
 - lib/sbsm/state.rb
 - lib/sbsm/time.rb
 - lib/sbsm/trans_handler.rb
@@ -292,6 +290,7 @@ 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
@@ -299,7 +298,7 @@ files:
 - test/stub/cgi.rb
 - test/suite.rb
 - test/test_application.rb
-- test/test_drbserver.rb
+- test/test_customized_app.rb
 - test/test_index.rb
 - test/test_logger.rb
 - test/test_lookandfeel.rb
@@ -308,6 +307,7 @@ files:
 - test/test_trans_handler.rb
 - test/test_user.rb
 - test/test_validator.rb
+- test/wrk_visit.lua
 - usage-en.txt
 homepage: https://github.com/zdavatz/sbsm
 licenses:
@@ -334,6 +334,7 @@ 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
@@ -341,7 +342,7 @@ test_files:
 - test/stub/cgi.rb
 - test/suite.rb
 - test/test_application.rb
-- test/test_drbserver.rb
+- test/test_customized_app.rb
 - test/test_index.rb
 - test/test_logger.rb
 - test/test_lookandfeel.rb
@@ -350,3 +351,4 @@ test_files:
 - test/test_trans_handler.rb
 - test/test_user.rb
 - test/test_validator.rb
+- test/wrk_visit.lua

data/lib/cgi/drbsession.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-#--
-# DRbSession - CGI::Session session database manager using DRb.
-# Copyright (C) 2001 by Tietew. All Rights Reserved.
-#++
-require 'drb/drb'
-require 'sbsm/logger'
-class CGI
-  class Session
-    class DRbSession
-      attr_reader :obj
-      def initialize(session, option={})
-        unless uri = option['drbsession_uri']
-          raise ArgumentError, "drbsession_uri not specified"
-        end
-        
-        unless DRb.thread
-          DRb.start_service
-        end
-        
-        holder = DRbObject.new(nil, uri)
-        @obj = holder[session.session_id]
-      end
-      
-      def restore
-        @obj.restore
-      end
-      def update
-        @obj.update
-      end
-      def close
-        @obj.close
-      end
-      def delete
-        @obj.delete
-      end
-    end
-  end
-end