htmlgrid 1.1.7 → 1.2.2

data/lib/htmlgrid/labeltext.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,14 +22,14 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com
 #
-# LabelText -- oddb -- 22.07.2003 -- hwyss@ywesee.com 
+# LabelText -- oddb -- 22.07.2003 -- hwyss@ywesee.com
 
-require 'htmlgrid/text'
+require "htmlgrid/text"
 
 module HtmlGrid
-	class LabelText < Text
-		def to_html(context)
-			context.label { super }
-		end
-	end
+  class LabelText < Text
+    def to_html(context)
+      context.label { super }
+    end
+  end
 end

data/lib/htmlgrid/link.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,33 +22,37 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Link -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com 
+# Link -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com
 
-require 'htmlgrid/namedcomponent'
+require "htmlgrid/namedcomponent"
 
 module HtmlGrid
-	class Link < NamedComponent
-		def init
-			super
-			@value = @lookandfeel.lookup(@name)
-		end
-		def href
-			@attributes['href']
-		end
-		def href=(url)
-			@attributes['href'] = url
-		end
-		def target=(trg)
-			@attributes['target']	= trg
-		end
-		def to_html(context)
-			context.a(@attributes) { 
-				if(@value.respond_to?(:to_html))
-					@value.to_html(context).force_encoding('utf-8')
-				else
-					super
-				end
-			} << dynamic_html(context)
-		end
-	end
+  class Link < NamedComponent
+    def init
+      super
+      @value = @lookandfeel.lookup(@name)
+    end
+
+    def href
+      @attributes["href"]
+    end
+
+    def href=(url)
+      @attributes["href"] = url
+    end
+
+    def target=(trg)
+      @attributes["target"]	= trg
+    end
+
+    def to_html(context)
+      context.a(@attributes) {
+        if @value.respond_to?(:to_html)
+          @value.to_html(context).force_encoding("utf-8")
+        else
+          super
+        end
+      } << dynamic_html(context)
+    end
+  end
 end

data/lib/htmlgrid/list.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,138 +22,149 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# List -- htmlgrid -- 03.03.2003 -- hwyss@ywesee.com 
+# List -- htmlgrid -- 03.03.2003 -- hwyss@ywesee.com
 
-require 'htmlgrid/composite'
-require 'htmlgrid/link'
-require 'htmlgrid/value'
+require "htmlgrid/composite"
+require "htmlgrid/link"
+require "htmlgrid/value"
 
 module HtmlGrid
-	class List < Composite
+  class List < Composite
     BACKGROUND_ROW = nil
-		BACKGROUND_SUFFIX = '-bg'
-		CSS_HEAD_MAP = {}
-		DEFAULT_CLASS = Value
-		DEFAULT_HEAD_CLASS = nil
-		EMPTY_LIST = false 
-		EMPTY_LIST_KEY = :empty_list
-		OFFSET_STEP = [0,1]
-		OMIT_HEADER = false
-		OMIT_HEAD_TAG = false
-		SORT_DEFAULT = :to_s
-		SORT_HEADER = true
-		SORT_REVERSE = false
-		STRIPED_BG = true
-		def compose(model=@model, offset=[0,0])
-			unless (self::class::OMIT_HEADER)
-				offset = compose_header(offset) 
-			end
-			if(model.empty?)
-				offset = compose_empty_list(offset) unless (self::class::EMPTY_LIST)
-			else
-				offset = compose_list(model, offset)
-			end
-			compose_footer(offset)
-		end
-		def compose_footer(offset=[0,0])
-		end
-		def compose_empty_list(offset, klass='list')
-      fill_row(offset, self::class::EMPTY_LIST_KEY, klass)
-		end
-		def compose_list(model=@model, offset=[0,0])
-			bg_flag = false
-			model.each_with_index { |mdl, idx|
-				@list_index = idx
-				_compose(mdl, offset, bg_flag)
-				#compose_components(mdl, offset)
-				#compose_css(offset, resolve_suffix(mdl, bg_flag))
-				#compose_colspan(offset)
-				if(rcss = row_css(mdl, bg_flag))
-					@grid.set_row_attributes({'class' => rcss}, offset.at(1),
-                                  self::class::OFFSET_STEP.at(1))
-				end
-				offset = resolve_offset(offset, self::class::OFFSET_STEP)
-				bg_flag = !bg_flag if self::class::STRIPED_BG
-			}
-			offset
-		end	
-		def compose_header(offset=[0,0])
-			step = if(defined?(self::class::HEAD_OFFSET_STEP))
-				self::class::HEAD_OFFSET_STEP
-			else
-				self::class::OFFSET_STEP
-			end
-			ystep = step.at(1)
-			components.each { |matrix, component|
-				key = lookandfeel_key(component)
-				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)
-					else
-						@grid.add(txt, *matrix)
-					end
-				end
-				if((cls = css_head_map[matrix]) \
-					|| (cls = self::class::DEFAULT_HEAD_CLASS))
-					@grid.add_attribute('class', cls, *matrix)
-					#link.attributes['class'] = cls
-				end
-				unless(self::class::OMIT_HEAD_TAG || matrix.at(1) >= ystep)
-					@grid.add_tag('TH', *matrix) 
-				end
-				if(title = @lookandfeel.lookup(header_key + '_title'))
-					@grid.add_attribute('title', title, *matrix)
-				end
-			}
-			#span = full_colspan || 1
-			resolve_offset(offset, step)
-		end
-		def css_head_map
-			@css_head_map ||= self::class::CSS_HEAD_MAP.dup
-		end
+    BACKGROUND_SUFFIX = "-bg"
+    CSS_HEAD_MAP = {}
+    DEFAULT_CLASS = Value
+    DEFAULT_HEAD_CLASS = nil
+    EMPTY_LIST = false
+    EMPTY_LIST_KEY = :empty_list
+    OFFSET_STEP = [0, 1]
+    OMIT_HEADER = false
+    OMIT_HEAD_TAG = false
+    SORT_DEFAULT = :to_s
+    SORT_HEADER = true
+    SORT_REVERSE = false
+    STRIPED_BG = true
+    def compose(model = @model, offset = [0, 0])
+      unless self.class::OMIT_HEADER
+        offset = compose_header(offset)
+      end
+      if model.empty?
+        offset = compose_empty_list(offset) unless self.class::EMPTY_LIST
+      else
+        offset = compose_list(model, offset)
+      end
+      compose_footer(offset)
+    end
+
+    def compose_footer(offset = [0, 0])
+    end
+
+    def compose_empty_list(offset, klass = "list")
+      fill_row(offset, self.class::EMPTY_LIST_KEY, klass)
+    end
+
+    def compose_list(model = @model, offset = [0, 0])
+      bg_flag = false
+      model.each_with_index { |mdl, idx|
+        @list_index = idx
+        _compose(mdl, offset, bg_flag)
+        # compose_components(mdl, offset)
+        # compose_css(offset, resolve_suffix(mdl, bg_flag))
+        # compose_colspan(offset)
+        if (rcss = row_css(mdl, bg_flag))
+          @grid.set_row_attributes({"class" => rcss}, offset.at(1),
+            self.class::OFFSET_STEP.at(1))
+        end
+        offset = resolve_offset(offset, self.class::OFFSET_STEP)
+        bg_flag = !bg_flag if self.class::STRIPED_BG
+      }
+      offset
+    end
+
+    def compose_header(offset = [0, 0])
+      step = if defined?(self.class::HEAD_OFFSET_STEP)
+        self.class::HEAD_OFFSET_STEP
+      else
+        self.class::OFFSET_STEP
+      end
+      ystep = step.at(1)
+      components.each { |matrix, component|
+        key = lookandfeel_key(component)
+        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)
+          else
+            @grid.add(txt, *matrix)
+          end
+        end
+        if (cls = css_head_map[matrix]) \
+          || (cls = self.class::DEFAULT_HEAD_CLASS)
+          @grid.add_attribute("class", cls, *matrix)
+          # link.attributes['class'] = cls
+        end
+        unless self.class::OMIT_HEAD_TAG || matrix.at(1) >= ystep
+          @grid.add_tag("TH", *matrix)
+        end
+        if (title = @lookandfeel.lookup(header_key + "_title"))
+          @grid.add_attribute("title", title, *matrix)
+        end
+      }
+      # span = full_colspan || 1
+      resolve_offset(offset, step)
+    end
+
+    def css_head_map
+      @css_head_map ||= self.class::CSS_HEAD_MAP.dup
+    end
+
     def fill_row(offset, key, klass)
       @grid.add(@lookandfeel.lookup(key), *offset)
-      @grid.add_attribute('class', klass, *offset)
+      @grid.add_attribute("class", klass, *offset)
       @grid.set_colspan(*offset)
-      resolve_offset(offset, self::class::OFFSET_STEP)
+      resolve_offset(offset, self.class::OFFSET_STEP)
+    end
+
+    private
+
+    def init
+      @model ||= []
+      @index = 0
+      sort_model
+      if self.class::SORT_REVERSE && (@session.event != :sort)
+        @model = @model.reverse
+      end
+      super
     end
-		private
-		def init
-			@model ||= []
-			@index = 0
-			sort_model()
-			if(self::class::SORT_REVERSE && (@session.event != :sort))
-				@model = @model.reverse 
-			end
-			super
-		end
+
     def row_css(model, bg_flag)
-      self::class::BACKGROUND_ROW if(bg_flag)
+      self.class::BACKGROUND_ROW if bg_flag
     end
+
     def sort_link(header_key, matrix, component)
       link = Link.new(header_key, @model, @session, self)
       args = {
-        'sortvalue'	=>	component.to_s,
+        "sortvalue"	=>	component.to_s
       }
-      link.attributes['href'] = @lookandfeel.event_url(:sort, args)
-      if((cls = css_head_map[matrix]) \
-        || (cls = self::class::DEFAULT_HEAD_CLASS))
-        link.attributes['class'] = cls
+      link.attributes["href"] = @lookandfeel.event_url(:sort, args)
+      if (cls = css_head_map[matrix]) \
+        || (cls = self.class::DEFAULT_HEAD_CLASS)
+        link.attributes["class"] = cls
       end
       link
     end
+
     def sort_model
-      block = self::class::SORT_DEFAULT
+      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|
+              block = proc { |item|
                 begin
-                  item.send(self::class::SORT_DEFAULT)
+                  item.send(self.class::SORT_DEFAULT)
                 rescue RuntimeError
                   item.to_s
                 end
@@ -161,10 +172,10 @@ module HtmlGrid
             end
             @model = @model.sort_by(&block)
           end
-        rescue StandardError => e
+        rescue => e
           puts "could not sort: #{e.message}"
         end
       end
     end
-	end
+  end
 end

data/lib/htmlgrid/namedcomponent.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,31 +22,34 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# NamedComponent -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com 
+# NamedComponent -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com
 
-require 'htmlgrid/component'
+require "htmlgrid/component"
 
 module HtmlGrid
-	class NamedComponent < Component
-		attr_reader :name
-		def initialize(name, model, session, container=nil)
-			@name = name
-			super(model, session, container)
-			@attributes['name'] = @name.to_s
-		end
-		def init
-			super
-			@attributes.update(@lookandfeel.attributes(@name)) if @lookandfeel
-		end
-		def data_origin
-			if(@model.respond_to?(:data_origin))
-				@model.data_origin(@name)
-			end
-		end
-		def error?
-			if(@model.respond_to?(:error?))
-				@model.error?(@name)
-			end
-		end
-	end
+  class NamedComponent < Component
+    attr_reader :name
+    def initialize(name, model, session, container = nil)
+      @name = name
+      super(model, session, container)
+      @attributes["name"] = @name.to_s
+    end
+
+    def init
+      super
+      @attributes.update(@lookandfeel.attributes(@name)) if @lookandfeel
+    end
+
+    def data_origin
+      if @model.respond_to?(:data_origin)
+        @model.data_origin(@name)
+      end
+    end
+
+    def error?
+      if @model.respond_to?(:error?)
+        @model.error?(@name)
+      end
+    end
+  end
 end

data/lib/htmlgrid/pass.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,17 +22,17 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Pass -- htmlgrid -- 03.03.2003 -- hwyss@ywesee.com 
+# Pass -- htmlgrid -- 03.03.2003 -- hwyss@ywesee.com
 
-require 'htmlgrid/input'
+require "htmlgrid/input"
 
 module HtmlGrid
-	class Pass < Input
-		LABEL = true
-		def init
-			super
-			@attributes['type'] = 'password'
-			@attributes.delete('value')
-		end
-	end
+  class Pass < Input
+    LABEL = true
+    def init
+      super
+      @attributes["type"] = "password"
+      @attributes.delete("value")
+    end
+  end
 end