rbcurse-experimental 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+ 2013-04-23 - 16:41 
+   Fixed Array within Array error when sorting with a nil value in column in
+   tablewidget
+
  2013-04-12 - 13:06 
    Added tablewidget which will very soon move to core, as soon as I figure
    out how to go about this.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rbcurse/experimental/widgets/tablewidget.rb

@@ -5,7 +5,7 @@
 #       Author: rkumar http://github.com/rkumar/rbcurse/
 #         Date: 2013-03-29 - 20:07
 #      License: Same as Ruby's License (http://www.ruby-lang.org/LICENSE.txt)
-#  Last update: 2013-04-12 13:04
+#  Last update: 2013-04-23 16:33
 # ----------------------------------------------------------------------------- #
 #   tablewidget.rb  Copyright (C) 2012-2013 rahul kumar
 
@@ -120,9 +120,32 @@ module RubyCurses
             e = ee.abs-1 # since we had offsetted by 1 earlier
             abse = e.abs
             if ee < 0
+              xx = x[abse]
+              yy = y[abse]
+              # the following checks are since nil values cause an error to be raised
+              if xx.nil? && yy.nil?
+                res = 0
+              elsif xx.nil?
+                res = 1
+              elsif yy.nil?
+                res = -1
+              else
               res = y[abse] <=> x[abse]
+              end
             else
+              xx = x[e]
+              yy = y[e]
+              # the following checks are since nil values cause an error to be raised
+              # whereas we want a nil to be wither treated as a zero or a blank
+              if xx.nil? && yy.nil?
+                res = 0
+              elsif xx.nil?
+                res = -1
+              elsif yy.nil?
+                res = 1
+              else
               res = x[e] <=> y[e]
+              end
             end
             break if res != 0
           }
@@ -340,7 +363,7 @@ module RubyCurses
   class TableWidget < TextPad
 
     dsl_accessor :print_footer
-    attr_reader :columns
+    #attr_reader :columns
     attr_accessor :table_row_sorter
 
     def initialize form = nil, config={}, &block
@@ -521,6 +544,13 @@ module RubyCurses
     end
     alias :headings= :columns=
 
+    # returns array of column names as Strings
+    def columns
+      @content[0]
+    end
+
+    # size each column based on widths of this row of data.
+    # Only changed width if no width for that column
     def _init_model array
       array.each_with_index { |c,i| 
         # if columns added later we could be overwriting the width

data/rbcurse-experimental.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rbcurse-experimental"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rahul Kumar"]
-  s.date = "2013-04-12"
+  s.date = "2013-04-23"
   s.description = "Ruby curses/ncurses widgets, experimental and minimally tested. Copy into your project, do not depend on this gem."
   s.email = "sentinel1879@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbcurse-experimental
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbcurse-core