htmlgrid 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a894cd7a5db3b2ca1cec59510012c4762173876fc0bba7024019467c4d31995a
-  data.tar.gz: c06fca0f6b632ecfc29d6c83540ebfc96ca595d883b7b66ff03c3ba6892c7ca5
+  metadata.gz: 87d0fe1b57b1446781886b5c03fff8f9eaef864515f05cfb0312269bb933b925
+  data.tar.gz: c134762161a92b02cd1e8658fb22efd6a2d0d89f57c9d088b05236dfd5a3b9dc
 SHA512:
-  metadata.gz: bd9cd290ee26db218bc675434031888db1067bdcb28105f656ad9ef8f1f9bbed20b518b83c7b72129ccdaa6e1412c037e9e17b6cf7f0b70aba34eb1f3fd79fab
-  data.tar.gz: e42dd5526ec2daca35de2eba08da359305424d1b04fa5d8bc2082b2a23b7d8dbbed109bd5ca162bb970db9839147800d90a491115433b3650fcc93467ac4e928
+  metadata.gz: bb5d41e32a404dd906968f050859a7312466d01ce71c57afd8deabb48fbf8caa0884f450e61b59524abeb9cf7d0e224757df0712203163a3243148ac7c323f19
+  data.tar.gz: 02c89a8f66c5ce317a14f144d42d9f174ac62f3ae9e63ef1fca735df94ebe504ff69cf259f2aa3500af1fad5fdf02ab0b1b5de70e95f4d19d0dc0733e3b95f3e

data/lib/htmlgrid/component.rb

@@ -239,6 +239,8 @@ module HtmlGrid
         value.to_html(context).to_s.dup.force_encoding("utf-8")
       elsif value&.is_a?(String)
         _value = CGI.unescape(value.gsub("+", CGI.escape("+")))
+      elsif value&.is_a?(Integer)
+        _value = value.to_s
       end
     end
 

data/lib/htmlgrid/component.rb~

@@ -0,0 +1,252 @@
+#!/usr/bin/env ruby
+
+#--
+#	HtmlGrid -- HyperTextMarkupLanguage Framework
+#	Copyright (C) 2003 ywesee - intellectual capital connected
+# Andreas Schrafl, Benjamin Fay, Hannes Wyss, Markus Huggler
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#	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
+#++
+
+module HtmlGrid
+  class Component
+    # sets the 'class' html-attribute
+    CSS_CLASS = nil
+    # sets the 'id' html-attribute
+    CSS_ID = nil
+    # other html-attributes
+    HTML_ATTRIBUTES = {}
+    # default http-headers
+    HTTP_HEADERS = {
+      "Content-Type" => "text/html",
+      "Cache-Control" => "no-cache, max-age=3600, must-revalidate"
+    }
+    # precede instances of this class with a label?
+    LABEL = false
+    @@html_entities = [
+      ["&", "amp"],
+      ["<", "lt"],
+      [">", "gt"]
+    ] # :nodoc:
+    @@symbol_entities = {
+      34	=>	"forall",
+      36	=>	"exist",
+      42	=>	"lowast",
+      45	=>	"minus",
+      64	=>	"cong",
+      65	=>	"Alpha",	97	=>	"alpha",
+      66	=>	"Beta",	98	=>	"beta",
+      67	=>	"Chi",	99	=>	"chi",
+      68	=>	"Delta",	100	=>	"delta",
+      69	=>	"Epsilon",	101	=>	"epsilon",
+      70	=>	"Phi",	102	=>	"phi",
+      71	=>	"Gamma",	103	=>	"gamma",
+      72	=>	"Eta",	104	=>	"eta",
+      73	=>	"Iota",	105	=>	"iota",
+      75	=>	"Kappa",	107	=>	"kappa",
+      76	=>	"Lambda",	108	=>	"lambda",
+      77	=>	"Mu",	109	=>	"mu",
+      78	=>	"Nu",	110	=>	"nu",
+      79	=>	"Omicron",	111	=>	"omicron",
+      80	=>	"Pi",	112	=>	"pi",
+      81	=>	"Theta",	113	=>	"theta",
+      82	=>	"Rho",	114	=>	"rho",
+      83	=>	"Sigma",	115	=>	"sigma",
+      84	=>	"Tau",	116	=>	"tau",
+      85	=>	"Upsilon",	117	=>	"upsilon",
+      86	=>	"sigmaf",
+      87	=>	"Omega",	119	=>	"omega",
+      88	=>	"Xi",	120	=>	"xi",
+      89	=>	"Psi",	121	=>	"psi",
+      90	=>	"Zeta",	122	=>	"zeta",
+      94	=>	"perp",	126	=>	"sim",
+      163	=>	"le",
+      165	=>	"infin",
+      166	=>	"fnof",
+      171	=>	"harr",
+      172	=>	"larr",
+      173	=>	"uarr",
+      174	=>	"rarr",
+      175	=>	"darr",
+      179	=>	"ge",
+      181	=>	"prop",
+      182	=>	"part",
+      185	=>	"ne",
+      186	=>	"equiv",
+      187	=>	"asymp",
+      191	=>	"crarr",
+      196	=>	"otimes",
+      197	=>	"oplus",
+      198	=>	"empty",
+      199	=>	"cap",
+      200	=>	"cup",
+      201	=>	"sup",
+      202	=>	"supe",
+      203	=>	"nsub",
+      204	=>	"sub",
+      205	=>	"sube",
+      206	=>	"isin",
+      207	=>	"notin",
+      208	=>	"ang",
+      209	=>	"nabla",
+      213	=>	"prod",
+      214	=>	"radic",
+      215	=>	"sdot",
+      217	=>	"and",
+      218	=>	"or",
+      219	=>	"hArr",
+      220	=>	"lArr",
+      221	=>	"uArr",
+      222	=>	"rArr",
+      223	=>	"dArr",
+      229	=>	"sum",
+      242	=>	"int"
+    } # :nodoc:
+    attr_reader :attributes, :model
+    attr_accessor :value
+    def initialize(model, session = nil, container = nil)
+      @model = model
+      @session = session
+      @lookandfeel = session.lookandfeel if session.respond_to?(:lookandfeel)
+      @container = container
+      @attributes = self.class::HTML_ATTRIBUTES.dup
+      if css_class
+        @attributes.store("class", css_class)
+      end
+      if css_id
+        @attributes.store("id", css_id)
+      end
+      @value = nil
+      @label = self.class::LABEL
+      init
+    end
+
+    # delegator to @container, default definition in Form
+    def autofill?
+      @container.autofill? if @container.respond_to?(:autofill?)
+    end
+
+    # gets the 'class' html-attribute if defined
+    def css_class
+      @css_class ||= self.class::CSS_CLASS
+    end
+
+    # sets the 'class' html-attribute
+    def css_class=(css_class)
+      @css_class = @attributes["class"] = css_class
+    end
+
+    # gets the 'id' html-attribute if defined
+    def css_id
+      @css_id ||= self.class::CSS_ID
+    end
+
+    # sets the 'id' html-attribute
+    def css_id=(css_id)
+      @css_id = @attributes["id"] = css_id
+    end
+
+    def dynamic_html(context)
+      ""
+    end
+
+    # escape '&', '<' and '>' characters in txt
+    def escape(txt)
+      @@html_entities.each_with_object(txt.to_s.dup) { |map, str|
+        char, entity = map
+        str.gsub!(char, "&" << entity << ";")
+      }
+    end
+
+    # escape symbol-font strings
+    def escape_symbols(txt)
+      esc = ""
+      txt.to_s.each_byte { |byte|
+        esc << if (entity = @@symbol_entities[byte])
+          "&" << entity << ";"
+        else
+          byte
+        end
+      }
+      esc
+    end
+
+    # delegator to @container, default definition in Form
+    def formname
+      @container.formname if @container.respond_to?(:formname)
+    end
+
+    def http_headers
+      self.class::HTTP_HEADERS.dup
+    end
+
+    # precede this instance with a label?
+    def label?
+      @label
+    end
+
+    attr_writer :label
+
+    def onclick=(onclick)
+      @attributes["onclick"] = onclick
+    end
+
+    # delegator to @container, default definition in Template
+    def onload=(onload)
+      @container.onload = onload if @container.respond_to? :onload=
+    end
+
+    # delegator to @container, default definition in Form
+    def onsubmit=(onsubmit)
+      @container.onsubmit = onsubmit if @container.respond_to? :onsubmit=
+    end
+
+    # set a html attribute
+    def set_attribute(key, value)
+      @attributes.store(key, value)
+    end
+
+    def tabindex=(tab)
+      @attributes.store("tabIndex", tab.to_s)
+    end
+
+    def to_html(context)
+      _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.dup.force_encoding("utf-8")
+      elsif value&.is_a?(String)
+        _value = CGI.unescape(value.gsub("+", CGI.escape("+")))
+#      elsif value&.is_a?(Integer)
+#        _value = value.to_s
+      end
+    end
+
+    private
+
+    def init
+    end
+  end
+end

data/lib/htmlgrid/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module HtmlGrid
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/lib/htmlgrid/version.rb~

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+module HtmlGrid
+  VERSION = "1.2.2"
+end

data/test/test_component.rb

@@ -162,6 +162,13 @@ class TestComponent < Minitest::Test
     assert_equal(true, comp.label?)
   end
 
+  def test_integer_to_html
+    comp = HtmlGrid::Component.new("context")
+    comp.value = 3
+    result = comp.to_html(CGI.new)
+    assert_equal("3", result)
+  end
+
   def test_escape
     txt = "Guten Tag! & wie gehts uns denn heute? '<' schlechter oder '>' besser?"
     control = txt.dup

data/test/test_component.rb~

@@ -0,0 +1,204 @@
+#!/usr/bin/env ruby
+#
+#	HtmlGrid -- HyperTextMarkupLanguage Framework
+#	Copyright (C) 2003 ywesee - intellectual capital connected
+# Hannes Wyss
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
+#	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
+#
+# TestComponent -- htmlgrid -- 26.11.2002 -- hwyss@ywesee.com
+
+$: << 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
+    attr_reader :session, :container
+  end
+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
+
+  class StubInitComponent < HtmlGrid::Component
+    attr_reader :init_called
+    def init
+      @init_called = true
+    end
+  end
+
+  class StubLabelComponent < HtmlGrid::Component
+    LABEL = true
+  end
+
+  class StubContainer
+    attr_accessor :onsubmit
+  end
+
+  class ToHTMLreturnFrozen
+    def initialize content
+      @content = content
+    end
+
+    def to_html(what)
+      @content.to_s.freeze
+    end
+  end
+
+  def setup
+    @component = HtmlGrid::Component.new(nil, nil)
+  end
+
+  def test_initialize1
+    HtmlGrid::Component.new("foo", "bar")
+    comp = HtmlGrid::Component.new("foo", "bar")
+    assert_equal("foo", comp.model)
+    assert_equal("bar", comp.session)
+    assert_nil(comp.container)
+    assert_equal(false, comp.label?)
+    comp.label = true
+    assert_equal(true, comp.label?)
+  end
+
+  def test_initialize2
+    HtmlGrid::Component.new("foo", "bar", "baz")
+    comp = HtmlGrid::Component.new("foo", "bar", "baz")
+    assert_equal("foo", comp.model)
+    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"}
+    assert_respond_to(comp, :attributes)
+    assert_equal(expected, comp.attributes)
+    assert_equal(expected, StubAttributeComponent::HTML_ATTRIBUTES)
+    comp.attributes.store("other", "val")
+    expected2 = {"key" =>	"val", "other" => "val"}
+    assert_equal(expected2, comp.attributes)
+    assert_equal(expected, StubAttributeComponent::HTML_ATTRIBUTES)
+    assert_equal({}, @component.attributes)
+    assert_equal({}, HtmlGrid::Component::HTML_ATTRIBUTES)
+    @component.attributes.store("third", "val")
+    expected = {"third" => "val"}
+    assert_equal(expected, @component.attributes)
+    assert_equal({}, HtmlGrid::Component::HTML_ATTRIBUTES)
+  end
+
+  def test_initialize4
+    comp = StubInitComponent.new("foo", "bar")
+    assert_equal(true, comp.init_called)
+  end
+
+  def test_initialize5
+    comp = StubLabelComponent.new(nil, nil)
+    assert_equal(true, comp.label?)
+  end
+
+  def test_integer_to_html
+    comp = HtmlGrid::Component.new("context")
+    comp.value = 3
+    result = comp.to_html(CGI.new)
+    assert_equal("xx", result)
+  end
+
+  def test_escape
+    txt = "Guten Tag! & wie gehts uns denn heute? '<' schlechter oder '>' besser?"
+    control = txt.dup
+    expected = "Guten Tag! &amp; wie gehts uns denn heute? '&lt;' schlechter oder '&gt;' besser?"
+    assert_equal(expected, @component.escape(txt))
+    assert_equal(control, txt)
+    assert_equal(expected, @component.escape(txt))
+  end
+
+  def test_escape_symbols
+    txt = "\263"
+    expected = "&ge;"
+    assert_equal(expected, @component.escape_symbols(txt))
+  end
+
+  def test_onsubmit
+    @component.onsubmit = "submitted"
+    assert_equal({}, @component.attributes)
+    cont = StubContainer.new
+    comp = HtmlGrid::Component.new("foo", "bar", cont)
+    comp.onsubmit = "submitted"
+    assert_equal("submitted", cont.onsubmit)
+  end
+
+  def test_set_attribute
+    assert_equal({}, @component.attributes)
+    @component.set_attribute("href", "http://www.ywesee.com")
+    expected = {
+      "href"	=>	"http://www.ywesee.com"
+    }
+    assert_equal(expected, @component.attributes)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +189,7 @@ files:
 - lib/htmlgrid/button.rb
 - lib/htmlgrid/centeredcomposite.rb
 - lib/htmlgrid/component.rb
+- lib/htmlgrid/component.rb~
 - lib/htmlgrid/composite.rb
 - lib/htmlgrid/datevalue.rb
 - lib/htmlgrid/div.rb
@@ -221,10 +236,12 @@ files:
 - lib/htmlgrid/urllink.rb
 - lib/htmlgrid/value.rb
 - lib/htmlgrid/version.rb
+- lib/htmlgrid/version.rb~
 - test/stub/cgi.rb
 - test/suite.rb
 - test/test_add_row.rb
 - test/test_component.rb
+- test/test_component.rb~
 - test/test_composite.rb
 - test/test_datevalue.rb
 - test/test_divlist.rb
@@ -244,7 +261,7 @@ homepage: https://github.com/zdavatz/htmlgrid/
 licenses:
 - GPL v2.1
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,8 +276,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.20
+signing_key:
 specification_version: 4
 summary: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.
 test_files: []