sbsm 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8934dcd4cdbd63fead780bf5bf87af408d43d3
-  data.tar.gz: 9bddb67fbce3b770fa182691a3af7a57b74afbdf
+  metadata.gz: 628fb2c05a02cc101b12decbfd9adb36841c6708
+  data.tar.gz: 2ac44dd32371d5ba87c6ff48f5e33f0348a84f96
 SHA512:
-  metadata.gz: 70d380793a5eead1e398f0ea38a9294fc34e7a661c03004bdcb5a4dd679dedefdd32e342f5c6a2ad0f4fe6e93e7591f022d2d413b72f1db0af78b868794c0e1d
-  data.tar.gz: 39ee8b6ccb16477c0726a20ae817abff227540e47ac1b87366702c8d4bf5aff5bc7e2cb787ed76c82d3174fcdb1629803361bd9f3356d6082e4eb650724f070e
+  metadata.gz: 2a8511976a0371bd485a08ef740fe1c7983cf55c4fb65edfa9a8afee7d69ae2ff88adac5d20450949202a10fac9795ea3ffda58caef2e552ab266c4daf94ac14
+  data.tar.gz: 830b11c719faa20a247697d72b571ff7ad8273bbb26ac4176d13a639ce604715b9371fddfe39e3e8a895d57d782f3af4f1085b03f40d22aa6fd5636f6729540d

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.4.3 / 06.06.2017
+
+* Allow access to request_origin and request_params for POST processing in xmlconf
+* Fix unit tests
+
 === 1.4.2 / 23.05.2017
 
 * Allow overriding http_protocol via ENV variable SERVER_PORT

data/lib/sbsm/session.rb

@@ -37,7 +37,8 @@ module SBSM
   class	Session
 
 		attr_reader :user, :active_thread, :key, :cookie_input, :cookie_name,
-			:unsafe_input, :valid_input, :request_path, :cgi, :attended_states
+        :server_name, :server_port, :request_params, :request_method, :request_origin,
+			:unsafe_input, :valid_input, :request_path, :request_post, :cgi, :attended_states
     attr_accessor :validator, :trans_handler, :app
 		PERSISTENT_COOKIE_NAME = "sbsm-persistent-cookie"
 		DEFAULT_FLAVOR = 'sbsm'
@@ -209,8 +210,17 @@ module SBSM
         begin
           @request_method =rack_request.request_method
           @request_path = rack_request.path
+          if rack_request.env
+            @request_origin  = 'http'
+            if (proto = rack_request.env['SERVER_PROTOCOL'])
+              @request_origin = proto.downcase.match(/^\w+/)[0]
+            end
+            @request_origin += '://'
+            @request_origin += rack_request.env['REMOTE_ADDR'] if rack_request.env['REMOTE_ADDR']
+          end
           @server_name = rack_request.env['SERVER_NAME']
           @server_port = rack_request.env['SERVER_PORT']
+          @request_params = rack_request.params
           logout unless @active_state
           validator.reset_errors() if validator && validator.respond_to?(:reset_errors)
           import_user_input(rack_request)

data/lib/sbsm/version.rb

@@ -1,3 +1,3 @@
 module SBSM
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

data/test/test_lookandfeel.rb

@@ -177,8 +177,8 @@ class TestLookandfeel < Minitest::Test
 	end
 	def test_format_price
 		assert_equal('123.45', @lookandfeel.format_price(12345))
-		assert_equal(nil, @lookandfeel.format_price(nil))
-		assert_equal(nil, @lookandfeel.format_price(0))
+		assert_nil(@lookandfeel.format_price(nil))
+		assert_nil(@lookandfeel.format_price(0))
 	end
 	def test_format_date
 		hannesgeburtstag = Date.new(1975,8,21)

data/test/test_validator.rb

@@ -21,7 +21,7 @@
 # ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zürich, Switzerland
 # hwyss@ywesee.com
 #
-# TestValidator -- sbsm -- 15.11.2002 -- hwyss@ywesee.com 
+# TestValidator -- sbsm -- 15.11.2002 -- hwyss@ywesee.com
 
 $: << File.dirname(__FILE__)
 $: << File.expand_path("../lib", File.dirname(__FILE__))
@@ -59,7 +59,7 @@ class TestValidator < Minitest::Test
 		assert_equal({}, @val.errors)
 	end
 	def test_validate
-		assert_equal(nil, @val.validate(:something, :other) )
+		assert_nil(@val.validate(:something, :other) )
 	end
 	def test_boolean
 		assert_equal(true, @val.validate(:bool, 'true'))
@@ -106,19 +106,19 @@ class TestValidator < Minitest::Test
 	def test_date
 		assert_equal(Date.new(2002,1,2), @val.validate(:date, '2.1.2002'))
 		assert_equal(SBSM::InvalidDataError, @val.validate(:date, '13.13.1234').class)
-		assert_equal(nil, @val.validate(:date, " \t"))
+		assert_nil(@val.validate(:date, " \t"))
 	end
 	def test_state_id
-		assert_equal(nil, @val.validate(:state_id, nil))
-		assert_equal(nil, @val.validate(:state_id, "df"))
+		assert_nil(@val.validate(:state_id, nil))
+		assert_nil(@val.validate(:state_id, "df"))
 		assert_equal(1245, @val.validate(:state_id, "1245"))
 		assert_equal(-1245, @val.validate(:state_id, "-1245"))
 	end
 	def test_pattern
 		assert_equal('new', @val.validate(:pattern, 'new'))
 		assert_equal('12345', @val.validate(:pattern, '12345'))
-		assert_equal(nil, @val.validate(:pattern, '23foo45'))
-		assert_equal(nil, @val.validate(:pattern, 'abfoodc'))
+		assert_nil(@val.validate(:pattern, '23foo45'))
+		assert_nil(@val.validate(:pattern, 'abfoodc'))
 	end
   def test_validate_html
     src = "<SPAN style=\"PADDING-BOTTOM: 4px; LINE-HEIGHT: 1.4em; WHITE-SPACE: normal\"><p class=\"MsoNormal\" style=\"MARGIN: 0cm -0.3pt 0pt 0cm; TEXT-ALIGN: justify\"><span lang=\"DE\" style=\"FONT-SIZE: 11pt; FONT-FAMILY: Arial; mso-bidi-font-size: 10.0pt; mso-bidi-font-family: 'Times New Roman'\">Wirkstoff: Ibuprofenum. </span></p><p class=\"MsoNormal\" style=\"MARGIN: 0cm -0.3pt 0pt 0cm; TEXT-ALIGN: justify\"><span lang=\"DE\" style=\"FONT-SIZE: 11pt; FONT-FAMILY: Arial; mso-bidi-font-size: 10.0pt; mso-bidi-font-family: 'Times New Roman'\">Hilfsstoffe: Conserv.: Sorbinsäure (E 200)</span></p></span>"

metadata

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