htmlgrid 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda73d2e1ec602956e9dac7af185179cc676906adf4a34fd1a683685c391ed49
-  data.tar.gz: c7668593f88170c009de8cc42839d69ec24834aec487baed336152eab1f979a4
+  metadata.gz: 499db7822b7a9628ffc8a755339c9498e727b60711b38c3433bf62340919dbcc
+  data.tar.gz: a742bdfd63e8a2bfe70d52b0912b68b3372194f182edaa9030f4db3b05034c48
 SHA512:
-  metadata.gz: c85d82f860af997c13a4c6f3298a5ac1dfc1cfff668d28842b21f0e8723c4cc35cadb19fa4990070ba6fd3d735235d2ec0d1b54585e46a91ef229e3683af5ebf
-  data.tar.gz: 5701ee21b4d273fcef7e6caab0af4401f8d67019aff1214327d092567fa73798690aebec32163aa890cd79eb6f4984c6e90a676eb2ffaee38fbfe7dc0137f80d
+  metadata.gz: d95e0f3b698b69bf8e3aaa9a8f84b2d79e28428e28b357512bfb74860b1dba3134b458fc9c7fbd62843ae570f228f3f8408bf0a033bd3b0e56c3de07284f5e08
+  data.tar.gz: 759170973e867985a62c8a1155d11dbcead9cafcade750f8d9089e1843544b8a6f04018741ec4dd9a1c8b1aff0f787700dcb194e4004303c7a60bb87d68a34e0

data/lib/htmlgrid/component.rb

@@ -22,8 +22,8 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# HtmlGrid::Component -- htmlgrid -- 23.12.2012 -- mhatakeyama@ywesee.com 
-# HtmlGrid::Component -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com 
+# HtmlGrid::Component -- htmlgrid -- 23.12.2012 -- mhatakeyama@ywesee.com
+# HtmlGrid::Component -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com
 #++
 
 module HtmlGrid
@@ -72,7 +72,7 @@ module HtmlGrid
 			83	=>	"Sigma",    		115	=>	"sigma",
 			84	=>	"Tau",      		116	=>	"tau",
 			85	=>	"Upsilon",  		117	=>	"upsilon",
-			86	=>	"sigmaf",   		
+			86	=>	"sigmaf",
 			87	=>	"Omega",    		119	=>	"omega",
 			88	=>	"Xi",       		120	=>	"xi",
 			89	=>	"Psi",      		121	=>	"psi",
@@ -163,7 +163,7 @@ module HtmlGrid
 		end
 		# escape '&', '<' and '>' characters in txt
 		def escape(txt)
-			@@html_entities.inject(txt.to_s.dup) { |str, map| 
+			@@html_entities.inject(txt.to_s.dup) { |str, map|
 				char, entity = map
 				str.gsub!(char, '&' << entity << ';')
 				str
@@ -214,7 +214,7 @@ module HtmlGrid
 			@attributes.store('tabIndex', tab.to_s)
 		end
     def to_html(context)
-      _to_html(context, @value).to_s.force_encoding('utf-8')
+      _to_html(context, @value).to_s.encode('utf-8')
     end
     @@nl2br_ptrn = /(\r\n)|(\n)|(\r)/
 		def _to_html(context, value=@value)
@@ -223,7 +223,7 @@ module HtmlGrid
 			elsif(value.respond_to?(:to_html))
 				value.to_html(context).to_s.force_encoding('utf-8')
 			else
-				value.to_s.gsub(@@nl2br_ptrn, '<br>')
+        value =CGI.unescape(value) if value && value.is_a?(String)
 			end
 		end
 		private

data/lib/htmlgrid/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 module HtmlGrid
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/test/test_component.rb

@@ -25,9 +25,11 @@
 
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 $: << File.expand_path("../ext", File.dirname(__FILE__))
+$: << File.dirname(__FILE__)
 
 require 'minitest/autorun'
 require 'htmlgrid/component'
+require 'stub/cgi'
 
 module HtmlGrid
   class Component
@@ -36,6 +38,7 @@ module HtmlGrid
 end
 
 class TestComponent < Minitest::Test
+  STRING_WITH_UMLAUT =  "Test_with_Umlaut_üé"
 	class StubAttributeComponent < HtmlGrid::Component
 		HTML_ATTRIBUTES = { "key" => "val" }
 	end
@@ -71,6 +74,22 @@ class TestComponent < Minitest::Test
 		assert_equal("bar", comp.session)
 		assert_equal("baz", comp.container)
 	end
+  def test_to_html
+    comp = HtmlGrid::Component.new("foo", "bar", "baz").to_html(CGI.new)
+    assert_equal("", comp)
+  end
+  def test_umlaut_to_html
+    comp = HtmlGrid::Component.new('context')
+    comp.value = STRING_WITH_UMLAUT
+    result = comp.to_html(CGI.new)
+    assert_equal(STRING_WITH_UMLAUT, result)
+  end
+  def test_escaped_STRING_WITH_UMLAUT_to_html
+    comp = HtmlGrid::Component.new('context')
+    comp.value =CGI.escape(STRING_WITH_UMLAUT)
+    result = comp.to_html(CGI.new)
+    assert_equal(STRING_WITH_UMLAUT, result)
+  end
 	def test_initialize3
 		comp = StubAttributeComponent.new("foo", "bar")
 		expected = { "key" =>	"val" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm