sbsm 1.3.4 → 1.3.5

data/lib/sbsm/state.rb

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

data/lib/sbsm/validator.rb

@@ -28,7 +28,6 @@
 require 'digest/md5'
 require 'mail'
 require 'date'
-require 'drb/drb'
 require 'uri'
 require 'stringio'
 require 'hpricot'
@@ -97,6 +96,7 @@ module SBSM
 		def validate(key, value)
 			value = value.pop if value.is_a? Array
 			return nil if value.nil?
+      # SBSM.info("validate #{key} #{value.class} #{value}")
       if value.is_a?(StringIO)
 				if(@files.include?(key))
 					return validate_file(key, value)
@@ -107,7 +107,7 @@ module SBSM
 						p e
 					end
 				end
-			elsif(value.is_a? DRb::DRbObject)
+			elsif(value.is_a?(Array)) # TODO::
 				value = value[0]
 				if(@files.include?(key))
 					return validate_file(key, value)
@@ -123,7 +123,8 @@ module SBSM
     end
     def perform_validation(key, value)
 			value = value.to_s.strip
-			begin
+      # require 'pry'; binding.pry if /event/.match(key.to_s)
+      begin
 				if(key==:event)
 					symbol = value.to_sym
 					symbol if @events.include?(symbol)

data/lib/sbsm/version.rb

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

data/lib/sbsm/viralstate.rb

@@ -42,7 +42,7 @@ module SBSM
 				infect(newstate)
       end
       newstate
-    rescue DRb::DRbError, RangeError
+    rescue RangeError
       @session.logout
       home
     end

data/test/config.ru

@@ -0,0 +1,11 @@
+#\ -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

data/test/simple_sbsm.rb

@@ -1,15 +1,16 @@
 #!/usr/local/bin/ruby
 # Niklaus Giger, November 2016
 # A simple example on how to use SBSM with webrick
-require 'drb/drb'
 require 'sbsm/logger'
-require 'sbsm/session'
-require 'sbsm/validator'
-require 'sbsm/drbserver'
-require 'sbsm/state'
+require 'sbsm/app'
 
-SERVER_URI  = 'druby://localhost:9876'
+root_dir = File.expand_path(File.join(__FILE__, '..', '..'))
+TEST_LOGGER = ChronoLogger.new(File.join(root_dir, 'test.log'))
+SBSM.logger=TEST_LOGGER
+
+TEST_APP_URI  = 'druby://localhost:9876'
 SERVER_NAME = 'localhost:9878'
+TEST_COOKIE_NAME = 'test-cookie'
 
 # Some string shared with the unit test
 HOME_HTML_CONTENT = 'Überall zu Hause' # mit UTF-8!
@@ -19,6 +20,10 @@ FEEDBACK_HTML_CONTENT = 'Give us your feedback about SBSM'
 CONFIRM_HTML_CONTENT = 'Please confirm your feedback'
 SENT_HTML_CONTENT = 'Thanks for you feedback! Hope to see you soon'
 
+begin
+  require 'pry'
+rescue LoadError
+end
 
 module Demo
   class GlobalState < SBSM::State
@@ -45,7 +50,7 @@ module Demo
     }
     @@class_counter = 0
     def initialize(session, user)
-      SBSM.info "HomeState #{session} DRb.front is #{DRb.front}"
+      SBSM.info "HomeState #{session}"
       @session = session
       @member_counter = 0
       super(session, user)
@@ -135,7 +140,7 @@ module Demo
     def ready?
       unless @email
         false
-      else
+      elseustomized
         true
       end
     end
@@ -211,18 +216,15 @@ module Demo
   end
   class Session < SBSM::Session
     DEFAULT_STATE    = HomeState
-    def initialize(key, app, validator=Validator.new)
-      SBSM.info "Session #{app}"
-      super(key, app, validator)
-    end
   end
+
   class SimpleSBSM < SBSM::App
     SESSION = Session
-    attr_reader :drb_uri
     def initialize(cookie_name: nil)
-      @drb_uri = SERVER_URI
       SBSM.info "SimpleSBSM.new"
-      super(:app => self, :validator => Validator.new, :trans_handler => SBSM::TransHandler.instance, :drb_uri => SERVER_URI,
+      super(validator: Validator.new,
+            trans_handler: SBSM::TransHandler.instance,
+            session_class: SESSION,
             cookie_name: cookie_name)
     end
   end

data/test/test_application.rb

@@ -12,58 +12,47 @@ require 'sbsm/app'
 require 'sbsm/session'
 require 'simple_sbsm'
 require 'nokogiri'
-begin
-  require 'pry'
-rescue LoadError
-end
 
-class AppVariantTest < MiniTest::Unit::TestCase
+RUN_ALL_TESTS=true
+# Here we test, whether setting various class constant have the desired effect
+
+class AppVariantTest < Minitest::Test
   include Rack::Test::Methods
-  MY_COOKIE_NAME = 'test-cookie'
+  attr_reader :app
   def setup
-    @@myapp = Demo::SimpleSBSM.new(cookie_name: MY_COOKIE_NAME)
-    SBSM.info msg = "Starting #{SERVER_URI}"
-    DRb.start_service(SERVER_URI, @@myapp)
-    sleep(0.1)
-  end
-  def teardown
-    DRb.stop_service
+    @app = Demo::SimpleSBSM.new(cookie_name: TEST_COOKIE_NAME)
   end
-  def app
-    @@myapp
-  end
-
   def test_post_feedback
     get '/de/page' do # needed to set cookie
-      last_response.set_cookie(MY_COOKIE_NAME, :value =>  Hash.new('anrede' => 'value2'))
+      last_response.set_cookie(TEST_COOKIE_NAME, :value =>  Hash.new('anrede' => 'value2'))
     end
     get '/de/page/feedback' do
     end
-    assert_equal  ["_session_id", MY_COOKIE_NAME], last_request.cookies.keys
-    skip "Cannot test cookie_input"
-    assert_equal ['anrede', 'name'],  @@myapp.proxy.cookie_input.keys
-    assert_equal 'xxx', @@myapp.proxy.persistent_user_input(:anrede)
+    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'],  @@myapp.proxy.cookie_input.values
+    assert_equal ['value2', 'value3'],  @app.cookie_input.values
     assert_match /anrede=value2/, CGI.unescape(last_response.headers['Set-Cookie'])
   end
-end
+end if RUN_ALL_TESTS
 
-class AppTest < MiniTest::Unit::TestCase
+class AppTest < Minitest::Test
   include Rack::Test::Methods
+  attr_reader :app
 
   def setup
-    @@myapp = Demo::SimpleSBSM.new
-    SBSM.info msg = "Starting #{SERVER_URI}"
-    DRb.start_service(SERVER_URI, @@myapp)
-    sleep(0.1)
-  end
-  def teardown
-    DRb.stop_service
-  end
-  def app
-    @@myapp
+    @app = Demo::SimpleSBSM.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'))
@@ -76,10 +65,10 @@ class AppTest < MiniTest::Unit::TestCase
     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'],  @@myapp.proxy.cookie_input.keys
-    assert_equal ['value2'],  @@myapp.proxy.cookie_input.values
-    assert_equal ['anrede', 'name'],  @@myapp.proxy.cookie_input.keys
-    assert_equal ['value2', 'value3'],  @@myapp.proxy.cookie_input.values
+    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'
@@ -95,7 +84,7 @@ class AppTest < MiniTest::Unit::TestCase
     assert last_response.ok?
     assert_match CONFIRM_DONE_HTML_CONTENT, last_response.body
   end
-
+if RUN_ALL_TESTS
   def test_session_home
     get '/home'
     assert last_response.ok?
@@ -149,6 +138,7 @@ class AppTest < MiniTest::Unit::TestCase
     assert_match /^request_path is \/$/, body
     assert_match /member_counter is 1$/, body
     assert_match HOME_HTML_CONTENT, body
+    # Getting the request a second time must increment the class, but not the member counter
     m = /class_counter is (\d+)$/.match(body)
     counter = m[1]
     assert_match /class_counter is (\d+)$/, body
@@ -156,9 +146,21 @@ class AppTest < MiniTest::Unit::TestCase
     assert last_response.ok?
     body = last_response.body.clone
     assert_match /^request_path is \/$/, body
-    assert_match /member_counter is 2$/, body
-    assert_match /class_counter is #{counter.to_i+1}$/, body
+    class_line = /class_counter.*/.match(body)[0]
+    assert_match /class_counter is #{counter.to_i+1}$/, class_line
+    member_line = /member_counter.*/.match(body)[0]
+    assert_match /member_counter is 1$/, member_line
+  end
+  def test_session_home_then_fr_about
+    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
+
   def test_session_home_then_fr_about
     get '/home'
     assert last_response.ok?
@@ -168,9 +170,18 @@ class AppTest < MiniTest::Unit::TestCase
     assert last_response.ok?
     assert_match ABOUT_HTML_CONTENT, last_response.body
   end
+  def test_session_about_then_root
+    get '/fr/page/about'
+    assert last_response.ok?
+    assert_match ABOUT_HTML_CONTENT, last_response.body
+    get '/'
+    assert last_response.ok?
+    assert_match HOME_HTML_CONTENT, last_response.body
+  end
 
   def test_show_stats
     # We add it here to get some more or less useful statistics
-    Session.show_stats '/de/page'
-  end
+    ::SBSM::Session.show_stats '/de/page'
+  end if RUN_ALL_TESTS
+end
 end

data/test/test_customized_app.rb

@@ -0,0 +1,232 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+$: << File.dirname(__FILE__)
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+require 'minitest/autorun'
+require 'rack/test'
+require 'sbsm/app'
+require 'sbsm/session'
+require 'nokogiri'
+require 'sbsm/state'
+require 'simple_sbsm'
+
+ENV['RACK_ENV'] = 'test'
+ENV['REQUEST_METHOD'] = 'GET'
+RUN_ALL_TESTS = true
+
+# Overriding some stuff from the simple_sbsm
+module Demo
+  class AboutState < GlobalState
+    DIRECT_EVENT = :about
+    def initialize(session, user)
+      SBSM.info "AboutState #{session}"
+      super(session, user)
+      session.login
+    end
+    def http_headers
+      { "foo" =>  "bar" }
+    end
+  end
+
+
+  DEMO_PERSISTENT_COOKIE_NAME = 'demo-simple-sbsm'
+  class Demo::CustomizedSBSM_COOKIE < SBSM::App
+    PERSISTENT_COOKIE_NAME = DEMO_PERSISTENT_COOKIE_NAME
+  end
+
+  class CustomLookandfeel < SBSM::Lookandfeel
+    LANGUAGES = ['fr']
+
+    DICTIONARIES = {
+      'fr' => {
+        hello:              'Bonjour'
+              }
+    }
+  end
+
+  class CustomizedValidator < SBSM::Validator
+    def initialize
+      SBSM.debug "CustomizedValidator init"
+      @@visited_init = true
+      super
+    end
+
+    def self.get_visited_init
+      defined?(@@visited_init) ? @@visited_init : :not_initialized
+    end
+  end
+
+  class CustomizedSession < SBSM::Session
+    DEFAULT_STATE           = AboutState
+    SERVER_NAME            = 'custom_server'
+    DEFAULT_ZONE           = :custome_zone
+    DEFAULT_LANGUAGE       = 'fr'
+    PERSISTENT_COOKIE_NAME = 'CustomizedSession-cookie'
+    LOOKANDFEEL            = CustomLookandfeel
+
+    def initialize(args)
+      SBSM.debug "session args #{args}"
+      @@active_stated_visited = false
+      @@login_visited = false
+      @@visited_init = true
+      super(args)
+    end
+
+    def flavor
+      SBSM.info 'test-flavor'
+      'test-flavor'
+    end
+
+    def active_state
+      SBSM.info '@active_stated_visited'
+      @@active_stated_visited = true
+      @active_state = super
+    end
+
+    def flavor
+      SBSM.info 'test-flavor'
+      'test-flavor'
+    end
+
+    def login
+     @@login_visited = true
+     SBSM.info '@login_visited'
+     'user'
+    end
+
+    def self.get_visited_init
+      defined?(@@visited_init) ? @@visited_init : :not_initialized
+    end
+
+    def self.get_visited_active_state
+      defined?(@@active_stated_visited) ? @@active_stated_visited : :not_initialized
+    end
+
+    def self.get_visited_login
+      defined?(@@login_visited) ? @@login_visited : :not_initialized
+    end
+  end
+
+  class CustomizedSBSM < SBSM::App
+    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,
+            trans_handler: trans_handler,
+            cookie_name: cookie_name,
+            session_class: session_class)
+    end
+  end
+end
+
+class CustomizedAppInvalidValidator < Minitest::Test
+  include Rack::Test::Methods
+  attr_reader :app
+
+  def test_raise_exeption_if_class
+    @app = Demo::CustomizedSBSM.new(validator: ::SBSM::Validator)
+    assert_raises {  get '/' do   end }
+  end
+
+  def test_valid_if_validator
+    @app = Demo::CustomizedSBSM.new(validator: ::SBSM::Validator.new)
+    get '/' do   end
+  end
+end if RUN_ALL_TESTS
+
+class CustomizedAppInvalidTranshandler < Minitest::Test
+  include Rack::Test::Methods
+  attr_reader :app
+
+  def test_raise_exeption_if_class
+    @app = Demo::CustomizedSBSM.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)
+    get '/' do   end
+  end
+end if RUN_ALL_TESTS
+
+class CustomizedAppSessionValidatorLnf < Minitest::Test
+  include Rack::Test::Methods
+  attr_reader :app
+  def setup
+    @app = Demo::CustomizedSBSM.new
+  end
+
+  def test_customized_active_state
+    get '/' do
+    end
+    assert last_response.ok?
+    assert_equal true, Demo::CustomizedSession.get_visited_active_state, 'Should have visited customized active_state'
+  end if RUN_ALL_TESTS
+  def test_customized_session_init
+    get '/' do
+    end
+    assert last_response.ok?
+    assert_equal true, Demo::CustomizedSession.get_visited_init, 'Should have visited customized session init'
+  end if RUN_ALL_TESTS
+
+  def test_customized_validator
+    # @app = Demo::CustomizedSBSM.new(validator: Demo::CustomizedValidator.new)
+    get '/' do
+    end
+    assert last_response.ok?
+    assert_equal true, Demo::CustomizedValidator.get_visited_init, 'Should have initialized customized validator'
+  end if RUN_ALL_TESTS
+
+  def test_customized_login
+    get '/fr/page/about' do  # we patched to force a login
+    end
+    assert last_response.ok?
+    assert_equal true, Demo::CustomizedSession.get_visited_login, 'Should have visited customized login'
+  end
+
+  def test_customized_http_header
+    get '/fr/page/about' do  # we patched to force a login
+    end
+    assert last_response.ok?
+    assert_equal 'bar', last_response.headers['foo']
+  end
+
+  def test_process_state
+    get '/fr/page/home' do  # we patched to force a login
+    end
+    assert_equal Demo::AboutState, @app.last_session.active_state.class
+    assert_equal(1, @app.last_session.attended_states.size)
+    get '/fr/page/feedback' do  # we patched to force a login
+    end
+    assert_equal(1, @app.last_session.attended_states.size)
+    assert_equal Demo::FeedbackState, @app.last_session.active_state.class
+  end
+
+  def test_customized_cookie_name
+    @app = Demo::CustomizedSBSM.new(cookie_name: TEST_COOKIE_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
+  end if RUN_ALL_TESTS
+end
+
+class CustomizedAppCookieName < Minitest::Test
+  include Rack::Test::Methods
+  attr_reader :app
+  def setup
+    @app = SBSM::App.new(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
+  end if RUN_ALL_TESTS
+end
+