htmlgrid 1.1.2 → 1.1.7

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
+

data/test/test_template.rb

@@ -28,6 +28,7 @@ $LOAD_PATH << File.dirname(__FILE__)
 
 require 'minitest'
 require 'minitest/autorun'
+require 'flexmock/minitest'
 require 'stub/cgi'
 require 'sbsm/lookandfeel'
 require 'htmlgrid/template'
@@ -44,6 +45,9 @@ class StubTemplateSession
   end
   def server_name
     "testserver.com"
+  end
+  def server_port
+    '80'
   end
 	alias :default_language :language
 end
@@ -60,6 +64,7 @@ class StubTemplateLookandfeel < SBSM::Lookandfeel
 		self
 	end
 end
+
 class Template < HtmlGrid::Template
 	META_TAGS = [
 		{
@@ -86,11 +91,29 @@ class TestTemplate < Minitest::Test
     result << @template.to_html(CGI.new)
     expected = [
       '<TITLE>Test</TITLE>',
-      "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"http://testserver.com/resources/gcc/test.css\">",
+      '<LINK rel="stylesheet" type="text/css" async="true" href="http://testserver.com:80/resources/gcc/test.css">',
       '<META http-equiv="robots" content="follow, index">',
     ]
     expected.each_with_index { |line, idx|
       assert(result.index(line), "#{idx} Missing: #{line} in #{result}")
     }
 	end
+  def test_to_html_with_inline_css
+    @lookandfeel = flexmock('lnf', StubTemplateLookandfeel.new(StubTemplateSession.new))
+    @lookandfeel.should_receive(:resource).with(:css).and_return('test/inline.css')
+    @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)
+    expected = [
+      '<TITLE>html_title</TITLE>',
+      'this is a dummy CSS file, which should be inlined',
+      '<STYLE rel="stylesheet" type="text/css" async="true">',
+      '<META http-equiv="robots" content="follow, index">',
+    ]
+    expected.each_with_index { |line, idx|
+      assert(result.index(line), "#{idx} Missing: #{line} in #{result}")
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: htmlgrid
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.7
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2020-06-16 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,8 +156,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.txt
 - Manifest.txt
+- TooltipDialog.txt
+- interaction_no_inline.txt
 - lib/htmlgrid/booleanvalue.rb
 - lib/htmlgrid/button.rb
 - lib/htmlgrid/centeredcomposite.rb
@@ -214,6 +215,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
@@ -244,10 +246,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: HtmlGrid is a Html-ToolKit for Ruby Webframeworks.
 test_files: []
-has_rdoc: 

data/History.txt

@@ -1,68 +0,0 @@
-=== 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!
-