htmlgrid 1.1.6 → 1.2.1

data/lib/htmlgrid/datevalue.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -22,18 +22,18 @@
 #	ywesee - intellectual capital connected, Winterthurerstrasse 52, CH-8006 Zuerich, Switzerland
 #	htmlgrid@ywesee.com, www.ywesee.com/htmlgrid
 #
-# DateValue -- htmlgrid -- 10.03.2003 -- hwyss@ywesee.com 
+# DateValue -- htmlgrid -- 10.03.2003 -- hwyss@ywesee.com
 
-require 'htmlgrid/namedcomponent'
+require "htmlgrid/namedcomponent"
 
 module HtmlGrid
-	class DateValue < NamedComponent
-		LABEL = true
-		def to_html(context)
-			date = @model.send(@name)
-			if(date.respond_to?(:strftime))
-				date.strftime(@lookandfeel.lookup(:date_format)) 
-			end
-		end
-	end
+  class DateValue < NamedComponent
+    LABEL = true
+    def to_html(context)
+      date = @model.send(@name)
+      if date.respond_to?(:strftime)
+        date.strftime(@lookandfeel.lookup(:date_format))
+      end
+    end
+  end
 end

data/lib/htmlgrid/div.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 #
 #	HtmlGrid -- HyperTextMarkupLanguage Framework
 #	Copyright (C) 2003 ywesee - intellectual capital connected
@@ -24,14 +24,14 @@
 #
 # Div -- oddb -- 12.11.2004 -- jlang@ywesee.com, usenguel@ywesee.com
 
-require 'htmlgrid/component'
+require "htmlgrid/component"
 
 module HtmlGrid
-	class Div < Component
-		def to_html(context)
-			context.div(@attributes) {
-				super << dynamic_html(context)
-			}
-		end
-	end
+  class Div < Component
+    def to_html(context)
+      context.div(@attributes) {
+        super << dynamic_html(context)
+      }
+    end
+  end
 end

data/lib/htmlgrid/divcomposite.rb

@@ -1,52 +1,53 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 # DivComposite -- HtmlGrid -- 19.04.2005 -- hwyss@ywesee.com
 
-require 'htmlgrid/composite'
+require "htmlgrid/composite"
 
 module HtmlGrid
-	class DivComposite < TagComposite
-		def compose(model=@model)
-			ypos = -1
-			xpos = 0
-			div = nil
-			components.sort_by { |matrix, component|
-				[matrix.at(1), matrix.at(0), matrix[2..-1]]
-			}.each { |matrix, component|
-				if((mpos = matrix.at(1).to_i) > ypos)
-					xpos = 0
-					ypos = mpos
-					div = []
-					@grid.push(div)
-					css = {}
-					if(klass = css_map[ypos])
-						css.store('class', klass)
-					end
-					if(id = css_id_map[ypos])
-						css.store('id', id)
-					end
-					if(style = css_style_map[ypos])
-						css.store('style', style)
-					end
-					@css_grid.push(css.empty? ? nil : css)
-				end
-				div.push(label(create(component, model), component))
-			}
-		end
-		def to_html(context)
-			res = ''
-			@grid.each_with_index { |div, idx|
+  class DivComposite < TagComposite
+    def compose(model = @model)
+      ypos = -1
+      xpos = 0
+      div = nil
+      components.sort_by { |matrix, component|
+        [matrix.at(1), matrix.at(0), matrix[2..-1]]
+      }.each { |matrix, component|
+        if (mpos = matrix.at(1).to_i) > ypos
+          xpos = 0
+          ypos = mpos
+          div = []
+          @grid.push(div)
+          css = {}
+          if (klass = css_map[ypos])
+            css.store("class", klass)
+          end
+          if (id = css_id_map[ypos])
+            css.store("id", id)
+          end
+          if (style = css_style_map[ypos])
+            css.store("style", style)
+          end
+          @css_grid.push(css.empty? ? nil : css)
+        end
+        div.push(label(create(component, model), component))
+      }
+    end
+
+    def to_html(context)
+      res = ""
+      @grid&.each_with_index { |div, idx|
         res << context.div(tag_attributes(idx)) {
-          div.flatten.inject('') { |html, item|
-            html << if(item.respond_to?(:to_html))
-                      item.to_html(context).force_encoding('utf-8')
-                    else
-                      item.to_s
-                    end
+          div.flatten.inject("") { |html, item|
+            html << if item.respond_to?(:to_html)
+              item.to_html(context).force_encoding("utf-8")
+            else
+              item.to_s
+            end
           }
         }
-			}
-			res
-		end
-	end
+      }
+      res
+    end
+  end
 end

data/lib/htmlgrid/divform.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/htmlgrid
 #
-# Form -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com 
+# Form -- htmlgrid -- 23.10.2002 -- hwyss@ywesee.com
 
-require 'htmlgrid/form'
-require 'htmlgrid/divcomposite'
-require 'htmlgrid/submit'
+require "htmlgrid/form"
+require "htmlgrid/divcomposite"
+require "htmlgrid/submit"
 
 module HtmlGrid
-	class DivForm < DivComposite
-		include FormMethods
-	end
+  class DivForm < DivComposite
+    include FormMethods
+  end
 end

data/lib/htmlgrid/divlist.rb

@@ -1,26 +1,24 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 # HtmlGrid::DivList -- davaz.com -- 20.09.2005 -- mhuggler@ywesee.com
 
-require 'htmlgrid/divcomposite'
+require "htmlgrid/divcomposite"
 
 module HtmlGrid
-	class DivList < HtmlGrid::DivComposite
-		def compose
-			@model.each_with_index { |item, idx|
+  class DivList < HtmlGrid::DivComposite
+    def compose
+      @model&.each_with_index { |item, idx|
         @list_index = idx
-				super(item)
-			} 
-=begin
-			if(header = self.class.const_get(:HEADER))
-				@grid.push(create(header, @model, @session))
-				@css_grid.push(nil)
-			end
-			if(footer = self.class.const_get(:FOOTER))
-				@grid.push(create(footer, @model, @session))
-				@css_grid.push(nil)
-			end
-=end
-		end
-	end
+        super(item)
+      }
+      #       if(header = self.class.const_get(:HEADER))
+      #         @grid.push(create(header, @model, @session))
+      #         @css_grid.push(nil)
+      #       end
+      #       if(footer = self.class.const_get(:FOOTER))
+      #         @grid.push(create(footer, @model, @session))
+      #         @css_grid.push(nil)
+      #       end
+    end
+  end
 end

data/lib/htmlgrid/divtemplate.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 # DivTemplate -- htmlgrid -- 04.05.2005 -- hwyss@ywesee.com
 
-require 'htmlgrid/divcomposite'
-require 'htmlgrid/template'
+require "htmlgrid/divcomposite"
+require "htmlgrid/template"
 
 module HtmlGrid
-	class DivTemplate < DivComposite
-		include TemplateMethods
-	end
+  class DivTemplate < DivComposite
+    include TemplateMethods
+  end
 end

data/lib/htmlgrid/dojotoolkit.rb

@@ -1,128 +1,161 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 # HtmlGrid::DojoToolkit -- davaz.com -- 06.04.2012 -- yasaka@ywesee.com
 # HtmlGrid::DojoToolkit -- davaz.com -- 14.03.2006 -- mhuggler@ywesee.com
 
-require 'htmlgrid/component'
-require 'htmlgrid/div'
-require 'htmlgrid/template'
+require "htmlgrid/component"
+require "htmlgrid/div"
 
 module HtmlGrid
   class Component
     @@msie_ptrn = /MSIE\s*(\d)/
     attr_accessor :dojo_tooltip
-    def dojo_tag(widget, args={}, inner_html='')
+    # DOJO_VERSION >= 1.7.0 only (removed old version support)
+    def dojo_tag(widget, args = {}, inner_html = "")
       div = HtmlGrid::Div.new(@model, @session, self)
-      div.set_attribute('data-dojo-type', widget)
+      div.set_attribute("data-dojo-type", widget)
       args.each { |key, value|
         if value.is_a?(Array)
-          value = value.join(',')
+          value = value.join(",")
         end
         div.set_attribute(key, value)
       }
       div.value = inner_html
       div
     end
+
     def dojo_title=(value)
       tooltip = HtmlGrid::Div.new(@model, @session, self)
       tooltip.value = value
       self.dojo_tooltip = tooltip
     end
+
     def dojo_parse_on_load
       if @container.respond_to?(:dojo_parse_on_load)
         @container.dojo_parse_on_load
       end
     end
     unless method_defined?(:dojo_dynamic_html)
-      alias :dojo_dynamic_html :dynamic_html
+      alias_method :dojo_dynamic_html, :dynamic_html
       def dynamic_html(context)
-        html = ''
+        html = ""
         attrs = {
-          'data-dojo-type'  => 'dijit/TooltipDialog',
-          'data-dojo-props' => "connectId:#{css_id}",
-          'id'              => "#{css_id}_widget",
-          'style'           => 'display: none',
+          # NOTE:
+          #   DOJO >= 1.8 has support for type name separated by '/'
+          #   but, <= 1.7 must be separated with '.'
+          "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)) \
                && match[1].to_i < 7
           attrs.update({
-            'toggle'         => 'fade',
-            'toggleDuration' => '500',
+            "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")
+          if !/^http/.match?(@dojo_tooltip) # e.g. javascript
+            attrs.store("href", @dojo_tooltip.to_s)
           else
-            attrs.store('href', @dojo_tooltip)
+            attrs.store("href", @dojo_tooltip)
           end
           html << context.div(attrs)
         elsif @dojo_tooltip.respond_to?(:to_html)
           @dojo_tooltip.attributes.update(attrs)
-          html << @dojo_tooltip.to_html(context).force_encoding('utf-8')
+          html << @dojo_tooltip.to_html(context).force_encoding("utf-8")
         end
         unless html.empty? || dojo_parse_on_load
-          html << context.script('type' => 'text/javascript') { "dojoConfig.searchIds.push('#{css_id}')" }
+          html << context.script("type" => "text/javascript") {
+            "dojoConfig.searchIds.push('#{css_id}')"
+          }
         end
         # call original dynamic_html
         dojo_dynamic_html(context) << html
       end
     end
   end
-	module DojoToolkit
-		module DojoTemplate
-			DOJO_DEBUG = true
-			DOJO_BACK_BUTTON = false
+
+  module DojoToolkit
+    module DojoTemplate
+      DOJO_DEBUG = false
+      DOJO_BACK_BUTTON = false
       DOJO_ENCODING = nil
       DOJO_PARSE_ON_LOAD = true
-			DOJO_PREFIX = []
-			DOJO_REQUIRE = []
+      DOJO_PREFIX = []
+      DOJO_REQUIRE = []
       def dynamic_html_headers(context)
         headers = super
         encoding = self.class::DOJO_ENCODING
         encoding ||= Encoding.default_external
         dojo_path = @lookandfeel.resource_global(:dojo_js)
-        dojo_path ||= '/resources/dojo/dojo/dojo.js'
-        args = { 'type' => 'text/javascript'}
+        dojo_path ||= "/resources/dojo/dojo/dojo.js"
+        args = {"type" => "text/javascript"}
         packages = ""
-        unless(self.class::DOJO_PREFIX.empty?)
+        unless self.class::DOJO_PREFIX.empty?
           packages = self.class::DOJO_PREFIX.collect { |prefix, path|
             "{ name: '#{prefix}', location: '#{path}' }"
           }.join(",")
         end
-        puts "dynamic_html_headers with pkgs: #{packages}"
-        config =config = [
+        config = [
+          "parseOnLoad:          #{self.class::DOJO_PARSE_ON_LOAD}",
+          "isDebug:              #{self.class::DOJO_DEBUG}",
+          "preventBackButtonFix: #{!self.class::DOJO_BACK_BUTTON}",
+          "bindEncoding:         '#{encoding}'",
+          "searchIds:            []",
+          "urchin:               ''",
           "has: {
-             'dojo-debug-messages': true
+             'dojo-firebug':        #{self.class::DOJO_DEBUG},
+             'dojo-debug-messages': #{self.class::DOJO_DEBUG}
           }",
-        ].join(',')
-        headers << %(<script>
-       var dojoConfig = {
-            parseOnLoad: true,
-            isDebug: true,
-            async: true,
-            urchin: '',
-        };
-</script>)
+          "packages: [ #{packages} ]"
+        ].join(",")
+        args.store("data-dojo-config", config)
+        args.store("src", dojo_path)
         headers << context.script(args)
-        {  'text/css'         => File.join(File.dirname(dojo_path), "/resources/dojo.css"),
-           'text/javascript'  => dojo_path,
-        }.each do |type, path|
-          if (content = get_inline(path))
-            headers << context.style(:type =>type) { content }
+        args = {"type" => "text/javascript"}
+        headers << context.script(args) {
+          package_paths = self.class::DOJO_REQUIRE.map { |req|
+            "'#{req}'"
+          }.join(",")
+          package_names = self.class::DOJO_REQUIRE.map { |req|
+            req.split("/").last
+          }.join(",")
+          if @dojo_onloads
+            onloads = ""
+            @dojo_onloads.each { |onload|
+              onloads << "#{onload}\n"
+            }
+            script =
+              "require([#{package_paths}], function(#{package_names}) {" \
+                "ready(function() {" \
+                  "#{onloads}" \
+                "});" \
+              "});"
           else
-            headers << context.style(:type =>type, :src => path) { "@import \"#{path}\";" }
+            script = "require([#{package_paths}]);"
           end
-        end
+          script
+        }
+        dojo_dir = File.dirname(dojo_path)
+        headers << context.style(type: "text/css") {
+          <<-EOS
+          @import "#{File.join(dojo_dir, "/resources/dojo.css")}";
+          @import "#{File.join(dojo_dir, "../dijit/themes/tundra/tundra.css")}";
+          EOS
+        }
         headers
       end
+
       def dojo_parse_on_load
         self.class::DOJO_PARSE_ON_LOAD
       end
-			def onload=(script)
-				(@dojo_onloads ||= []).push(script)
-			end
-		end
-	end
+
+      def onload=(script)
+        (@dojo_onloads ||= []).push(script)
+      end
+    end
+  end
 end