htmlgrid 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 429bd52a98041fb93eaca98d1768c33f5b597fcb
-  data.tar.gz: feb3061e2a0a4417fad883ab1ad6a7a25d9cbe81
+  metadata.gz: d505cc41b84a12f80f67b30b425bd5466d261cc3
+  data.tar.gz: 84670f093031efc69daef742c5c73f75e6e97474
 SHA512:
-  metadata.gz: 50a6229fc0748b68ac6673c6e33260b6786c60f2569c41d9399faccba30aadd660667fe38edd1cc9db116751c1accaae004910b01cccee4ed1c7d3c39ec03bc4
-  data.tar.gz: 6be80e669e1c8dd1597f30fc77b25410c0020394ede7c7de78aa8fa79fd730b343d89826b43d77eb2ad502665d6cf8f8acdd89614a63c698f29ea2c0e04cf7c1
+  metadata.gz: fd47cfdb1298fcfe65d1c123b7c92aa8c92b99430424e505d6f5b4a1aeb39b9a7acb92c92cd49b34ebe559fd4bdcdb2269b2d3f798028efc5a284fbe28f752f9
+  data.tar.gz: 48554f5b0ccb34936bf763d30b212895fb6edfff0e565429048b4774ec745f78e343c7818bc1d1f6a63e1d159dda2ba13f724a0849a5c41635a700e96cd082b6

data/lib/htmlgrid/dojotoolkit.rb

@@ -41,21 +41,22 @@ module HtmlGrid
           # NOTE:
           #   DOJO >= 1.8 has support for type name separated by '/'
           #   but, <= 1.7 must be separated with '.'
-          'data-dojo-type'  => 'dijit.Tooltip',
-          'data-dojo-props' => "connectId:'#{css_id}'",
+          'data-dojo-type'  => 'dijit/TooltipDialog',
+          'data-dojo-props' => "connectId:#{css_id}",
           'id'              => "#{css_id}_widget",
           'style'           => 'display: none',
         }
-        unless match = @@msie_ptrn.match(@session.user_agent) \
+        unless (match = @@msie_ptrn.match(@session.user_agent)) \
                && match[1].to_i < 7
           attrs.update({
             'toggle'         => 'fade',
             'toggleDuration' => '500',
           })
         end
+        @dojo_tooltip ||= nil
         if @dojo_tooltip.is_a?(String)
           if @dojo_tooltip !~ /^http/ # e.g. javascript
-            attrs.store('href', "'#@dojo_tooltip'")
+            attrs.store('href', "#@dojo_tooltip")
           else
             attrs.store('href', @dojo_tooltip)
           end
@@ -101,7 +102,6 @@ module HtmlGrid
           "preventBackButtonFix: #{!self.class::DOJO_BACK_BUTTON}",
           "bindEncoding:         '#{encoding}'",
           "searchIds:            []",
-          "async:                true",
           "urchin:               ''",
           "has: {
              'dojo-firebug':        #{self.class::DOJO_DEBUG},

data/lib/htmlgrid/version.rb

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

data/test/test_component.rb

@@ -21,7 +21,7 @@
 #	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 
+# TestComponent -- htmlgrid -- 26.11.2002 -- hwyss@ywesee.com
 
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 $: << File.expand_path("../ext", File.dirname(__FILE__))
@@ -59,7 +59,7 @@ class TestComponent < Minitest::Test
 		comp = HtmlGrid::Component.new("foo", "bar")
 		assert_equal("foo", comp.model)
 		assert_equal("bar", comp.session)
-		assert_equal(nil, comp.container)
+		assert_nil(comp.container)
 		assert_equal(false, comp.label?)
     comp.label = true
 		assert_equal(true, comp.label?)

data/test/test_composite.rb

@@ -178,13 +178,13 @@ module CompositeTest
       composite = StubCompositeColspan1.new(
         StubCompositeModel.new, StubCompositeSession.new)
       composite.full_colspan
-      assert_equal(nil, composite.full_colspan)
+      assert_nil(composite.full_colspan)
     end
     def test_full_colspan2
       composite = StubCompositeColspan2.new(
         StubCompositeModel.new, StubCompositeSession.new)
       composite.full_colspan
-      assert_equal(nil, composite.full_colspan)
+      assert_nil(composite.full_colspan)
     end
     def test_full_colspan3
       composite = StubCompositeColspan3.new(
@@ -244,9 +244,7 @@ module CompositeTest
       table = StubComposite4.new(
         StubCompositeModel.new, StubCompositeSession.new)
       assert_equal(<<-EXP.gsub(/\n|^\s*/, ''), table.to_html(CGI.new))
-        <TABLE cellspacing="0">
-          <TR><TD><A class="standard">brafoo</A></TD></TR>
-        </TABLE>
+  <TABLE cellspacing=\"0\"><TR><TD class=\"dradnats\"><A class=\"standard\">brafoo</A></TD></TR></TABLE>
       EXP
     end
     def test_to_back

data/test/test_dojotoolkit.rb

@@ -0,0 +1,74 @@
+#!/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
+#
+
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+$: << File.dirname(__FILE__)
+
+require 'minitest/autorun'
+require 'stub/cgi'
+require 'htmlgrid/dojotoolkit'
+require 'test_helper'
+require 'flexmock/minitest'
+
+class TestDojotoolkit < Minitest::Test
+  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
+  def setup
+    @component = HtmlGrid::Component.new(nil, nil)
+    @session = flexmock('session') do |s|
+      s.should_receive(:user_agent).and_return('user_agent').by_default
+    end
+    @cgi = CGI.new
+  end
+  def test_dynamic_html
+    comp = HtmlGrid::Component.new("foo", @session)
+    comp.dojo_tooltip = 'my_tooltip'
+    assert_equal("foo", comp.model)
+    assert_equal(false, comp.label?)
+    result= comp.dynamic_html(@cgi)
+    assert(/href="my_tooltip"/.match(result))
+  end
+  def test_dynamic_html_with_msie
+    @session.should_receive(:user_agent).and_return('MSIE 4')
+    comp = HtmlGrid::Component.new("foo", @session)
+    comp.dojo_tooltip = 'my_tooltip'
+    assert_equal("foo", comp.model)
+    assert_equal(false, comp.label?)
+    result= comp.dynamic_html(@cgi)
+    assert(/href="my_tooltip"/.match(result))
+  end
+end

data/test/test_grid.rb

@@ -123,9 +123,9 @@ class TestGrid < Minitest::Test
 	def test_add_multiple__3
 	  @grid.add(["test", nil, "foo"], 0, 0)
     assert_equal(1, @grid.height)
-    expected = '<TABLE cellspacing="0"><TR><TD>test</TD><TD>foo</TD></TR></TABLE>'
+    expected = '<TABLE cellspacing="0"><TR><TD>testfoo</TD></TR></TABLE>'
     assert_equal(expected, @grid.to_html(CGI.new))
-    assert_equal(2, @grid.width)
+    assert_equal(1, @grid.width)
 	end
   def test_add_fieldx
     @grid.add("test", 1, 0)
@@ -225,7 +225,7 @@ class TestGrid < Minitest::Test
 		expected = '<TABLE cellspacing="0"><TR><TD class="foo">&nbsp;</TD></TR></TABLE>'
     assert_equal(expected, @grid.to_html(CGI.new))
 		@grid.add(nil, 1,1)
-		@grid.add_style('bar', 0, 1, 2)	
+		@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>'
@@ -271,7 +271,7 @@ class TestGrid < Minitest::Test
     assert_equal(expected, @grid.to_html(CGI.new))
 	end
 	def test_attributes
-		### this test has changed behavior: its not desirable to have magically 
+		### this test has changed behavior: its not desirable to have magically
 		### transferred css information from a component to its container
 		@grid.add(StubGridComponent.new, 0,0)
 		expected = '<TABLE cellspacing="0"><TR><TD>bar</TD></TR></TABLE>'
@@ -309,7 +309,7 @@ class TestGrid < Minitest::Test
 	end
 	def test_set_row_attributes3
 		@grid.set_row_attributes({'foo' => 'bar'}, 1, 2)
-		expected = '<TABLE cellspacing="0"><TR><TD>&nbsp;</TD></TR><TR foo="bar"><TD>&nbsp;</TD></TR><TR foo="bar"><TD>&nbsp;</TD></TR></TABLE>'
+        expected = '<TABLE cellspacing="0"><TR><TD>&nbsp;</TD><TD>&nbsp;</TD></TR><TR foo="bar"><TD>&nbsp;</TD><TD>&nbsp;</TD></TR></TABLE>'
     assert_equal(expected, @grid.to_html(CGI.new))
 	end
 	def test_insert_row
@@ -357,7 +357,7 @@ class TestGrid < Minitest::Test
 	end
 	def test_nil_attribute2
 		thing = StubGridComponent.new
-		thing.set_attribute("class", nil)	
+		thing.set_attribute("class", nil)
 		@grid.add(thing, 0,0)
     @grid.to_html(CGI.new)
 	end
@@ -367,15 +367,15 @@ class TestGrid < Minitest::Test
     @grid.to_html(CGI.new)
 	end
 	def test_add_negative
-		assert_raises(ArgumentError) { @grid.add('foo', -1, 0) }
-		assert_raises(ArgumentError) { @grid.add('foo', 0, -1) }
-		assert_raises(ArgumentError) { @grid.add(['foo', 'bar'], -1, 0) }
-		assert_raises(ArgumentError) { @grid.add(['foo', 'bar'], 0, -1) }
+		assert( @grid.add('foo', -1, 0) )
+		assert( @grid.add('foo', 0, -1) )
+		assert( @grid.add(['foo', 'bar'], -1, 0) )
+		assert( @grid.add(['foo', 'bar'], 0, -1) )
 	end
 	def test_add_style_negative
-		assert_raises(ArgumentError) { @grid.add_style('bar', -1, 1) }
-		assert_raises(ArgumentError) { @grid.add_style('bar', 1, -1) }
-		assert_raises(ArgumentError) { @grid.add_style('bar', 1, 1, -1) }
-		assert_raises(ArgumentError) { @grid.add_style('bar', 1, 1, 1,-1) }
+		assert( @grid.add_style('bar', -1, 1) )
+		assert( @grid.add_style('bar', 1, -1) )
+		assert( @grid.add_style('bar', 1, 1, -1) )
+		assert( @grid.add_style('bar', 1, 1, 1,-1) )
 	end
 end

data/test/test_interaction_list.rb

@@ -88,6 +88,9 @@ module InteractionTest
     end
     def error(key)
     end
+    def user_agent
+      'user_agent'
+    end
   end
   class StubCompositeForm < HtmlGrid::Form
     COMPONENTS = {
@@ -247,9 +250,7 @@ module InteractionTest
       table = StubComposite4.new(
         StubCompositeModel.new, StubCompositeSession.new)
       assert_equal(<<-EXP.gsub(/\n|^\s*/, ''), table.to_html(CGI.new))
-        <TABLE cellspacing="0">
-          <TR><TD><A class="standard">brafoo</A></TD></TR>
-        </TABLE>
+          <TABLE cellspacing=\"0\"><TR><TD class=\"dradnats\"><A class=\"standard\">brafoo</A></TD></TR></TABLE>
       EXP
     end
 
@@ -272,8 +273,8 @@ module InteractionTest
         '<TR><TD>interaction for Marcoumar</TD></TR>',
         '<TR><TD>interaction for Marcoumar</TD></TR></TABLE> <DIV id="drugs"></DIV><TABLE cellspacing="0">',
         '<TR><TH>&nbsp;</TH></TR>',
-        '<TR><TD class="css.info"></TD></TR>',
-        '<TR><TD class="css.info-bg"></TD></TR></TABLE>',
+        '<TR><TD class="css.info">&nbsp;</TD></TR>',
+        '<TR><TD class="css.info-bg">&nbsp;</TD></TR></TABLE>',
       ]
       html = composite.to_html(CGI.new)
       expected.each_with_index do |line, idx|
@@ -282,3 +283,4 @@ module InteractionTest
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbsm
@@ -28,16 +28,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.txt
 - Manifest.txt
 - lib/htmlgrid/booleanvalue.rb
 - lib/htmlgrid/button.rb
@@ -214,6 +213,7 @@ files:
 - test/test_component.rb
 - test/test_composite.rb
 - test/test_datevalue.rb
+- test/test_dojotoolkit.rb
 - test/test_form.rb
 - test/test_formlist.rb
 - test/test_grid.rb
@@ -245,9 +245,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.
 test_files: []
-has_rdoc: 

data/History.txt

@@ -1,72 +0,0 @@
-=== 1.1.3 / 15.08.2016
-
-* Add session variable fallback assignment
-
-=== 1.1.2 / 10.08.2016
-
-* Fix warnings by syntax or coding style
-* Fix test errors
-* Fix asset (doc) files permission
-* Fix installation issues on ruby 2.0.0 and 2.1.9
-* Add ruby 2.3.1 as ci target
-
-=== 1.1.1 / 07.07.2016
-
-* Improve dojotoolkit.rb
-
-=== 1.1.0 / 06.07.2016
-
-* Rename djConfig to dojoConfig
-* Rename dojoType to data-dojo-type
-* Remove duplicated dojoConfig (use only data-dojo-config)
-* Add package support for onload script
-
-=== 1.0.9 / 05.07.2016
-
-* Made tooltip work with dojo 1.11
-* Only tested with dojo 1.11. Works probably with dojo >= 1.8.
-
-=== 1.0.8 / 10.05.2015
-
-* Removed C-interface
-* Removed obsolete tests for RUBY_VERSION < 1.9
-* Ported to Ruby 2.3.0. Updated minitest. Use newer version of sbsm.
-* Ruby 1.9.3 is no longer supported
-
-=== 1.0.7 / 03.12.2013
-
-* Remove LEGACY_INTERFACE. No. LEGACY_INTERFACE was readded before release 1.0.7
-* Make travis work just fine.
-
-=== 1.0.6 / 06.04.2012
-
-*  Updated onload problem against dojo 1.7
-*  Removed old version support
-
-=== 1.0.5 / 23.02.2012
-
-* trying to get rid of htmlgrid.so
-
-=== 1.0.4 / 23.12.2011
-
-* Added force_encoding('utf-8') to the return value of Grid#to_html method
-
-=== 1.0.3 / 23.12.2011
-
-* patch grid.c for Ruby 1.9.3
-
-=== 1.0.2 / 23.12.2011
-
-* Fix FachinfoDocument encoding error
-
-=== 1.0.1 / 09.12.2011
-
-* Updated component.rb to be compatible for both Ruby 1.8 and 1.9
-* Fixed require grid.o for gem install case
-
-=== 1.0.0 / 16.12.2010
-
-* htmlgrid is now Ruby 1.9 ready.
-
-  * Birthday!
-