htmlgrid 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a894cd7a5db3b2ca1cec59510012c4762173876fc0bba7024019467c4d31995a
-  data.tar.gz: c06fca0f6b632ecfc29d6c83540ebfc96ca595d883b7b66ff03c3ba6892c7ca5
+  metadata.gz: ac32c5daad4ba30a32d15b25f2e7204a333847a571b86d6dc4ff3674327ffd7a
+  data.tar.gz: 521a04676dbb15f3522c1c5defd8d1813bc8bf87cb1a7ca7cf5982b02e2e1589
 SHA512:
-  metadata.gz: bd9cd290ee26db218bc675434031888db1067bdcb28105f656ad9ef8f1f9bbed20b518b83c7b72129ccdaa6e1412c037e9e17b6cf7f0b70aba34eb1f3fd79fab
-  data.tar.gz: e42dd5526ec2daca35de2eba08da359305424d1b04fa5d8bc2082b2a23b7d8dbbed109bd5ca162bb970db9839147800d90a491115433b3650fcc93467ac4e928
+  metadata.gz: 14e4e35e3639f44ff835416fedd0ec82471e179e6cdeead718aac1bdf49657d558412bf1c52797f82fd366bff37f9cfa3291c284f85f1dde2c6c119fb451918f
+  data.tar.gz: 4134060a38dee891f9da25d635c3e65956ce8e94943c1e0bbdd262f34bee18a07c1c19a6df548f1db75f0f2a178189453b81efa79704c7c1a1c5bd1d6298e652

data/lib/htmlgrid/component.rb

@@ -172,7 +172,7 @@ module HtmlGrid
     def escape(txt)
       @@html_entities.each_with_object(txt.to_s.dup) { |map, str|
         char, entity = map
-        str.gsub!(char, "&" << entity << ";")
+        str.gsub!(char, "&" + entity + ";")
       }
     end
 
@@ -180,8 +180,8 @@ module HtmlGrid
     def escape_symbols(txt)
       esc = ""
       txt.to_s.each_byte { |byte|
-        esc << if (entity = @@symbol_entities[byte])
-          "&" << entity << ";"
+        esc += if (entity = @@symbol_entities[byte])
+          "&" + entity + ";"
         else
           byte
         end
@@ -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/divcomposite.rb

@@ -37,9 +37,9 @@ module HtmlGrid
     def to_html(context)
       res = ""
       @grid&.each_with_index { |div, idx|
-        res << context.div(tag_attributes(idx)) {
+        res += context.div(tag_attributes(idx)) {
           div.flatten.inject("") { |html, item|
-            html << if item.respond_to?(:to_html)
+            html += if item.respond_to?(:to_html)
               item.to_html(context).force_encoding("utf-8")
             else
               item.to_s

data/lib/htmlgrid/dojotoolkit.rb

@@ -62,10 +62,10 @@ module HtmlGrid
           else
             attrs.store("href", @dojo_tooltip)
           end
-          html << context.div(attrs)
+          html += context.div(attrs)
         elsif @dojo_tooltip.respond_to?(:to_html)
           @dojo_tooltip.attributes.update(attrs)
-          html << @dojo_tooltip.to_html(context).force_encoding("utf-8")
+          html += @dojo_tooltip.to_html(context).force_encoding("utf-8")
         end
         unless html.empty? || dojo_parse_on_load
           html << context.script("type" => "text/javascript") {
@@ -73,7 +73,7 @@ module HtmlGrid
           }
         end
         # call original dynamic_html
-        dojo_dynamic_html(context) << html
+        "#{dojo_dynamic_html(context)}#{html}"
       end
     end
   end
@@ -114,7 +114,7 @@ module HtmlGrid
         ].join(",")
         args.store("data-dojo-config", config)
         args.store("src", dojo_path)
-        headers << context.script(args)
+        headers += context.script(args)
         args = {"type" => "text/javascript"}
         headers << context.script(args) {
           package_paths = self.class::DOJO_REQUIRE.map { |req|

data/lib/htmlgrid/form.rb

@@ -63,11 +63,10 @@ module HtmlGrid
     private
 
     def hidden_fields(context)
-      "" <<
-        context.hidden("flavor", @lookandfeel.flavor) <<
-        context.hidden("language", @lookandfeel.language) <<
+        context.hidden("flavor", @lookandfeel.flavor) +
+        context.hidden("language", @lookandfeel.language) +
         context.hidden({"NAME" => "event", "ID" => "event",
-                        "VALUE" => event.to_s}) <<
+                        "VALUE" => event.to_s}) +
         context.hidden("state_id", @session.state.object_id.to_s)
     end
 

data/lib/htmlgrid/grid.rb

@@ -96,10 +96,10 @@ module HtmlGrid
         def component_html(cgi)
           html = ""
           @components.each { |component|
-            html << if component.respond_to? :to_html
-              component.to_html(cgi).to_s.dup.force_encoding("utf-8")
+            if component.respond_to? :to_html
+              html += component.to_html(cgi).to_s.dup.force_encoding("utf-8")
             else
-              component.to_s
+              html += component.to_s
             end
           }
           html = "&nbsp;" if html.empty?
@@ -162,7 +162,7 @@ module HtmlGrid
         span = 1
         @fields.each { |field|
           if span < 2
-            html << field.to_html(cgi)
+            html += field.to_html(cgi)
             span = field.colspan
           else
             span -= 1

data/lib/htmlgrid/list.rb

@@ -90,7 +90,7 @@ module HtmlGrid
       ystep = step.at(1)
       components.each { |matrix, component|
         key = lookandfeel_key(component)
-        header_key = "th_" << key.to_s
+        header_key = "th_" + key.to_s
         if (txt = @lookandfeel.lookup(header_key))
           if self.class::SORT_HEADER
             @grid.add(sort_link(header_key, matrix, component), *matrix)

data/lib/htmlgrid/template.rb

@@ -113,7 +113,7 @@ module HtmlGrid
 
     def meta_tags(context)
       self.class::META_TAGS.inject("") { |inj, properties|
-        inj << context.meta(properties)
+        inj += context.meta(properties)
       }
     end
 

data/lib/htmlgrid/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module HtmlGrid
-  VERSION = "1.2.2"
+  VERSION = "1.2.4"
 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_grid.rb

@@ -255,15 +255,15 @@ class TestGrid < Minitest::Test
     assert_equal(expected, @grid.to_html(CGI.new))
     @grid.add(nil, 1, 1)
     @grid.add_style("bar", 0, 1, 2)
-    expected = '<TABLE cellspacing="0"><TR><TD class="foo">&nbsp;</TD>'
-    expected << '<TD>&nbsp;</TD></TR><TR><TD class="bar">&nbsp;</TD>'
-    expected << '<TD class="bar">&nbsp;</TD></TR></TABLE>'
+    expected = '<TABLE cellspacing="0"><TR><TD class="foo">&nbsp;</TD>'+
+    '<TD>&nbsp;</TD></TR><TR><TD class="bar">&nbsp;</TD>' +
+    '<TD class="bar">&nbsp;</TD></TR></TABLE>'
     assert_equal(expected, @grid.to_html(CGI.new))
     @grid.add_style("foobar", 0, 0, 2, 2)
-    expected = '<TABLE cellspacing="0"><TR><TD class="foobar">&nbsp;</TD>'
-    expected << '<TD class="foobar">&nbsp;</TD></TR>'
-    expected << '<TR><TD class="foobar">&nbsp;</TD>'
-    expected << '<TD class="foobar">&nbsp;</TD></TR></TABLE>'
+    expected = '<TABLE cellspacing="0"><TR><TD class="foobar">&nbsp;</TD>' +
+    '<TD class="foobar">&nbsp;</TD></TR>' +
+    '<TR><TD class="foobar">&nbsp;</TD>' +
+    '<TD class="foobar">&nbsp;</TD></TR></TABLE>'
     assert_equal(expected, @grid.to_html(CGI.new))
   end
 
@@ -292,9 +292,9 @@ class TestGrid < Minitest::Test
   def test_push
     @grid.add("bar", 4, 0)
     @grid.push("foo")
-    expected = '<TABLE cellspacing="0"><TR><TD>&nbsp;</TD><TD>&nbsp;</TD>'
-    expected << "<TD>&nbsp;</TD><TD>&nbsp;</TD><TD>bar</TD></TR>"
-    expected << '<TR><TD colspan="5">foo</TD></TR></TABLE>'
+    expected = '<TABLE cellspacing="0"><TR><TD>&nbsp;</TD><TD>&nbsp;</TD>' +
+    "<TD>&nbsp;</TD><TD>&nbsp;</TD><TD>bar</TD></TR>" +
+    '<TR><TD colspan="5">foo</TD></TR></TABLE>'
     assert_equal(expected, @grid.to_html(CGI.new))
   end
 

data/test/test_label.rb

@@ -109,10 +109,10 @@ class TestLabel < Minitest::Test
   def test_to_html1
     composite = StubLabelComposite.new(StubLabelModel.new, @session)
     expected = '<TABLE cellspacing="0"><TR>'
-    expected << '<TD><LABEL for="componentname">Label</LABEL></TD>'
-    expected << "<TD>component</TD></TR>"
-    expected << '<TR><TD><LABEL for="componentname">Named Label</LABEL></TD>'
-    expected << "<TD>component</TD></TR></TABLE>"
+    expected += '<TD><LABEL for="componentname">Label</LABEL></TD>'
+    expected += "<TD>component</TD></TR>"
+    expected += '<TR><TD><LABEL for="componentname">Named Label</LABEL></TD>'
+    expected += "<TD>component</TD></TR></TABLE>"
     assert_equal(expected, composite.to_html(CGI.new))
   end
 

data/test/test_template.rb

@@ -93,8 +93,7 @@ class TestTemplate < Minitest::Test
   end
 
   def test_to_html
-    result = ""
-    result << @template.to_html(CGI.new)
+    result = @template.to_html(CGI.new)
     expected = [
       "<TITLE>Test</TITLE>",
       '<LINK rel="stylesheet" type="text/css" async="true" href="http://testserver.com:80/resources/gcc/test.css">',
@@ -111,8 +110,7 @@ class TestTemplate < Minitest::Test
     @lookandfeel.should_receive(:lookup).with(:html_title).and_return("html_title").by_default
     @lookandfeel.should_receive(:lookup).with(any).and_return(nil).by_default
     @template = Template.new(nil, @lookandfeel, nil)
-    result = ""
-    result << @template.to_html(CGI.new)
+    result = @template.to_html(CGI.new)
     expected = [
       "<TITLE>html_title</TITLE>",
       "this is a dummy CSS file, which should be inlined",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2025-01-08 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
@@ -243,7 +257,8 @@ files:
 homepage: https://github.com/zdavatz/htmlgrid/
 licenses:
 - GPL v2.1
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/zdavatz/htmlgrid//blob/master/History.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -259,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.