htmlgrid 1.1.1 → 1.1.2

data/lib/htmlgrid/label.rb

@@ -71,20 +71,20 @@ module HtmlGrid
 			yield self if(@component.respond_to?(:label?) && @component.label?)
 			yield @component
 		end
-		def to_html(context)
-      key = @label_key
-			label = @lookandfeel.lookup(key) 
-      if(!label && @component.respond_to?(:name))
-        key = @component.name
-				label = @lookandfeel.lookup(key)
-			end
+    def to_html(context)
+      key   = @label_key
+      label = @lookandfeel.lookup(key)
+      if !label && @component.respond_to?(:name)
+        key   = @component.name
+        label = @lookandfeel.lookup(key)
+      end
       state = @session.state
-      if(label && state.respond_to?(:mandatory?) && state.mandatory?(key))
-        label += "*"
-      end 
-			if(label)
-				context.label(@attributes) { label }
-			end
-		end
+      if label && state.respond_to?(:mandatory?) && state.mandatory?(key)
+        label += '*'
+      end
+      if label
+        context.label(@attributes) { label }
+      end
+    end
 	end
 end

data/lib/htmlgrid/list.rb

@@ -143,28 +143,28 @@ module HtmlGrid
       end
       link
     end
-		def sort_model
-			block = self::class::SORT_DEFAULT
-			if(block && (@session.event != :sort))
-				begin
-					if(block == :self)
-						@model = @model.sort
-					else
-						unless(block.is_a?(Proc))
-							block = Proc.new { |item| 
-								begin
-									item.send(self::class::SORT_DEFAULT) 
-								rescue RuntimeError => e
-									item.to_s
-								end
-							} 
-						end
-						@model = @model.sort_by(&block)
-					end
-				rescue StandardError => e
-					puts "could not sort: #{e.message}"
-				end
-			end
-		end
+    def sort_model
+      block = self::class::SORT_DEFAULT
+      if block && (@session.event != :sort)
+        begin
+          if block == :self
+            @model = @model.sort
+          else
+            unless block.is_a?(Proc)
+              block = Proc.new { |item|
+                begin
+                  item.send(self::class::SORT_DEFAULT)
+                rescue RuntimeError
+                  item.to_s
+                end
+              }
+            end
+            @model = @model.sort_by(&block)
+          end
+        rescue StandardError => e
+          puts "could not sort: #{e.message}"
+        end
+      end
+    end
 	end
 end

data/lib/htmlgrid/version.rb

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

data/test/suite.rb

@@ -25,8 +25,6 @@
 
 $: << File.expand_path(File.dirname(__FILE__))
 
-require 'rebuild'
-
 Dir.foreach(File.dirname(__FILE__)) { |file|
 	require file if /^test_.*\.rb$/o.match(file)
 }

data/test/test_add_row.rb

@@ -9,67 +9,86 @@ require 'htmlgrid/composite'
 require 'htmlgrid/inputtext'
 require 'htmlgrid/form'
 
-class StubComposite < HtmlGrid::Composite
-  attr_writer :container
-  COMPONENTS = {
-    [0,0,1] =>  :foo,
-  }
-  LABELS = true
-  SYMBOL_MAP = {
-    :bar  =>  HtmlGrid::InputText,
-  }
-  attr_reader :model, :session
-  public :resolve_offset, :labels?
-  def init
-    @barcount=0
-    super
-  end
-  def foo(model)
-    1.upto(2).each { |idx| 
-                      @grid.add(baz(model), 0, idx, 0)
+module RowTest
+  class StubComposite < HtmlGrid::Composite
+    attr_writer :container
+    COMPONENTS = {
+      [0, 0, 1] => :foo,
     }
-    "Foo"
-  end
-  def baz(model)
-    @barcount += 1
-    "Baz#{@barcount}"
-  end
-end
-class StubCompositeModel
-end
-class StubComposite2Model
-end
-class StubCompositeLookandfeel
-  def attributes(key)
-    {}
-  end
-  def lookup(key)
-  end
-  def base_url
-    'http://www.oddb.org/de/gcc'
+    LABELS = true
+    SYMBOL_MAP = {
+      :bar => HtmlGrid::InputText,
+    }
+    attr_reader :model, :session
+    public :resolve_offset, :labels?
+
+    def init
+      @barcount=0
+      super
+    end
+
+    def foo(session, model)
+      1.upto(2).each { |idx|
+        @grid.add(baz(model), 0, idx, 0)
+      }
+      'Foo'
+    end
+
+    private
+
+    def baz(model)
+      @barcount += 1
+      "Baz#{@barcount}"
+    end
   end
-end
-class StubCompositeSession
-  def lookandfeel
-    StubCompositeLookandfeel.new
+
+  class StubCompositeModel; end
+
+  class StubComposite2Model; end
+
+  class StubCompositeLookandfeel
+    def attributes(key)
+      {}
+    end
+
+    def lookup(key)
+    end
+
+    def base_url
+      'http://www.oddb.org/de/gcc'
+    end
   end
-  def error(key)
+
+  class StubCompositeSession
+    def lookandfeel
+      StubCompositeLookandfeel.new
+    end
+
+    def error(key)
+    end
   end
-end
-class StubCompositeForm < HtmlGrid::Form
-  COMPONENTS = {
-    [0,0] =>  StubComposite
-  }
-  EVENT = :foo
-end
 
-class TestComposite < Minitest::Test
-  def setup
-    @composite = StubComposite.new([StubComposite2Model.new, StubCompositeModel.new], 
-                                   StubCompositeSession.new)
+  class StubCompositeForm < HtmlGrid::Form
+    COMPONENTS = {
+      [0, 0] => StubComposite
+    }
+    EVENT = :foo
   end
-  def test_to_html
-    expected = '<TABLE cellspacing="0"><TR><TD>Foo</TD></TR><TR><TD>Baz1</TD></TR><TR><TD>Baz2</TD></TR></TABLE>'
-    assert_equal(expected, @composite.to_html(CGI.new))
+
+  class TestComposite < Minitest::Test
+    def setup
+      @composite = StubComposite.new(
+        [StubComposite2Model.new, StubCompositeModel.new],
+        StubCompositeSession.new
+      )
+    end
+
+    def test_to_html
+      assert_equal(<<-EXP.gsub(/\n|^\s*/, ''), @composite.to_html(CGI.new))
+        <TABLE cellspacing="0">
+          <TR><TD>Foo</TD></TR><TR><TD>Baz1</TD></TR><TR><TD>Baz2</TD></TR>
+        </TABLE>
+      EXP
+    end
   end
 end

data/test/test_component.rb

@@ -30,9 +30,9 @@ require 'minitest/autorun'
 require 'htmlgrid/component'
 
 module HtmlGrid
-	class Component
-		attr_reader :model, :session, :container
-	end
+  class Component
+    attr_reader :session, :container
+  end
 end
 
 class TestComponent < Minitest::Test

data/test/test_composite.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
-#	HtmlGrid -- HyperTextMarkupLanguage Framework
-#	Copyright (C) 2003 ywesee - intellectual capital connected
+# 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
@@ -18,10 +18,10 @@
 # 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
+# ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
+# htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# TestComposite -- htmlgrid -- 24.10.2002 -- hwyss@ywesee.com 
+# TestComposite -- htmlgrid -- 24.10.2002 -- hwyss@ywesee.com
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 $: << File.dirname(__FILE__)
@@ -32,183 +32,215 @@ require 'htmlgrid/composite'
 require 'htmlgrid/inputtext'
 require 'htmlgrid/form'
 require 'htmlgrid/button'
+require 'test_helper'
 
-class StubComposite < HtmlGrid::Composite
-	attr_writer :container
-	COMPONENTS = {
-		[0,0,0]	=>	:baz,
-		[0,0,1]	=>	:foo,
-		[0,0,2]	=>	:baz,
-		[0,1,0]	=>	:baz,
-		[0,1,1]	=>	:baz,	
-	}
-	LABELS = true
-	SYMBOL_MAP = {
-		:bar	=>	HtmlGrid::InputText,
-	}
-	attr_reader :model, :session
-	public :resolve_offset, :labels?
-	def init
-		@barcount=0
-		super
-	end
-	def foo(model, lookandfeel)
-		"Foo"
-	end
-	def baz(model, lookandfeel)
-		@barcount += 1
-		"Baz#{@barcount}"
-	end
-  def back
-    super
+module CompositeTest
+  class StubComposite < HtmlGrid::Composite
+    attr_writer :container
+    COMPONENTS = {
+      [0, 0, 0] => :baz,
+      [0, 0, 1] => :foo,
+      [0, 0, 2] => :baz,
+      [0, 1, 0] => :baz,
+      [0, 1, 1] => :baz,
+    }
+    LABELS = true
+    SYMBOL_MAP = {
+      :bar => HtmlGrid::InputText,
+    }
+    attr_reader :model, :session
+    public :resolve_offset, :labels?
+    def init
+      @barcount=0
+      super
+    end
+    def foo(model, lookandfeel)
+      "Foo"
+    end
+    def baz(model, lookandfeel)
+      @barcount += 1
+      "Baz#{@barcount}"
+    end
+    def back
+      super
+    end
   end
-end
-class StubCompositeComponent < HtmlGrid::Component
-	def to_html(context)
-		context.a(@attributes) { 'brafoo' }
-	end
-end
-class StubComposite2 < HtmlGrid::Composite
-	COMPONENTS = {
-		[0,0]	=>	StubCompositeComponent,
-	}
-end
-class StubComposite3 < StubComposite2
-	COMPONENT_CSS_MAP = {[0,0,4,4]=>'standard'}
-end
-class StubComposite4 < StubComposite3
-	CSS_MAP = {[0,0]=>'dradnats'}
-	COMPONENT_CSS_MAP = {[0,0,4,4]=>'standard'}
-end
-class StubCompositeNoLabel < HtmlGrid::Composite
-	LABELS = false
-	COMPONENTS = {}
-	public :labels?
-end
-class StubCompositeModel
-end
-class StubCompositeLookandfeel
-  def event_url(one)
-    return 'event_url'
+  class StubCompositeComponent < HtmlGrid::Component
+    def to_html(context)
+      context.a(@attributes) { 'brafoo' }
+    end
   end
-	def attributes(key)
-		{}
-	end
-	def lookup(key)
-	end
-	def base_url
-		'http://www.oddb.org/de/gcc'
-	end
-end
-class StubCompositeSession
-	def lookandfeel
-		StubCompositeLookandfeel.new
-	end
-	def error(key)
-	end
-end
-class StubCompositeForm < HtmlGrid::Form
-	COMPONENTS = {
-		[0,0]	=>	StubComposite
-	}
-	EVENT = :foo
-end
-class StubCompositeColspan1 < HtmlGrid::Composite
-	COMPONENTS = {}	
-end
-class StubCompositeColspan2 < HtmlGrid::Composite
-	COMPONENTS = {
-		[0,0]	=>	:foo,
-	}	
-end
-class StubCompositeColspan3 < HtmlGrid::Composite
-	COMPONENTS = {
-		[0,0]	=>	:foo,
-		[1,0]	=>	:bar,
-	}	
-end
-class StubCompositeColspan4 < HtmlGrid::Composite
-	COMPONENTS = {
-		[0,0]	=>	:foo,
-		[2,0]	=>	:bar,
-	}	
-end
-
-class TestComposite < Minitest::Test
-	def setup
-		@composite = StubComposite.new(StubCompositeModel.new, StubCompositeSession.new)
-	end
-	def test_create_method
-		foo = nil
-    foo = @composite.create(:foo, @composite.model)
-		assert_equal("Foo", foo)
-	end
-	def test_create_symbol
-		bar = nil
-    bar = @composite.create(:bar, @composite.model)
-		assert_equal(HtmlGrid::InputText, bar.class)
-	end
-	def test_full_colspan1
-		composite = StubCompositeColspan1.new(StubCompositeModel.new, StubCompositeSession.new)
-    composite.full_colspan
-		assert_equal(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)
-	end
-	def test_full_colspan3
-		composite = StubCompositeColspan3.new(StubCompositeModel.new, StubCompositeSession.new)
-    composite.full_colspan
-		assert_equal(2, composite.full_colspan)
-	end
-	def test_full_colspan4
-		composite = StubCompositeColspan4.new(StubCompositeModel.new, StubCompositeSession.new)
-    composite.full_colspan
-		assert_equal(3, composite.full_colspan)
-	end
-	def test_labels1
-		composite = StubCompositeNoLabel.new(StubCompositeModel.new, StubCompositeSession.new)
-		assert_equal(false, composite.labels?)
-	end
-	def test_labels2
-		assert_equal(true, @composite.labels?)
-	end
-  def test_to_html
-    expected = '<TABLE cellspacing="0"><TR><TD>Baz1FooBaz2</TD></TR><TR><TD>Baz3Baz4</TD></TR></TABLE>'
-    assert_equal(expected, @composite.to_html(CGI.new))
+  class StubComposite2 < HtmlGrid::Composite
+    COMPONENTS = {
+      [0, 0] => StubCompositeComponent,
+    }
   end
-	def test_resolve_offset
-		matrix = [1,2,3,4]
-		assert_equal(matrix, @composite.resolve_offset(matrix))
-		offset = [5,6]
-		expected = [6,8,3,4]
-		assert_equal(expected, @composite.resolve_offset(matrix, offset))
-	end
-	def test_event
-    @composite.event()
-		form = StubCompositeForm.new(@composite.model, @composite.session)
-		@composite.container = form
-		assert_equal(:foo, @composite.event())
-	end
-	def test_component_css_map
-		composite = StubComposite2.new(StubCompositeModel.new, StubCompositeSession.new)
-		expected = '<TABLE cellspacing="0"><TR><TD><A>brafoo</A></TD></TR></TABLE>'
-		assert_equal(expected, composite.to_html(CGI.new))
-		composite = StubComposite3.new(StubCompositeModel.new, StubCompositeSession.new)
-		expected = '<TABLE cellspacing="0"><TR><TD><A class="standard">brafoo</A></TD></TR></TABLE>'
-		assert_equal(expected, composite.to_html(CGI.new))
-		composite = StubComposite4.new(StubCompositeModel.new, StubCompositeSession.new)
+  class StubComposite3 < StubComposite2
+    COMPONENT_CSS_MAP = {[0, 0, 4, 4] => 'standard'}
   end
-  def test_to_back
-    if RUBY_VERSION.split(".").first.eql?('1')
-      expected = "<INPUT type=\"button\" name=\"back\" onClick=\"document.location.href='event_url';\">"
-    else
-      # It looks like Ruby 2.x escapes the ' which is not strictly necessary
-      expected = "<INPUT type=\"button\" name=\"back\" onClick=\"document.location.href=&#39;event_url&#39;;\">"
-    end
-    html = @composite.back().to_html(CGI.new)
-    assert_equal(expected, html)
+  class StubComposite4 < StubComposite3
+    CSS_MAP = {[0, 0] => 'dradnats'}
+    COMPONENT_CSS_MAP = {[0, 0, 4, 4] => 'standard'}
+  end
+  class StubCompositeNoLabel < HtmlGrid::Composite
+    LABELS = false
+    COMPONENTS = {}
+    public :labels?
+  end
+  class StubCompositeModel
+  end
+  class StubCompositeLookandfeel
+    def event_url(one)
+      return 'event_url'
+    end
+    def attributes(key)
+      {}
+    end
+    def lookup(key)
+    end
+    def base_url
+      'http://www.oddb.org/de/gcc'
+    end
+  end
+  class StubCompositeSession
+    def lookandfeel
+      StubCompositeLookandfeel.new
+    end
+    def error(key)
+    end
+  end
+  class StubCompositeForm < HtmlGrid::Form
+    COMPONENTS = {
+      [0, 0] => StubComposite
+    }
+    EVENT = :foo
+  end
+  class StubCompositeColspan1 < HtmlGrid::Composite
+    COMPONENTS = {}
+  end
+  class StubCompositeColspan2 < HtmlGrid::Composite
+    COMPONENTS = {
+      [0, 0] => :foo,
+    }
+  end
+  class StubCompositeColspan3 < HtmlGrid::Composite
+    COMPONENTS = {
+      [0, 0] => :foo,
+      [1, 0] => :bar,
+    }
+  end
+  class StubCompositeColspan4 < HtmlGrid::Composite
+    COMPONENTS = {
+      [0, 0] => :foo,
+      [2, 0] => :bar,
+    }
+  end
+
+  class TestComposite < Minitest::Test
+    def setup
+      @composite = StubComposite.new(
+        StubCompositeModel.new, StubCompositeSession.new)
+    end
+    def test_create_method
+      foo = nil
+      foo = @composite.create(:foo, @composite.model)
+      assert_equal("Foo", foo)
+    end
+    def test_create_symbol
+      bar = nil
+      bar = @composite.create(:bar, @composite.model)
+      assert_equal(HtmlGrid::InputText, bar.class)
+    end
+    def test_full_colspan1
+      composite = StubCompositeColspan1.new(
+        StubCompositeModel.new, StubCompositeSession.new)
+      composite.full_colspan
+      assert_equal(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)
+    end
+    def test_full_colspan3
+      composite = StubCompositeColspan3.new(
+        StubCompositeModel.new, StubCompositeSession.new)
+      composite.full_colspan
+      assert_equal(2, composite.full_colspan)
+    end
+    def test_full_colspan4
+      composite = StubCompositeColspan4.new(
+        StubCompositeModel.new, StubCompositeSession.new)
+      composite.full_colspan
+      assert_equal(3, composite.full_colspan)
+    end
+    def test_labels1
+      composite = StubCompositeNoLabel.new(
+        StubCompositeModel.new, StubCompositeSession.new)
+      assert_equal(false, composite.labels?)
+    end
+    def test_labels2
+      assert_equal(true, @composite.labels?)
+    end
+    def test_to_html
+      assert_equal(<<-EXP.gsub(/\n|^\s*/, ''), @composite.to_html(CGI.new))
+        <TABLE cellspacing="0">
+          <TR><TD>Baz1FooBaz2</TD></TR><TR><TD>Baz3Baz4</TD></TR>
+        </TABLE>
+      EXP
+    end
+    def test_resolve_offset
+      matrix = [1,2,3,4]
+      assert_equal(matrix, @composite.resolve_offset(matrix))
+      offset = [5,6]
+      expected = [6,8,3,4]
+      assert_equal(expected, @composite.resolve_offset(matrix, offset))
+    end
+    def test_event
+      @composite.event
+      @composite.container = StubCompositeForm.new(
+        @composite.model, @composite.session)
+      assert_equal(:foo, @composite.event)
+    end
+    def test_component_css_map
+      table = StubComposite2.new(
+        StubCompositeModel.new, StubCompositeSession.new)
+      assert_equal(<<-EXP.gsub(/\n|^\s*/, ''), table.to_html(CGI.new))
+        <TABLE cellspacing="0">
+          <TR><TD><A>brafoo</A></TD></TR>
+        </TABLE>
+      EXP
+      table = StubComposite3.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>
+      EXP
+      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>
+      EXP
+    end
+    def test_to_back
+      if RUBY_VERSION.split(".").first.eql?('1')
+        expected = <<-EXP.gsub(/\n|^\s{10}/, '')
+          <INPUT type="button" name="back"
+           onClick="document.location.href='event_url';">
+        EXP
+      else
+        # It looks like Ruby 2.x escapes the ' which is not strictly necessary
+        expected = <<-EXP.gsub(/\n|^\s{10}/, '')
+          <INPUT type="button" name="back"
+           onClick="document.location.href=&#39;event_url&#39;;">
+        EXP
+      end
+      html = @composite.back().to_html(CGI.new)
+      assert_equal(expected, html)
+    end
   end
 end