workbook 0.4.2 → 0.4.3

data/lib/workbook/sheet.rb

@@ -4,7 +4,7 @@ module Workbook
     # A Sheet is a container of tables
     attr_accessor :book
     attr_accessor :name
-    
+
     # Initialize a new sheet
     #
     # @param [Workbook::Table, Array<Array>] table   The first table of this sheet
@@ -20,14 +20,14 @@ module Workbook
       self.book = book
       return self
     end
-    
+
     # Returns true if the first table of this sheet contains anything
     #
     # @return [Boolean]
     def has_contents?
       table.has_contents?
     end
-        
+
     # Returns the first table of this sheet
     #
     # @return [Workbook::Table] the first table of this sheet
@@ -46,14 +46,14 @@ module Workbook
         return @book
       end
     end
-    
+
     # Removes all lines from this table
     #
     # @return [Workbook::Table] (self)
     def delete_all
       self.delete_if{|b| true}
     end
-    
+
     # clones itself *and* the tables it contains
     #
     # @return [Workbook::Sheet] The cloned sheet
@@ -64,15 +64,15 @@ module Workbook
       s.each{|t| c << t.clone}
       return c
     end
-    
+
     # Create or open the existing table at an index value
-    # 
+    #
     # @param [Integer] index    the index of the table
     def create_or_open_table_at index
       t = self[index]
       t = self[index] = Workbook::Table.new if t == nil
       t.sheet = self
-      t 
+      t
     end
   end
 end

data/lib/workbook/table.rb

@@ -3,7 +3,7 @@ require 'workbook/modules/table_diff_sort'
 require 'workbook/writers/csv_table_writer'
 
 
-module Workbook  
+module Workbook
   # A table is a container of rows and keeps track of the sheet it belongs to and which row is its header. Additionally suport for CSV writing and diffing with another table is included.
   class Table < Array
     include Workbook::Modules::TableDiffSort
@@ -11,7 +11,7 @@ module Workbook
     attr_accessor :sheet
     attr_accessor :name
     attr_accessor :header
-    
+
     def initialize row_cel_values=[], sheet=nil, options={}
       row_cel_values = [] if row_cel_values == nil
       row_cel_values.each do |r|
@@ -24,8 +24,8 @@ module Workbook
       self.sheet = sheet
       # Column data is considered as a 'row' with 'cells' that contain 'formatting'
     end
-    
-    # Returns the header of this table (typically the first row, but can be a different row). 
+
+    # Returns the header of this table (typically the first row, but can be a different row).
     # The header row is also used for finding values in a aribrary row.
     #
     # @return [Workbook::Row] The header
@@ -38,33 +38,39 @@ module Workbook
         first
       end
     end
-    
+
     # Generates a new row, with optionally predefined cell-values, that is already connected to this table.
     def new_row cell_values=[]
       r = Workbook::Row.new(cell_values,self)
       return r
     end
-    
+
     def create_or_open_row_at index
       r = self[index]
       if r == nil
         r = Workbook::Row.new
         r.table=(self)
       end
-      r 
-    end  
-    
+      r
+    end
+
     def remove_empty_lines!
       self.delete_if{|r| r.nil? or r.compact.empty?}
       self
     end
     
+    # Add row
+    # @param [Workbook::Table, Array] row to add
     def push(row)
+      row = Workbook::Row.new(row) if row.class == Array
       super(row)
       row.set_table(self)
     end
-    
+
+    # Add row
+    # @param [Workbook::Table, Array] row to add
     def <<(row)
+      row = Workbook::Row.new(row) if row.class == Array
       super(row)
       row.set_table(self)
     end
@@ -72,16 +78,16 @@ module Workbook
     def has_contents?
       self.clone.remove_empty_lines!.count != 0
     end
-    
+
     # Returns true if the row exists in this table
     #
     # @param [Workbook::Row] row to test for
-    # @return [Boolean] whether the row exist in this table 
+    # @return [Boolean] whether the row exist in this table
     def contains_row? row
       raise ArgumentError, "table should be a Workbook::Row (you passed a #{t.class})" unless row.is_a?(Workbook::Row)
       self.collect{|r| r.object_id}.include? row.object_id
     end
-    
+
     # Returns the sheet this table belongs to, creates a new sheet if none exists
     #
     # @return [Workbook::Sheet] The sheet this table belongs to
@@ -93,14 +99,14 @@ module Workbook
         return @sheet
       end
     end
-    
+
     # Removes all lines from this table
     #
     # @return [Workbook::Table] (self)
     def delete_all
       self.delete_if{|b| true}
     end
-    
+
     # clones itself *and* the rows it contains
     #
     # @return [Workbook::Table] The cloned table
@@ -113,7 +119,7 @@ module Workbook
       c.header = c[header_row_index] if header_row_index
       return c
     end
-    
+
     # Overrides normal Array's []-function with support for symbols that identify a column based on the header-values
     #
     # @example Lookup using fixnum or header value encoded as symbol
@@ -128,24 +134,51 @@ module Workbook
         cell_index = alpha_index_to_number_index(match[1])
         row_index = match[2].to_i - 1
         return self[row_index][cell_index]
-      else 
+      else
         if index_or_string
           return to_a[index_or_string]
         end
       end
     end
-    
+
     # Helps to convert from e.g. "AA" to 26
     # @param [String] string that typically identifies a column
     # @return [Integer]
     def alpha_index_to_number_index string
       string.upcase!
       sum = 0
-      string.chars.each_with_index do | char, char_index| 
+      string.chars.each_with_index do | char, char_index|
         sum = sum * 26 + char.unpack('U')[0]-64
       end
       return sum-1
     end
     
+    # remove all the trailing empty-rows (returning a trimmed clone)
+    #
+    # @param [Integer] desired_row_length of the rows
+    # @return [Workbook::Row] a trimmed clone of the array
+    def trim(desired_row_length=nil)
+      self.clone.trim!(desired_row_length)
+    end
+    
+    # remove all the trailing empty-rows (returning a trimmed self)
+    #
+    # @param [Integer] desired_row_length of the new row
+    # @return [Workbook::Row] self
+    def trim!(desired_row_length=nil)
+      max_length = self.collect{|a| a.trim.length }.max
+      self_count = self.count-1
+      self.count.times do |index| 
+        index = self_count - index
+        if self[index].trim.empty?
+          self.delete_at(index)
+        else
+          break
+        end
+      end
+      self.each{|a| a.trim!(max_length)}
+      self
+    end
+
   end
 end

data/lib/workbook/template.rb

@@ -5,18 +5,18 @@ module Workbook
   # Workbook::Template is a container for different Workbook::Format's and the storage of raw template data that isn't really supported by Workbook, but should survive a typical read/write cyclus.
   class Template
     include Workbook::Modules::RawObjectsStorage
-    
+
     # Initialize Workbook::Template
-    def initialize 
+    def initialize
       @formats = {}
       @has_header = true
     end
-    
+
     # Whether the template has a predefined header (headers are used )
     def has_header?
       @has_header
     end
-      
+
     # Add a Workbook::Format to the template
     # @param [Workbook::Format] format (of a cell) to add to the template
     def add_format format
@@ -24,15 +24,15 @@ module Workbook
         @formats[format.name]=format
       else
         raise ArgumentError, "format should be a Workboot::Format"
-      end      
+      end
     end
-    
+
     # Return the list of associated formats
     # @return [Hash] A keyed-hash of named formats
     def formats
       @formats
     end
-    
+
     # Create or find a format by name
     # @return [Workbook::Format] The new or found format
     # @param [String] name of the format (e.g. whatever you want, in diff names such as 'destroyed', 'updated' and 'created' are being used)
@@ -41,8 +41,8 @@ module Workbook
       fs = @formats[name]
       fs = @formats[name] = {} if fs.nil?
       f = fs[variant]
-      if f.nil? 
-        f = Workbook::Format.new 
+      if f.nil?
+        f = Workbook::Format.new
         if variant != :default and fs[:default]
           f = fs[:default].clone
         end
@@ -50,5 +50,5 @@ module Workbook
       end
       return @formats[name][variant]
     end
-	end
+  end
 end

data/lib/workbook/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Workbook
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/lib/workbook/writers/csv_table_writer.rb

@@ -18,7 +18,7 @@ module Workbook
         end
         csv
       end
-      
+
     end
   end
 end

data/lib/workbook/writers/html_writer.rb

@@ -6,15 +6,15 @@ module Workbook
     module HtmlWriter
 
       # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
-      # 
+      #
       # @param [Hash] options A hash with options
       # @return [Spreadsheet] A Spreadsheet object, ready for writing or more lower level operations
       def to_html options={}
         options = {:style_with_inline_css=>false}.merge(options)
-        builder = Nokogiri::HTML::Builder.new do |doc|
+        builder = Nokogiri::XML::Builder.new do |doc|
           doc.html {
             doc.body {
-              self.each{|sheet| 
+              self.each{|sheet|
                 doc.h1 {
                   doc.text sheet.name
                 }
@@ -45,7 +45,7 @@ module Workbook
             }
           }
         end
-        return builder.to_html
+        return builder.doc.to_xhtml
       end
 
 
@@ -53,11 +53,11 @@ module Workbook
       # Write the current workbook to Microsoft Excel format (using the spreadsheet gem)
       #
       # @param [String] filename
-      # @param [Hash] options   see #to_xls 
+      # @param [Hash] options   see #to_xls
       def write_to_html filename="#{title}.html", options={}
         File.open(filename, 'w') {|f| f.write(to_html(options)) }
         return filename
       end
     end
   end
-end
+end

data/lib/workbook/writers/xls_writer.rb

@@ -6,7 +6,7 @@ module Workbook
     module XlsWriter
 
       # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
-      # 
+      #
       # @param [Hash] options A hash with options (unused so far)
       # @return [Spreadsheet] A Spreadsheet object, ready for writing or more lower level operations
       def to_xls options={}
@@ -30,9 +30,9 @@ module Workbook
         end
         book
       end
-      
+
       # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
-      # 
+      #
       # @param [Workbook::Format, Hash] f A Workbook::Format or hash with format-options (:font_weight, :rotation, :background_color, :number_format, :text_direction, :color, :font_family)
       # @return [Spreadsheet::Format] A Spreadsheet format-object, ready for writing or more lower level operations
       def format_to_xls_format f
@@ -43,7 +43,7 @@ module Workbook
         xlsfmt = f.return_raw_for Spreadsheet::Format
         unless xlsfmt
           xlsfmt=Spreadsheet::Format.new :weight=>f[:font_weight]
-          xlsfmt.rotation = f[:rotation] if f[:rotation] 
+          xlsfmt.rotation = f[:rotation] if f[:rotation]
           xlsfmt.pattern_fg_color = html_color_to_xls_color(f[:background_color]) if html_color_to_xls_color(f[:background_color])
           xlsfmt.pattern = 1 if html_color_to_xls_color(f[:background_color])
           xlsfmt.number_format = strftime_to_ms_format(f[:number_format]) if f[:number_format]
@@ -55,7 +55,7 @@ module Workbook
         end
         return xlsfmt
       end
-      
+
       # Attempt to convert html-hex color value to xls color number
       #
       # @param [String] hex color
@@ -66,26 +66,26 @@ module Workbook
         end
         return nil
       end
-      
+
       # Converts standard (ruby/C++/unix/...) strftime formatting to MS's formatting
-      # 
+      #
       # @param [String, nil] numberformat (nil returns nil)
       # @return [String, nil]
       def strftime_to_ms_format numberformat
         return nil if numberformat.nil?
         return numberformat.gsub('%Y','yyyy').gsub('%A','dddd').gsub('%B','mmmm').gsub('%a','ddd').gsub('%b','mmm').gsub('%y','yy').gsub('%d','dd').gsub('%m','mm').gsub('%y','y').gsub('%y','%%y').gsub('%e','d')
       end
-      
+
       # Write the current workbook to Microsoft Excel format (using the spreadsheet gem)
       #
       # @param [String] filename
-      # @param [Hash] options   see #to_xls 
+      # @param [Hash] options   see #to_xls
       def write_to_xls filename="#{title}.xls", options={}
         if to_xls(options).write(filename)
           return filename
         end
       end
-    
+
       def xls_sheet a
         if xls_template.worksheet(a)
           return xls_template.worksheet(a)
@@ -94,11 +94,11 @@ module Workbook
           self.xls_sheet a
         end
       end
-      
+
       def xls_template
         return template.raws[Spreadsheet::Excel::Workbook] ? template.raws[Spreadsheet::Excel::Workbook] : template.raws[Spreadsheet::Workbook]
       end
-            
+
       def init_spreadsheet_template
         if self.xls_template.is_a? Spreadsheet::Workbook
           return self.xls_template

data/rbeautify.rb

@@ -0,0 +1,232 @@
+#!/usr/bin/ruby -w
+
+
+=begin
+/***************************************************************************
+ *   Copyright (C) 2008, Paul Lutus                                        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+=end
+
+PVERSION = "Version 2.9, 10/24/2008"
+
+module RBeautify
+
+  # user-customizable values
+
+  RBeautify::TabStr = " "
+  RBeautify::TabSize = 2
+
+  # indent regexp tests
+
+  IndentExp = [
+    /^module\b/,
+    /^class\b/,
+    /^if\b/,
+    /(=\s*|^)until\b/,
+    /(=\s*|^)for\b/,
+    /^unless\b/,
+    /(=\s*|^)while\b/,
+    /(=\s*|^)begin\b/,
+    /(^| )case\b/,
+    /\bthen\b/,
+    /^rescue\b/,
+    /^def\b/,
+    /\bdo\b/,
+    /^else\b/,
+    /^elsif\b/,
+    /^ensure\b/,
+    /\bwhen\b/,
+    /\{[^\}]*$/,
+    /\[[^\]]*$/
+  ]
+
+  # outdent regexp tests
+
+  OutdentExp = [
+    /^rescue\b/,
+    /^ensure\b/,
+    /^elsif\b/,
+    /^end\b/,
+    /^else\b/,
+    /\bwhen\b/,
+    /^[^\{]*\}/,
+    /^[^\[]*\]/
+  ]
+
+  def RBeautify.rb_make_tab(tab)
+    return (tab < 0)?"":TabStr * TabSize * tab
+  end
+
+  def RBeautify.rb_add_line(line,tab)
+    line.strip!
+    line = rb_make_tab(tab) + line if line.length > 0
+    return line
+  end
+
+  def RBeautify.beautify_string(source, path = "")
+    comment_block = false
+    in_here_doc = false
+    here_doc_term = ""
+    program_end = false
+    multiLine_array = []
+    multiLine_str = ""
+    tab = 0
+    output = []
+    source.each_line do |line|
+      line.chomp!
+      if(!program_end)
+        # detect program end mark
+        if(line =~ /^__END__$/)
+          program_end = true
+        else
+          # combine continuing lines
+          if(!(line =~ /^\s*#/) && line =~ /[^\\]\\\s*$/)
+            multiLine_array.push line
+            multiLine_str += line.sub(/^(.*)\\\s*$/,"\\1")
+            next
+          end
+
+          # add final line
+          if(multiLine_str.length > 0)
+            multiLine_array.push line
+            multiLine_str += line.sub(/^(.*)\\\s*$/,"\\1")
+          end
+
+          tline = ((multiLine_str.length > 0)?multiLine_str:line).strip
+          if(tline =~ /^=begin/)
+            comment_block = true
+          end
+          if(in_here_doc)
+            in_here_doc = false if tline =~ %r{\s*#{here_doc_term}\s*}
+          else # not in here_doc
+            if tline =~ %r{=\s*<<}
+              here_doc_term = tline.sub(%r{.*=\s*<<-?\s*([\w]+).*},"\\1")
+              in_here_doc = here_doc_term.size > 0
+            end
+          end
+        end
+      end
+      if(comment_block || program_end || in_here_doc)
+        # add the line unchanged
+        output << line
+      else
+        comment_line = (tline =~ /^#/)
+        if(!comment_line)
+          # throw out sequences that will
+          # only sow confusion
+          while tline.gsub!(/\{[^\{]*?\}/,"")
+          end
+          while tline.gsub!(/\[[^\[]*?\]/,"")
+          end
+          while tline.gsub!(/'.*?'/,"")
+          end
+          while tline.gsub!(/".*?"/,"")
+          end
+          while tline.gsub!(/\`.*?\`/,"")
+          end
+          while tline.gsub!(/\([^\(]*?\)/,"")
+          end
+          while tline.gsub!(/\/.*?\//,"")
+          end
+          while tline.gsub!(/%r(.).*?\1/,"")
+          end
+          # delete end-of-line comments
+          tline.sub!(/#[^\"]+$/,"")
+          # convert quotes
+          tline.gsub!(/\\\"/,"'")
+          OutdentExp.each do |re|
+            if(tline =~ re)
+              tab -= 1
+              break
+            end
+          end
+        end
+        if (multiLine_array.length > 0)
+          multiLine_array.each do |ml|
+            output << rb_add_line(ml,tab)
+          end
+          multiLine_array.clear
+          multiLine_str = ""
+        else
+          output << rb_add_line(line,tab)
+        end
+        if(!comment_line)
+          IndentExp.each do |re|
+            if(tline =~ re && !(tline =~ /\s+end\s*$/))
+              tab += 1
+              break
+            end
+          end
+        end
+      end
+      if(tline =~ /^=end/)
+        comment_block = false
+      end
+    end
+    error = (tab != 0)
+    STDERR.puts "#{path}: Error: indent/outdent mismatch: #{tab}." if error
+    return output.join("\n") + "\n",error
+  end # beautify_string
+
+  def RBeautify.beautify_file(path, check)
+    error = false
+    if(path == '-') # stdin source
+      source = STDIN.read
+      dest,error = beautify_string(source,"stdin")
+      print dest
+    else # named file source
+      source = File.read(path)
+      dest,error = beautify_string(source,path)
+      if(source != dest && !error)
+        if check
+          puts "#{path} needs formatting"
+          error = "formatting"
+        else
+          # make a backup copy
+          File.open(path + "~","w") { |f| f.write(source) }
+          # overwrite the original
+          File.open(path,"w") { |f| f.write(dest) }
+        end
+      end
+    end
+    return error
+  end # beautify_file
+
+  def RBeautify.main
+    error = false
+    check = false
+    if(!ARGV[0])
+      STDERR.puts "usage: Ruby filenames or \"-\" for stdin."
+      exit 0
+    end
+    if ARGV[0] == '--check'
+      check = true
+      ARGV.slice!(0)
+    end
+    ARGV.each do |argument|
+      error = (beautify_file(argument, check))?true:error
+    end
+    error = (error)?1:0
+    exit error
+  end # main
+end # module RBeautify
+
+# if launched as a standalone program, not loaded as a module
+if __FILE__ == $0
+  RBeautify.main
+end