htmlgrid 1.1.5 → 1.2.0

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,16 +214,18 @@ 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)
 			if(value.is_a?(Array))
 				value.collect { |item| _to_html(context, item) }.join(' ')
 			elsif(value.respond_to?(:to_html))
-				value.to_html(context).to_s.force_encoding('utf-8')
+				value.to_html(context).to_s.dup.force_encoding('utf-8')
 			else
-				value.to_s.gsub(@@nl2br_ptrn, '<br>')
+        if value && value.is_a?(String)
+          value =CGI.unescape(value.gsub('+', CGI.escape('+')))
+        end
 			end
 		end
 		private

data/lib/htmlgrid/dojotoolkit.rb

@@ -5,12 +5,12 @@
 
 require 'htmlgrid/component'
 require 'htmlgrid/div'
-require 'htmlgrid/template'
 
 module HtmlGrid
   class Component
     @@msie_ptrn = /MSIE\s*(\d)/
     attr_accessor :dojo_tooltip
+    # DOJO_VERSION >= 1.7.0 only (removed old version support)
     def dojo_tag(widget, args={}, inner_html='')
       div = HtmlGrid::Div.new(@model, @session, self)
       div.set_attribute('data-dojo-type', widget)
@@ -38,6 +38,9 @@ module HtmlGrid
       def dynamic_html(context)
         html = ''
         attrs = {
+          # NOTE:
+          #   DOJO >= 1.8 has support for type name separated by '/'
+          #   but, <= 1.7 must be separated with '.'
           'data-dojo-type'  => 'dijit/TooltipDialog',
           'data-dojo-props' => "connectId:#{css_id}",
           'id'              => "#{css_id}_widget",
@@ -63,7 +66,9 @@ module HtmlGrid
           html << @dojo_tooltip.to_html(context).force_encoding('utf-8')
         end
         unless html.empty? || dojo_parse_on_load
-          html << context.script('type' => 'text/javascript') { "dojoConfig.searchIds.push('#{css_id}')" }
+          html << context.script('type' => 'text/javascript') {
+            "dojoConfig.searchIds.push('#{css_id}')"
+          }
         end
         # call original dynamic_html
         dojo_dynamic_html(context) << html
@@ -72,7 +77,7 @@ module HtmlGrid
   end
 	module DojoToolkit
 		module DojoTemplate
-			DOJO_DEBUG = true
+			DOJO_DEBUG = false
 			DOJO_BACK_BUTTON = false
       DOJO_ENCODING = nil
       DOJO_PARSE_ON_LOAD = true
@@ -91,30 +96,52 @@ module HtmlGrid
             "{ name: '#{prefix}', location: '#{path}' }"
           }.join(",")
         end
-        puts "dynamic_html_headers with pkgs: #{packages}"
-        config =config = [
+        config = [
+          "parseOnLoad:          #{self.class::DOJO_PARSE_ON_LOAD}",
+          "isDebug:              #{self.class::DOJO_DEBUG}",
+          "preventBackButtonFix: #{!self.class::DOJO_BACK_BUTTON}",
+          "bindEncoding:         '#{encoding}'",
+          "searchIds:            []",
+          "urchin:               ''",
           "has: {
-             'dojo-debug-messages': true
+             'dojo-firebug':        #{self.class::DOJO_DEBUG},
+             'dojo-debug-messages': #{self.class::DOJO_DEBUG}
           }",
+          "packages: [ #{packages} ]"
         ].join(',')
-        headers << %(<script>
-       var dojoConfig = {
-            parseOnLoad: true,
-            isDebug: true,
-            async: true,
-            urchin: '',
-        };
-</script>)
+        args.store('data-dojo-config', config)
+        args.store('src', dojo_path)
         headers << context.script(args)
-        {  'text/css'         => File.join(File.dirname(dojo_path), "/resources/dojo.css"),
-           'text/javascript'  => dojo_path,
-        }.each do |type, path|
-          if (content = get_inline(path))
-            headers << context.style(:type =>type) { content }
+        args = { 'type' => 'text/javascript' }
+        headers << context.script(args) {
+          package_paths = self.class::DOJO_REQUIRE.map { |req|
+            "'#{req}'"
+          }.join(',')
+          package_names = self.class::DOJO_REQUIRE.map { |req|
+            req.split('/').last
+          }.join(',')
+          if @dojo_onloads
+            onloads = ''
+            @dojo_onloads.each { |onload|
+              onloads << "#{onload}\n"
+            }
+            script =
+            "require([#{package_paths}], function(#{package_names}) {" \
+              "ready(function() {" \
+                "#{onloads}" \
+              "});" \
+            "});"
           else
-            headers << context.style(:type =>type, :src => path) { "@import \"#{path}\";" }
+            script = "require([#{package_paths}]);"
           end
-        end
+          script
+        }
+        dojo_dir = File.dirname(dojo_path)
+        headers << context.style(:type => "text/css") { <<-EOS
+          @import "#{File.join(dojo_dir, "/resources/dojo.css")}";
+          @import "#{File.join(dojo_dir, "../dijit/themes/tundra/tundra.css")}";
+        EOS
+        }
         headers
       end
       def dojo_parse_on_load

data/lib/htmlgrid/template.rb

@@ -22,9 +22,10 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Template -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com 
+# Template -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com
 
 require 'htmlgrid/composite'
+require 'uri'
 
 module HtmlGrid
 	module TemplateMethods
@@ -36,14 +37,10 @@ module HtmlGrid
 		CSS_FILES = []
 		JAVASCRIPTS = []
     @@local_doc_dir = File.join(Dir.pwd, 'doc')
-    def get_inline(ressource)
+    def TemplateMethods.get_inline(ressource)
+      return nil unless ressource
       local_file = File.join(@@local_doc_dir, URI(ressource).path)
-      if File.exist?(local_file)
-        # puts "Reading #{ressource} #{local_file} #{File.size(local_file)}"
-        File.read(local_file)
-      else
-        nil
-      end
+      File.exist?(local_file) ? File.read(local_file) : nil
     end
 		def css_link(context, path=@lookandfeel.resource(:css))
 			properties = {
@@ -52,7 +49,7 @@ module HtmlGrid
 				"async"	=>	"true",
 				'href'	=>	path,
 			}
-      if (content = get_inline(path))
+      if (content = TemplateMethods.get_inline(path))
         properties.delete('href')
         context.style(properties) { content }
       else
@@ -60,8 +57,8 @@ module HtmlGrid
       end
 		end
 		def css_links(context, path=@lookandfeel.resource(:css))
-			links = self.class.const_get(:CSS_FILES).collect { |key| 
-				css_link(context, @lookandfeel.resource(key)) 
+			links = self.class.const_get(:CSS_FILES).collect { |key|
+				css_link(context, @lookandfeel.resource(key))
 			}
 			links.push(css_link(context, path)) if(path)
 			links.join
@@ -101,7 +98,7 @@ module HtmlGrid
 					"language"	=>	"JavaScript",
 					"type"			=>	"text/javascript",
 					"src"				=>	@lookandfeel.resource_global(:javascript, "#{key}.js"),
-				}		
+				}
 				context.script(properties)
 			}
 			jscripts.join

data/lib/htmlgrid/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 module HtmlGrid
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 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,9 @@ module HtmlGrid
 end
 
 class TestComponent < Minitest::Test
+  STRING_WITH_SHARP =  "Test_#_gartenhat"
+  STRING_WITH_PLUS =  "Test_+_plus"
+  STRING_WITH_UMLAUT =  "Test_with_Umlaut_üé"
 	class StubAttributeComponent < HtmlGrid::Component
 		HTML_ATTRIBUTES = { "key" => "val" }
 	end
@@ -51,6 +56,14 @@ class TestComponent < Minitest::Test
 	class StubContainer
 		attr_accessor :onsubmit
 	end
+  class ToHTMLreturnFrozen
+    def initialize  content
+      @content = content
+    end
+    def to_html(what)
+      return @content.to_s.freeze
+    end
+  end
 	def setup
 		@component = HtmlGrid::Component.new(nil, nil)
 	end
@@ -71,6 +84,41 @@ 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
+  # Next is test for https://github.com/zdavatz/oddb.org/issues/118 FrozenError at /de/just-medical
+  def test_to_html_frozen_empty
+    comp = HtmlGrid::Component.new('context')
+    comp.value = ToHTMLreturnFrozen.new('')
+    result = comp.to_html(CGI.new)
+    assert_equal('', result)
+  end
+  def test_gartenhag_to_html
+    comp = HtmlGrid::Component.new('context')
+    comp.value = STRING_WITH_SHARP
+    result = comp.to_html(CGI.new)
+    assert_equal(STRING_WITH_SHARP, result)
+  end
+  def test_minus_to_html
+    comp = HtmlGrid::Component.new('context')
+    comp.value = STRING_WITH_PLUS
+    result = comp.to_html(CGI.new)
+    assert_equal(STRING_WITH_PLUS, result)
+  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" }

data/test/test_dojotoolkit.rb

@@ -27,6 +27,7 @@ $: << File.dirname(__FILE__)
 
 require 'minitest/autorun'
 require 'stub/cgi'
+require 'htmlgrid/template'
 require 'htmlgrid/dojotoolkit'
 require 'test_helper'
 require 'flexmock/minitest'

data/test/test_template.rb

@@ -21,7 +21,7 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, downloads.ywesee.com/ruby/htmlgrid
 #
-# TestTemplate -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com 
+# TestTemplate -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com
 
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 $LOAD_PATH << File.dirname(__FILE__)
@@ -73,7 +73,7 @@ class Template < HtmlGrid::Template
 		},
 	]
 	COMPONENTS = {
-		[0,0]	=>	:foo,	
+		[0,0]	=>	:foo,
 	}
 	LEGACY_INTERFACE = false
 	def foo(model)
@@ -116,4 +116,7 @@ class TestTemplate < Minitest::Test
       assert(result.index(line), "#{idx} Missing: #{line} in #{result}")
     }
   end
+  def test_to_html_with_nil_inline
+    assert_nil(cpHtmlGrid::TemplateMethods.get_inline(nil))
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm
@@ -157,6 +157,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Manifest.txt
+- TooltipDialog.txt
+- interaction_no_inline.txt
 - lib/htmlgrid/booleanvalue.rb
 - lib/htmlgrid/button.rb
 - lib/htmlgrid/centeredcomposite.rb
@@ -244,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.4
 signing_key: 
 specification_version: 4
 summary: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.