sbsm 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dba5e15c9cf2727c59c4b7cfe76f50130e3e0ed6
-  data.tar.gz: 6e20e7c5cc26fac33046dc1163c6499a095067ee
+  metadata.gz: 6f2ae1755e50072d0307ecbe9c57c67c1b4a891a
+  data.tar.gz: 1b2e7d58d1b60cc487248e1123a8422cf051fd4a
 SHA512:
-  metadata.gz: 5ed488a5d66ba9297899f60d6b49f56030c063d72beefa81107e82386c51e82fc535701e1c198a80e35744732704240665813909aa9a0e949fba76d5e141b926
-  data.tar.gz: 23e5429ccfc47cd67d052eab84e7d945f3bf3ffe4538bd956445fed7a8db7de7277000d6d9292e120045de1fb236feea9a1f725679c5946488173b0e999d50a9
+  metadata.gz: 1e092d40cc433c228137788cbc01e79a2e31cb03d3c84ae51d6ad0c3c686241aead506e2baeabe841c58dc0b226616ab444324961e7607ab8e5034eb66157924
+  data.tar.gz: a430f249b35eed0d1b7514f352a8b4dfe27cd7f1d60efec3d4ca856884eb8756f7e28b81184b392707247f156923431d9b9a6d671935b60453cef4cba4591383

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.5.9 / 30.08.2017
+
+* Fix recognition whether we are using HTTPS or not
+* Fix using http_headers in views
+* Allow non standard HTTP-Port
+
 === 1.5.8 / 8.08.2017
 
 * Fix recognizing mime type for unusual extensions

data/lib/sbsm/lookandfeel.rb

@@ -54,7 +54,8 @@ module SBSM
       self::class::HTML_ATTRIBUTES.fetch(key.to_sym, {}).dup rescue {}
 		end
 		def base_url
-			[@session.http_protocol + ':/', @session.server_name, @language, @flavor].compact.join("/")
+      maybe_port = @session.server_port ? (":" + @session.server_port ) : ''
+			[@session.http_protocol + ':/', @session.server_name + maybe_port, @language, @flavor].compact.join("/")
 		end
 		def direct_event
 			@session.direct_event
@@ -88,7 +89,7 @@ module SBSM
 			@languages ||= self::class::DICTIONARIES.keys.sort
 		end
 		def language_url(language)
-			[@session.http_protocol + ':/', @session.server_name, language, @flavor].compact.join("/")
+			base_url
 		end
     def lookup(key, *args, &block)
       _lookup(key, *args) || (block.call if block)
@@ -166,9 +167,8 @@ module SBSM
       end
 		end
     def _collect_resource(base, part, rstr)
-      [ @session.http_protocol + ':/', 
-        @session.server_name, 
-        base, part, rstr].flatten.compact.join('/')
+      maybe_port = @session.server_port ? (":" + @session.server_port ) : ''
+      [ @session.http_protocol + ':/', @session.server_name + maybe_port, base, part, rstr].flatten.compact.join('/')
     end
     def set_dictionary(language)
       @dictionary = self::class::DICTIONARIES[language] || {}

data/lib/sbsm/session.rb

@@ -213,7 +213,6 @@ module SBSM
           @rack_request = rack_request
           @request_path ||= rack_request.path
           @post_content = nil
-
           if rack_request.request_method.eql?('POST')
             rack_request.params.each do |k, v|
               # needed to test POST requests generated by curl (first parameter) or ARC (second parameter)
@@ -463,7 +462,7 @@ module SBSM
 			{'Content-Type' => 'text/plain'}
 		end
 		def http_protocol
-                @http_protocol ||= if(@server_port && @server_port == 443) || ENV['SERVER_PORT']
+                @http_protocol ||= if(@server_port && @server_port.to_i == 443) || ENV['SERVER_PORT']
 														'https'
 													else
 														'http'

data/lib/sbsm/session_store.rb

@@ -112,7 +112,7 @@ module SBSM
         end
       end
       seconds = (Time.now.to_i - now.to_i)
-      SBSM.warn sprintf("Cleaned #{old_size - @@sessions.size} sessions. Took %d seconds", seconds)
+      # SBSM.warn sprintf("Cleaned #{old_size - @@sessions.size} sessions. Took %d seconds", seconds)
     end
     def SessionStore.sessions
       @@sessions

data/lib/sbsm/state.rb

@@ -135,7 +135,8 @@ module SBSM
 		def http_headers
       return @http_headers if @http_headers
       name = view
-      name ? view.http_headers : {}
+      result = name ? view.http_headers : {}
+      result
 		end
 		def info?
 			!@infos.empty?

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.5.8'
+  VERSION = '1.5.9'
 end

data/test/simple_sbsm.rb

@@ -69,15 +69,20 @@ module Demo
       info.join("\n")
     end
   end
+  class AboutView
+    def initialize(model, session)
+    end
+    def to_html(cgi)
+      'About SBSM: TDD ist great!'
+    end
+  end
   class AboutState < GlobalState
     DIRECT_EVENT = :about
+    VIEW = AboutView
     def initialize(session, user)
       SBSM.info "AboutState #{session}"
       super(session, user)
     end
-    def to_html(cgi)
-      'About SBSM: TDD ist great!'
-    end
   end
   class RedirectState < GlobalState
     DIRECT_EVENT = :redirect
@@ -239,4 +244,4 @@ module Demo
             session_class: session_class)
     end
   end
-end
+end

data/test/test_customized_app.rb

@@ -16,19 +16,27 @@ RUN_ALL_TESTS=true unless defined?(RUN_ALL_TESTS)
 
 # Overriding some stuff from the simple_sbsm
 module Demo
+  class View_AboutState
+    def initialize(model, session)
+    end
+    def http_headers
+      { "foo" =>  "bar" }
+    end
+    def to_html(cgi)
+      "<br>customized to_html<br>"
+    end
+  end
+
   class AboutState < GlobalState
     DIRECT_EVENT = :about
+    VIEW = View_AboutState
     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
@@ -201,6 +209,7 @@ class CustomizedAppSessionValidatorLnf < Minitest::Test
     end
     assert last_response.ok?
     assert_equal 'bar', last_response.headers['foo']
+    assert_equal '<br>customized to_html<br>', last_response.body
   end
 
   def test_process_state

data/test/test_lookandfeel.rb

@@ -69,6 +69,9 @@ class StubLookandfeelSession
 	def flavor
 		"gcc"
 	end
+	def server_port
+		"1234"
+	end
 	def server_name
 		"test.com"
 	end
@@ -127,7 +130,7 @@ class TestLookandfeel < Minitest::Test
 		assert_equal({}, @lookandfeel.attributes(:undefined))
 	end
 	def test_resource
-		assert_equal('http://test.com/resources/gcc/bar', @lookandfeel.resource(:foo))
+		assert_equal('http://test.com:1234/resources/gcc/bar', @lookandfeel.resource(:foo))
 	end
 	def test_lookup
 		assert_equal('dictbar', @lookandfeel.lookup(:foo))
@@ -161,18 +164,18 @@ class TestLookandfeel < Minitest::Test
 		assert_equal(expected, time.rfc1123)
 	end
 	def test_base_url
-		assert_equal("http://test.com/de/gcc", @lookandfeel.base_url)
+		assert_equal("http://test.com:1234/de/gcc", @lookandfeel.base_url)
 	end
 	def test_event_url
-		assert_match(/http:\/\/test.com\/de\/gcc\/foo\/state_id\/\d\/bar\/baz/,@lookandfeel.event_url(:foo, {:bar => 'baz'}))
+		assert_match(/http:\/\/test.com:1234\/de\/gcc\/foo\/state_id\/\d\/bar\/baz/,@lookandfeel.event_url(:foo, {:bar => 'baz'}))
 	end
 	def test_event_url__crawler
 		@session.is_crawler = true
-		assert_equal("http://test.com/de/gcc/foo/bar/baz",
+		assert_equal("http://test.com:1234/de/gcc/foo/bar/baz",
 			@lookandfeel.event_url(:foo, {:bar => 'baz'}))
 	end
 	def test_event_url__state_id_given
-		assert_equal("http://test.com/de/gcc/foo/bar/baz/state_id/mine",
+		assert_equal("http://test.com:1234/de/gcc/foo/bar/baz/state_id/mine",
 			@lookandfeel.event_url(:foo, [:bar, 'baz', :state_id, 'mine']))
 	end
 	def test_format_price
@@ -214,10 +217,10 @@ class TestLookandfeelWrapper < Minitest::Test
 	end
 	def test_resource1
 		lnf = SBSM::LookandfeelWrapper.new(@lookandfeel)
-		assert_equal('http://test.com/resources/gcc/bar', lnf.resource(:foo))
+		assert_equal('http://test.com:1234/resources/gcc/bar', lnf.resource(:foo))
 	end
 	def test_resource2
-		assert_equal('http://test.com/resources/gcc/foo', @wrapped.resource(:foo))
+		assert_equal('http://test.com:1234/resources/gcc/foo', @wrapped.resource(:foo))
 	end
 	def test_attributes1
 		lnf = SBSM::LookandfeelWrapper.new(@lookandfeel)

metadata

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