htmlgrid 1.1.6 → 1.2.1

data/lib/htmlgrid/template.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,125 +22,137 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Template -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com 
+# Template -- htmlgrid -- 19.11.2002 -- hwyss@ywesee.com
 
-require 'htmlgrid/composite'
+require "htmlgrid/composite"
+require "uri"
 
 module HtmlGrid
-	module TemplateMethods
-		CONTENT = nil
-		FOOT = nil
-		HEAD = nil
-		META_TAGS = []
-		LEGACY_INTERFACE = true
-		CSS_FILES = []
-		JAVASCRIPTS = []
-    @@local_doc_dir = File.join(Dir.pwd, 'doc')
-    def get_inline(ressource)
+  module TemplateMethods
+    CONTENT = nil
+    FOOT = nil
+    HEAD = nil
+    META_TAGS = []
+    LEGACY_INTERFACE = true
+    CSS_FILES = []
+    JAVASCRIPTS = []
+    @@local_doc_dir = File.join(Dir.pwd, "doc")
+    def self.get_inline(ressource)
+      return nil unless ressource
       local_file = File.join(@@local_doc_dir, URI(ressource).path)
-      if File.exist?(local_file)
-        # puts "Reading #{ressource} #{local_file} #{File.size(local_file)}"
-        File.read(local_file)
-      else
-        nil
-      end
+      File.exist?(local_file) ? File.read(local_file) : nil
     end
-		def css_link(context, path=@lookandfeel.resource(:css))
-			properties = {
-				"rel"		=>	"stylesheet",
-				"type"	=>	"text/css",
-				"async"	=>	"true",
-				'href'	=>	path,
-			}
-      if (content = get_inline(path))
-        properties.delete('href')
+
+    def css_link(context, path = @lookandfeel.resource(:css))
+      properties = {
+        "rel"	=>	"stylesheet",
+        "type"	=>	"text/css",
+        "async"	=>	"true",
+        "href"	=>	path
+      }
+      if (content = TemplateMethods.get_inline(path))
+        properties.delete("href")
         context.style(properties) { content }
       else
         context.link(properties)
       end
-		end
-		def css_links(context, path=@lookandfeel.resource(:css))
-			links = self.class.const_get(:CSS_FILES).collect { |key| 
-				css_link(context, @lookandfeel.resource(key)) 
-			}
-			links.push(css_link(context, path)) if(path)
-			links.join
-		end
-		def content(model, session=nil)
-			__standard_component(model, self::class::CONTENT)
-		end
-		def dynamic_html_headers(context)
-			''
-		end
-		def foot(model, session=nil)
-			__standard_component(model, self::class::FOOT)
-		end
-		def head(model, session=nil)
-			__standard_component(model, self::class::HEAD)
-		end
-		def __standard_component(model, klass)
-			if(klass.is_a?(Class))
-				klass.new(model, @session, self)
-			end
-		end
-		def html_head(context, &block)
-			context.head {
-				if(block_given?)
-					block.call
-        end
+    end
+
+    def css_links(context, path = @lookandfeel.resource(:css))
+      links = self.class.const_get(:CSS_FILES).collect { |key|
+        css_link(context, @lookandfeel.resource(key))
+      }
+      links.push(css_link(context, path)) if path
+      links.join
+    end
+
+    def content(model, session = nil)
+      __standard_component(model, self.class::CONTENT)
+    end
+
+    def dynamic_html_headers(context)
+      ""
+    end
+
+    def foot(model, session = nil)
+      __standard_component(model, self.class::FOOT)
+    end
+
+    def head(model, session = nil)
+      __standard_component(model, self.class::HEAD)
+    end
+
+    def __standard_component(model, klass)
+      if klass.is_a?(Class)
+        klass.new(model, @session, self)
+      end
+    end
+
+    def html_head(context, &block)
+      context.head {
+        block&.call
         context.head << title(context) <<
-				meta_tags(context) <<
-				other_html_headers(context) <<
-				css_links(context) <<
-				javascripts(context)
-			}
-		end
-		def javascripts(context)
-			jscripts = self.class.const_get(:JAVASCRIPTS).collect { |key|
-				properties = {
-					"language"	=>	"JavaScript",
-					"type"			=>	"text/javascript",
-					"src"				=>	@lookandfeel.resource_global(:javascript, "#{key}.js"),
-				}		
-				context.script(properties)
-			}
-			jscripts.join
-		end
-		def meta_tags(context)
-			self::class::META_TAGS.inject('') { |inj, properties|
-				inj << context.meta(properties)
-			}
-		end
-		def onload=(script)
-			@attributes['onload'] = script
-		end
-		def other_html_headers(context)
-			dynamic_html_headers(context)
-		end
-		def template_html(context, &block)
-			args = {}
-			if(dtd = @lookandfeel.lookup(:DOCTYPE))
-				args.store('DOCTYPE', dtd)
-			end
-			context.html(args) {
-				html_head(context) << context.body(@attributes) {
-					template_tags(context, &block)
-				}
-			}
-		end
-		def template_tags(context, &block)
-			block.call
-		end
-		def title(context)
-			context.title { @lookandfeel.lookup(:html_title) }
-		end
-		def to_html(context)
-			template_html(context) {
-				super(context)
-			}
-		end
-	end
-	class Template < Composite
-		include TemplateMethods
-	end
+          meta_tags(context) <<
+          other_html_headers(context) <<
+          css_links(context) <<
+          javascripts(context)
+      }
+    end
+
+    def javascripts(context)
+      jscripts = self.class.const_get(:JAVASCRIPTS).collect { |key|
+        properties = {
+          "language"	=>	"JavaScript",
+          "type"	=>	"text/javascript",
+          "src"	=>	@lookandfeel.resource_global(:javascript, "#{key}.js")
+        }
+        context.script(properties)
+      }
+      jscripts.join
+    end
+
+    def meta_tags(context)
+      self.class::META_TAGS.inject("") { |inj, properties|
+        inj << context.meta(properties)
+      }
+    end
+
+    def onload=(script)
+      @attributes["onload"] = script
+    end
+
+    def other_html_headers(context)
+      dynamic_html_headers(context)
+    end
+
+    def template_html(context, &block)
+      args = {}
+      if (dtd = @lookandfeel.lookup(:DOCTYPE))
+        args.store("DOCTYPE", dtd)
+      end
+      context.html(args) {
+        html_head(context) << context.body(@attributes) {
+          template_tags(context, &block)
+        }
+      }
+    end
+
+    def template_tags(context, &block)
+      block.call
+    end
+
+    def title(context)
+      context.title { @lookandfeel.lookup(:html_title) }
+    end
+
+    def to_html(context)
+      template_html(context) {
+        super(context)
+      }
+    end
+  end
+
+  class Template < Composite
+    include TemplateMethods
+  end
 end

data/lib/htmlgrid/text.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,15 +22,15 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Text -- htmlgrid -- 20.11.2002 -- hwyss@ywesee.com 
+# Text -- htmlgrid -- 20.11.2002 -- hwyss@ywesee.com
 
-require 'htmlgrid/namedcomponent'
+require "htmlgrid/namedcomponent"
 
 module HtmlGrid
-	class Text < NamedComponent
-		def init
-			super
-			@value = @lookandfeel.lookup(@name)
-		end
-	end
+  class Text < NamedComponent
+    def init
+      super
+      @value = @lookandfeel.lookup(@name)
+    end
+  end
 end

data/lib/htmlgrid/textarea.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -24,26 +24,28 @@
 #
 # Textarea -- htmlgrid  -- 12.12.2002 -- benfay@ywesee.com
 
-require 'htmlgrid/input'
+require "htmlgrid/input"
 
 module HtmlGrid
-	class Textarea < Input
-		attr_writer :value
+  class Textarea < Input
+    attr_writer :value
     attr_accessor :unescaped
-		def to_html(context)
-			context.textarea(@attributes) {
-				_to_html(context, @value)
-			}
-		end
+    def to_html(context)
+      context.textarea(@attributes) {
+        _to_html(context, @value)
+      }
+    end
+
     def escape_value(elm)
       @unescaped ? elm.to_s : escape(elm.to_s)
     end
-		def _to_html(context, value=@value)
-			if(value.is_a?(Array))
-				value.collect { |elm| escape_value elm }.join("\n")
-			else
-				escape_value value
-			end.strip
-		end
-	end
+
+    def _to_html(context, value = @value)
+      if value.is_a?(Array)
+        value.collect { |elm| escape_value elm }.join("\n")
+      else
+        escape_value value
+      end.strip
+    end
+  end
 end

data/lib/htmlgrid/ulcomposite.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,28 +22,28 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# Template -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com 
+# Template -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com
 
-require 'htmlgrid/composite'
+require "htmlgrid/composite"
 
 module HtmlGrid
-	class UlComposite < TagComposite
-		def to_html(context)
-			res = ''
-			res << context.ul(tag_attributes) {
-				inner_res = ''
-				@grid.each_with_index { |li, idx| 
-					inner_res << context.li(tag_attributes(idx)) {
-						if(li.respond_to?(:to_html))
-							li.to_html(context).force_encoding('utf-8')
-						else
-							li	
-						end
-					}	
-				}
-				inner_res
-			}
-			res
-		end
-	end
+  class UlComposite < TagComposite
+    def to_html(context)
+      res = ""
+      res << context.ul(tag_attributes) {
+        inner_res = ""
+        @grid.each_with_index { |li, idx|
+          inner_res << context.li(tag_attributes(idx)) {
+            if li.respond_to?(:to_html)
+              li.to_html(context).force_encoding("utf-8")
+            else
+              li
+            end
+          }
+        }
+        inner_res
+      }
+      res
+    end
+  end
 end

data/lib/htmlgrid/ullist.rb

@@ -1,15 +1,15 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 # HtmlGrid::UlList -- davaz.com -- 25.04.2006 -- mhuggler@ywesee.com
 
-require 'htmlgrid/ulcomposite'
+require "htmlgrid/ulcomposite"
 
 module HtmlGrid
-	class UlList < HtmlGrid::UlComposite
-		def compose(model=@model)
-			@model.each { |item|
-				super(item)
-			}
-		end
-	end
+  class UlList < HtmlGrid::UlComposite
+    def compose(model = @model)
+      @model.each { |item|
+        super(item)
+      }
+    end
+  end
 end

data/lib/htmlgrid/urllink.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -24,42 +24,44 @@
 #
 # UrlLink -- htmlgrid -- 10.06.2003 -- aschrafl@ywesee.com
 
-require 'htmlgrid/link'
+require "htmlgrid/link"
+
+module HtmlGrid
+  class UrlLink < Link
+    def init
+      super
+      if @model.respond_to?(@name)
+        @value = @model.send(@name).to_s
+      end
+      compose_link
+    end
+  end
 
-module HtmlGrid 
-	class UrlLink < Link
-		def init
-			super
-			if(@model.respond_to?(@name))
-				@value = @model.send(@name).to_s 
-			end
-			compose_link
-		end
-	end
-	class HttpLink < UrlLink
+  class HttpLink < UrlLink
     @@http_ptrn = /^http:/
-		LABEL = true
-		def compose_link
-			unless @value.nil?
-				if @@http_ptrn.match(@value)
-					self.href = @value  
-				else
-					self.href = "http://" + @value
-				end
-				set_attribute('target', '_blank')
-			end
-		end
-	end
-	class MailLink < UrlLink
-		LABEL = true
+    LABEL = true
+    def compose_link
+      unless @value.nil?
+        self.href = if @@http_ptrn.match(@value)
+          @value
+        else
+          "http://" + @value
+        end
+        set_attribute("target", "_blank")
+      end
+    end
+  end
+
+  class MailLink < UrlLink
+    LABEL = true
     @@mailto_ptrn = /^mailto:/
-		def compose_link
-			unless @value.empty?
-				self.href = @value  
-				unless @@mailto_ptrn.match(@value)
-					self.href = "mailto:"+@value
-				end
-			end
-		end
-	end
+    def compose_link
+      unless @value.empty?
+        self.href = @value
+        unless @@mailto_ptrn.match(@value)
+          self.href = "mailto:" + @value
+        end
+      end
+    end
+  end
 end