htmlgrid 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5d30addff4506799b90228f01a9c910f6231967
-  data.tar.gz: d96e8a7d27da7aab4acaf1458a334bbf89c76af2
+  metadata.gz: 2847726b7e6ac148bca47055c992b5d330ca670e
+  data.tar.gz: 5c53eb62fb668b52bc7baab302b6a50127838e6a
 SHA512:
-  metadata.gz: 7be2249769ff2f267ff89af97188e897c89e87d79403e71cb24658f315cf09d25211f756db822aec048da2ecf6fdc166c74a82b1c734b570b0cae68bec642754
-  data.tar.gz: b6995921b53ae767df96a8fabdd97e3d7de0396e1a5a3626e88e7ed7d5259c9c84cd97de5e1f54ec26c00b3e7898499fa17f242cf31fb60fef9d9f7e98f86a8a
+  metadata.gz: 48861a4c77a5f83517637e23b88200145c0dfe26097d342e06c1d7fe559699a70f3310462647a370e6ee9a6941ee6d42d71557bad0a8a9b15f1c7a9f81007e39
+  data.tar.gz: f3a7b84c902d5e5615e50e2a602e7c58d789148614205fc0a28e1342b5477dfc468de1a8442909a3afa67cf4c7599427f1b9ba25866436696d5179c8b86b78d1

data/History.txt

@@ -1,3 +1,11 @@
+=== 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

data/Manifest.txt

@@ -2,11 +2,10 @@
 .travis.yml
 COPYING
 Gemfile
-Gemfile.lock
 History.txt
 LICENCE.txt
 Manifest.txt
-README.textile
+README.md
 Rakefile
 ext/htmlgrid/MANIFEST
 ext/htmlgrid/extconf.rb
@@ -65,7 +64,6 @@ lib/htmlgrid/ulcomposite.rb
 lib/htmlgrid/ullist.rb
 lib/htmlgrid/urllink.rb
 lib/htmlgrid/value.rb
-test/rebuild.rb
 test/stub/cgi.rb
 test/test_component.rb
 test/test_composite.rb
@@ -79,5 +77,6 @@ test/test_list.rb
 test/test_select.rb
 test/test_template.rb
 test/test_text.rb
+test/test_helper.rb
 usage-en.txt
 widget/Tooltip.js

data/lib/htmlgrid/component.rb

@@ -213,7 +213,7 @@ module HtmlGrid
 		def tabindex=(tab)
 			@attributes.store('tabIndex', tab.to_s)
 		end
-		def to_html(context)
+    def to_html(context)
       _to_html(context, @value).to_s.force_encoding('utf-8')
     end
     @@nl2br_ptrn = /(\r\n)|(\n)|(\r)/

data/lib/htmlgrid/composite.rb

@@ -106,7 +106,7 @@ module HtmlGrid
 			methname = klass.to_s.downcase.gsub('::', '_') << '_' << key.to_s
 			define_method(methname) { |*args|
 				model, session = args
-				args = [model.send(key), @session, self]
+				args = [model.send(key), session, self]
 				if(name)
 					args.unshift(name)
 					lookandfeel_map.store(methname.to_sym, name.to_sym)

data/lib/htmlgrid/errormessage.rb

@@ -61,7 +61,7 @@ module HtmlGrid
 		end
 		def __messages(ary, css_class, ypos=0)
 			ary.sort_by { |item|
-				(components.index(item.key) || [-1,-1]).reverse
+				(components.key(item.key) || [-1,-1]).reverse
 			}.reverse.each { |item|
 				__message(item, css_class, ypos)
 			}

data/lib/htmlgrid/grid.rb

@@ -24,285 +24,268 @@
 #
 # HtmlGrid::Grid -- htmlgrid -- 23.02.2012 -- mhatakeyama@ywesee.com
 # HtmlGrid::Grid -- htmlgrid -- 12.01.2010 -- hwyss@ywesee.com
-require 'htmlgrid/version'
-begin
-  VERSION = '1.0.8'
-  begin
-    # for gem install
-    ext_dir = File.expand_path('../../ext/htmlgrid', File.dirname(__FILE__))
-    ext_lib = File.join(ext_dir, 'htmlgrid.so')
-    require ext_lib
-  rescue LoadError
-    # for setup.rb install
-    require 'htmlgrid.so'
-  end
-rescue LoadError
-	puts "could not find htmlgrid.so, falling back to pure-ruby class"
-	module HtmlGrid
-		class Grid 
-			attr_accessor :width, :height
-			private
-			class Row
-				class Field
-					attr_reader :components
-					attr_accessor :tag
-					ALLOWED_ATTRIBUTES = [
-						'align',
-						'class',
-						'colspan',
-						'style',
-						'tag',
-						'title',
-					]
-					def initialize
-						@components = []
-						@attributes = {}
-					end
-					def add(item)
-						if(item.is_a? Array)
-							@components += item
-						else
-							@components.push item
-						end
-					end
-					def add_background
-						compose
-						@components.each { |component| 
-							component.add_background
-						}
-						if(@attributes["class"])
-							@attributes["class"] += "-bg" unless @attributes["class"] =~ /-bg/
-						else
-							@attributes["class"] = "bg"
-						end
-					end
-					def add_attribute(key, value)
-						@attributes.store(key.to_s, value.to_s)
-					end
-					def add_component_style(style)
-						@components.each { |cmp| 
-							cmp.set_attribute("class", style) if cmp.respond_to?(:set_attribute)
-						}
-					end
-					def add_style(style)
-						@attributes["class"] = style
-					end
-					def attribute(key)
-						@attributes[key]
-					end
-					def colspan
-						@attributes.fetch("colspan", 1).to_i
-					end
-					def colspan=(span)
-						@attributes["colspan"] = span.to_s if span.to_i > 1
-					end
-					def component_html(cgi)
-						html = ''
-						@components.each { |component|
-							if component.respond_to? :to_html
-								html << component.to_html(cgi).to_s.force_encoding('utf-8')
-							else
-								html << component.to_s
-							end
-						}
-						html = "&nbsp;" if html.empty?
-						html
-					end
-					def tag=(tag)
-						@tag = tag.to_s.downcase
-					end
-					def to_html(context)
-						if(@tag && context.respond_to?(@tag))
-							context.send(@tag, @attributes) { 
-								component_html(context) }
-						else
-							context.td(@attributes) {
-								component_html(context) }
-						end
-					end
-				end
-				def initialize # Row
-					@width = 1
-					@fields = [Field.new]
-					@attributes = {}
-				end
-				def initialize_row w
-					if(w > @width)
-						@width.upto(w-1) { |ii| @fields[ii] ||= Field.new }
-						@width = w
-					end
-				end
-				def add(item, x)
-					(@fields[x] ||= Field.new).add item
-				end
-				def each_field(x, w=1)
-					x.upto([x+w, @width].min - 1) { |xx|
-						yield(@fields[xx])
-					}
-				end
-				def to_html cgi
-					cgi.tr(@attributes) {
-						field_html(cgi)
-					}
-				end
-				def field_attribute(key, x=0)
-					@fields[x].attribute(key)
-				end
-				def field_html(cgi)
-					html = ""
-					span = 1
-					@fields.each { |field|
-						if(span < 2)
-							html << field.to_html(cgi)
-							span = field.colspan
-						else
-              span -= 1
-						end
-					}
-					html
-				end
-				def set_attributes(attr)
-					@attributes = attr
-				end
-				def [](x)
-					begin
-						@fields[x]
-					rescue StandardError
-						nil
-					end
-				end
-			end
-			public
-			def initialize(attributes={}) # Grid
-				@height = 1
-				@width = 1
-				@rows = [Row.new]
-				@attributes = {
-					"cellspacing" =>  "0",
-				}.update(attributes)
-			end
-			def initialize_grid(w, h)
-				if(w > @width || h > @height)
-					floor = (w > @width) ? 0 : @height
-					@width = [w, @width].max
-					@height = [h, @height].max
-					floor.upto(@height - 1) { |ii|
-						(@rows[ii] ||= Row.new).initialize_row(@width)
-					}
-				end
-			end
-			def add(arg, x, y, col=false)
-				if arg.kind_of? Enumerable
-          if arg.kind_of? String
-            add_field(arg, x, y)
-          elsif arg.kind_of? Array
-            arg.each do |item|
-              add_field(item, x ? x : '', y)
-            end
+module HtmlGrid
+  class Grid
+    attr_accessor :width, :height
+    private
+    class Row
+      class Field
+        attr_reader :components, :tag
+        ALLOWED_ATTRIBUTES = [
+          'align',
+          'class',
+          'colspan',
+          'style',
+          'tag',
+          'title',
+        ]
+        def initialize
+          @components = []
+          @attributes = {}
+          @tag = nil
+        end
+        def add(item)
+          if(item.is_a? Array)
+            @components += item
           else
-            if(col)
-              add_column(arg, x, y)
+            @components.push item
+          end
+        end
+        def add_background
+          compose
+          @components.each { |component| 
+            component.add_background
+          }
+          if(@attributes["class"])
+            @attributes["class"] += "-bg" unless @attributes["class"] =~ /-bg/
+          else
+            @attributes["class"] = "bg"
+          end
+        end
+        def add_attribute(key, value)
+          @attributes.store(key.to_s, value.to_s)
+        end
+        def add_component_style(style)
+          @components.each { |cmp| 
+            cmp.set_attribute("class", style) if cmp.respond_to?(:set_attribute)
+          }
+        end
+        def add_style(style)
+          @attributes["class"] = style
+        end
+        def attribute(key)
+          @attributes[key]
+        end
+        def colspan
+          @attributes.fetch("colspan", 1).to_i
+        end
+        def colspan=(span)
+          @attributes["colspan"] = span.to_s if span.to_i > 1
+        end
+        def component_html(cgi)
+          html = ''
+          @components.each { |component|
+            if component.respond_to? :to_html
+              html << component.to_html(cgi).to_s.force_encoding('utf-8')
             else
-              add_row(arg, x, y)
+              html << component.to_s
             end
+          }
+          html = "&nbsp;" if html.empty?
+          html
+        end
+        def tag=(tag)
+          @tag = tag.to_s.downcase
+        end
+        def to_html(context)
+          if(@tag && context.respond_to?(@tag))
+            context.send(@tag, @attributes) { 
+              component_html(context) }
+          else
+            context.td(@attributes) {
+              component_html(context) }
           end
-        else
+        end
+      end
+      def initialize # Row
+        @width = 1
+        @fields = [Field.new]
+        @attributes = {}
+      end
+      def initialize_row w
+        if(w > @width)
+          @width.upto(w-1) { |ii| @fields[ii] ||= Field.new }
+          @width = w
+        end
+      end
+      def add(item, x)
+        (@fields[x] ||= Field.new).add item
+      end
+      def each_field(x, w=1)
+        x.upto([x+w, @width].min - 1) { |xx|
+          yield(@fields[xx])
+        }
+      end
+      def to_html cgi
+        cgi.tr(@attributes) {
+          field_html(cgi)
+        }
+      end
+      def field_attribute(key, x=0)
+        @fields[x].attribute(key)
+      end
+      def field_html(cgi)
+        html = ""
+        span = 1
+        @fields.each { |field|
+          if(span < 2)
+            html << field.to_html(cgi)
+            span = field.colspan
+          else
+            span -= 1
+          end
+        }
+        html
+      end
+      def set_attributes(attr)
+        @attributes = attr
+      end
+      def [](x)
+        begin
+          @fields[x]
+        rescue StandardError
+          nil
+        end
+      end
+    end
+    public
+    def initialize(attributes={}) # Grid
+      @height = 1
+      @width = 1
+      @rows = [Row.new]
+      @attributes = {
+        "cellspacing" =>  "0",
+      }.update(attributes)
+    end
+    def initialize_grid(w, h)
+      if(w > @width || h > @height)
+        floor = (w > @width) ? 0 : @height
+        @width = [w, @width].max
+        @height = [h, @height].max
+        floor.upto(@height - 1) { |ii|
+          (@rows[ii] ||= Row.new).initialize_row(@width)
+        }
+      end
+    end
+    def add(arg, x, y, col=false)
+      if arg.kind_of?(Enumerable)
+        if arg.kind_of?(String)
           add_field(arg, x, y)
+        elsif arg.kind_of?(Array)
+          arg.each do |item|
+            add_field(item, x ? x : '', y)
+          end
+        elsif col
+          add_column(arg, x, y)
+        else
+          add_row(arg, x, y)
         end
-			end
-			def add_attribute(key, value, x, y, w=1, h=1)
-				each_field(x, y, w, h) { |field|
-					field.add_attribute(key, value)
-				}
-			end
-			def add_background(x, y, w=1, h=1)
-				each_field(x, y, w, h) { |field|
-					field.add_background(x, w)
-				}
-			end
-			def add_column(arg, x, y)
-				offset = 0
-				arg.each do |item|
-					add_field(item, x, y + offset)
-					offset = offset.next
-				end
-			end
-			def add_component_style(style, x, y, w=1, h=1)
-				each_field(x, y, w, h) { |field|
-					field.add_component_style(style)
-				}
-			end
-			def add_field(arg, x, y)
-				initialize_grid(x+1, y+1)
-				(@rows[y] ||= Row.new).add(arg, x)
-			end
-			def add_row(arg, x, y)
-				offset = 0
-				arg.each do |item|
-					add_field(item, x + offset, y)
-					offset = offset.next
-				end
-			end
-			def add_style(style, x, y, w=1, h=1)
-				each_field(x, y, w, h) { |field|
-					field.add_style(style)
-				}
-			end
-			def add_tag(tag, x, y, w=1, h=1)
-				initialize_grid(x+w, y+h)
-				each_field(x, y, w, h) { |field| 
-					field.tag = tag
-				}
-			end
-			def each_field(x, y, w=1, h=1)
-				y.upto([y+h, @height].min - 1) { |yy|
-					@rows[yy].each_field(x,w) { |field|
-						yield(field)
-					}
-				}
-			end
-			def field_attribute(key, x=0, y=0)
-				@rows[y].field_attribute(key, x)
-			end
-			def insert_row(y=0, arg=nil)
-				@rows[y, 0] = Row.new	
-				@height += 1
-				add(arg, 0, y)
-			end
-			def push(arg, x=0, y=height)
-				add(arg, x, y)
-				set_colspan(x,y)
-			end
-			def set_attribute(key, value)
-				@attributes[key] = value
-			end
-			def set_attributes(hash)
-				@attributes.update(hash)
-			end
-			def set_colspan(x=0, y=0, span=(@width - x))
-				span = span.to_i
-				initialize_grid(x+span, y+1)
-				self[x,y].colspan = span
-			end
-			def set_row_attributes(attr={}, y=0, offset=0)
-        # TODO
-        # At the moment, offset value is not used
-        # But probably offset value is used in grid.c
-        initialize_grid(offset, y + 1)
-				@rows[y].set_attributes(attr)
-			end
-			def to_html(cgi)
-				cgi.table(@attributes) {
-					@rows.collect { |row| row.to_html(cgi).force_encoding('utf-8') }.join
-				}
-			end
-			def [](x, y)
-				begin
-					@rows[y][x]
-				rescue StandardError
-					nil
-				end
-			end
-		end
-	end
+      else
+        add_field(arg, x, y)
+      end
+    end
+    def add_attribute(key, value, x, y, w=1, h=1)
+      each_field(x, y, w, h) { |field|
+        field.add_attribute(key, value)
+      }
+    end
+    def add_background(x, y, w=1, h=1)
+      each_field(x, y, w, h) { |field|
+        field.add_background(x, w)
+      }
+    end
+    def add_column(arg, x, y)
+      offset = 0
+      arg.each do |item|
+        add_field(item, x, y + offset)
+        offset = offset.next
+      end
+    end
+    def add_component_style(style, x, y, w=1, h=1)
+      each_field(x, y, w, h) { |field|
+        field.add_component_style(style)
+      }
+    end
+    def add_field(arg, x, y)
+      initialize_grid(x+1, y+1)
+      (@rows[y] ||= Row.new).add(arg, x)
+    end
+    def add_row(arg, x, y)
+      offset = 0
+      arg.each do |item|
+        add_field(item, x + offset, y)
+        offset = offset.next
+      end
+    end
+    def add_style(style, x, y, w=1, h=1)
+      each_field(x, y, w, h) { |field|
+        field.add_style(style)
+      }
+    end
+    def add_tag(tag, x, y, w=1, h=1)
+      initialize_grid(x+w, y+h)
+      each_field(x, y, w, h) { |field| 
+        field.tag = tag
+      }
+    end
+    def each_field(x, y, w=1, h=1)
+      y.upto([y+h, @height].min - 1) { |yy|
+        @rows[yy].each_field(x,w) { |field|
+          yield(field)
+        }
+      }
+    end
+    def field_attribute(key, x=0, y=0)
+      @rows[y].field_attribute(key, x)
+    end
+    def insert_row(y=0, arg=nil)
+      @rows[y, 0] = Row.new	
+      @height += 1
+      add(arg, 0, y)
+    end
+    def push(arg, x=0, y=height)
+      add(arg, x, y)
+      set_colspan(x,y)
+    end
+    def set_attribute(key, value)
+      @attributes[key] = value
+    end
+    def set_attributes(hash)
+      @attributes.update(hash)
+    end
+    def set_colspan(x=0, y=0, span=(@width - x))
+      span = span.to_i
+      initialize_grid(x+span, y+1)
+      self[x,y].colspan = span
+    end
+    def set_row_attributes(attr={}, y=0, offset=0)
+      # TODO
+      # At the moment, offset value is not used
+      # But probably offset value is used in grid.c
+      initialize_grid(offset, y + 1)
+      @rows[y].set_attributes(attr)
+    end
+    def to_html(cgi)
+      cgi.table(@attributes) {
+        @rows.collect { |row| row.to_html(cgi).force_encoding('utf-8') }.join
+      }
+    end
+    def [](x, y)
+      begin
+        @rows[y][x]
+      rescue StandardError
+        nil
+      end
+    end
+  end
 end