surpass 0.0.7 → 0.0.9

data/lib/surpass/biff_record.rb

@@ -1400,7 +1400,7 @@ class FormulaRecord < BiffRecord
   RECORD_ID = 0x0006
 
   def initialize(row, col, xf_index, rpn, calc_flags = 0)
-    @record_data = [row, col, xf_index, 0xFFFF000000000003, calc_flags & 0x03, 0].pack('v3wvV') + rpn
+    @record_data = [row, col, xf_index, 0xFFFF000000000003, calc_flags & 0x03, 0].pack('v3QvV') + rpn
   end
 end
 
@@ -2165,4 +2165,4 @@ class InternalReferenceSupBookRecord < SupBookRecord
   def initialize(num_sheets)
     @record_data = [num_sheets, 0x01, 0x04].pack('vCC')
   end
-end
+end

data/lib/surpass/formula.rb

@@ -0,0 +1,25 @@
+class Formula
+  NO_CALCS=0x00
+  RECALC_ALWAYS=0x01
+  CALC_ON_OPEN=0x02
+  PART_OF_SHARED_FORMULA=0x08
+
+  attr_reader :parser
+
+  def initialize(formula_string)
+    raise "formulas not available" unless FORMULAS_AVAILABLE
+    @lexer = ExcelFormula::Lexer.new(formula_string)
+    @parser = ExcelFormula::Parser.new(@lexer)
+    begin
+      @parser.formula
+    rescue RuntimeError => e
+      puts e
+      raise "invalid Excel formula"
+    end
+  end
+
+  def to_biff
+    rpn = @parser.rpn
+    [rpn.length].pack('v') + rpn
+  end
+end

data/lib/surpass/row.rb

@@ -145,7 +145,7 @@ class Row
       @cells << NumberCell.new(self, col, style_index, label)
     when Date, DateTime, Time
       @cells << NumberCell.new(self, col, style_index, as_excel_date(label))
-    when ExcelFormula
+    when Formula
       @cells << FormulaCell.new(self, col, style_index, label)
     else
       raise "You are trying to write an object of class #{label.class.name} to a spreadsheet. Please convert this to a supported class such as String."

data/lib/surpass/utilities.rb

@@ -63,6 +63,38 @@ module Utilities
   def hex(value)
     "0x" + value.to_s(16)
   end
+  
+  RE_CELL_EX = /^(\$)?([A-I]?[A-Z])(\$?)(\d+)$/i
+
+  def col_by_name(column_name)
+    col = 0
+    pow = 1
+    column_name.reverse.each_byte do |l|
+      col += (l - 64) * pow
+      pow *= 26
+    end
+    col - 1
+  end
+
+  def cell_to_rowcol(cell)
+    match = RE_CELL_EX.match(cell)
+    raise "Ill-formed single cell reference #{cell}" if match.nil?
+    col_abs, col, row_abs, row = match.captures
+    row = row.to_i - 1
+    col = col_by_name(col.upcase)
+    [row, col, row_abs.nil?, col_abs.nil?]
+  end
+
+  def cell_to_packed_rowcol(cell)
+    row, col, row_abs, col_abs = cell_to_rowcol(cell)
+    raise "Column #{col} is greater than IV (#{MAX_COL})" if col >= MAX_COL
+    raise "Row #{row} is greater than #{MAX_ROW} in #{cell}" if row >= MAX_ROW
+
+    col |= row_abs.to_i << 15
+    col |= col_abs.to_i << 14
+
+    [row, col]
+  end
 end
 
 def String.random_alphanumeric(size=16)

data/lib/surpass/workbook.rb

@@ -113,7 +113,7 @@ class Workbook
     options = 0x0020 # see Options Flags for Name record
      
     # FIXME: this is just a bad hack, need to use Formula to make the rpn
-    #~ rpn = ExcelFormula.Formula('').rpn()[2:] # minus the size field
+    #~ rpn = Formula.Formula('').rpn()[2:] # minus the size field
     rpn = [0x3B, 0x0000, rstart, rend, cstart, cend].pack('Cv5')
     args = [options, 0x00, MACROS['Print_Area'], sheetnum, rpn]
     @names << NameRecord.new(*args).to_biff

data/lib/surpass/worksheet.rb

@@ -152,7 +152,7 @@ class Worksheet
     @iterations_on = 0
     @delta = 0.001
     @save_recalc = 0
-    @formula_options = ExcelFormula::RECALC_ALWAYS | ExcelFormula::CALC_ON_OPEN
+    @formula_options = Formula::RECALC_ALWAYS | Formula::CALC_ON_OPEN
 
     @print_headers = 0
     @print_grid = 0
@@ -553,9 +553,9 @@ class Worksheet
     end
   end
   
-  def col_width(col)
-    if cols.keys.include?(col)
-      col.width_in_pixels
+  def col_width(column_index)
+    if cols.keys.include?(column_index)
+      cols[column_index].width_in_pixels
     else
       64
     end

data/lib/surpass.rb

@@ -1,7 +1,7 @@
 module Surpass
 
   # :stopdoc:
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -40,12 +40,22 @@ module Surpass
 
     Dir.glob(search_me).sort.each do |rb|
       next if File.basename(rb) === File.basename(__FILE__) # skip surpass.rb
+      next if File.basename(rb) =~ /^ExcelFormula/ unless FORMULAS_AVAILABLE
       require rb
     end
   end
 
 end  # module Surpass
 
-Surpass.require_all_libs_relative_to(__FILE__)
+begin
+  require 'rubygems'
+  require 'antlr3'
+  FORMULAS_AVAILABLE = true
+rescue Exception => e
+  puts "antlr3 gem not found, formulas not available. Install antlr3 to enable formulas."
+  FORMULAS_AVAILABLE = false
+end
 
+Surpass.require_all_libs_relative_to(__FILE__)
 require 'date'
+

data/surpass.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{surpass}
-  s.version = "0.0.6"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ana Nelson"]
-  s.date = %q{2009-10-27}
+  s.date = %q{2010-04-23}
   s.default_executable = %q{surpass}
   s.description = %q{Surpass is writing (and eventually reading) excel workbooks in pure Ruby. Surpass is based on xlwt (and pyExcelerator).
 
@@ -15,26 +15,25 @@ For comprehensive documentation, please refer to the PDF manual which is availab
 If you like to learn from playing with working examples, then there are plenty in the examples/ and webby/examples directories of the source code.}
   s.email = %q{ana@ananelson.com}
   s.executables = ["surpass"]
-  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "README.txt", "bin/surpass", "lib/surpass/ExcelFormula.g", "lib/surpass/ExcelFormula.tokens", "lib/surpass/tokens.txt", "spec/data/random-strings.txt", "stats/cloc.txt", "stats/rcov.txt", "stats/specdoc.txt", "webby/README.txt", "webby/content/css/pygments.txt", "webby/content/index.txt", "webby/content/installation/index.txt", "webby/content/source/ExcelFormulaLexer.txt", "webby/content/source/ExcelFormulaParser.txt", "webby/content/source/biff_record.txt", "webby/content/source/bitmap.txt", "webby/content/source/cell.txt", "webby/content/source/chart.txt", "webby/content/source/column.txt", "webby/content/source/document.txt", "webby/content/source/excel_formula.txt", "webby/content/source/excel_magic.txt", "webby/content/source/formatting.txt", "webby/content/source/row.txt", "webby/content/source/style.txt", "webby/content/source/surpass.txt", "webby/content/source/utilities.txt", "webby/content/source/workbook.txt", "webby/content/source/worksheet.txt", "webby/layouts/book.txt", "webby/layouts/default.txt", "webby/layouts/two_column.txt", "webby/layouts/web.txt"]
-  s.files = [".bzr/README", ".bzr/branch-format", ".bzr/branch/branch.conf", ".bzr/branch/format", ".bzr/branch/last-revision", ".bzr/branch/tags", ".bzr/checkout/conflicts", ".bzr/checkout/dirstate", ".bzr/checkout/format", ".bzr/checkout/merge-hashes", ".bzr/repository/format", ".bzr/repository/indices/151ac19fd622c8084eca354d80336510.iix", ".bzr/repository/indices/151ac19fd622c8084eca354d80336510.rix", ".bzr/repository/indices/151ac19fd622c8084eca354d80336510.six", ".bzr/repository/indices/151ac19fd622c8084eca354d80336510.tix", ".bzr/repository/indices/29647a57de6255f81ed838b5aaf89e54.iix", ".bzr/repository/indices/29647a57de6255f81ed838b5aaf89e54.rix", ".bzr/repository/indices/29647a57de6255f81ed838b5aaf89e54.six", ".bzr/repository/indices/29647a57de6255f81ed838b5aaf89e54.tix", ".bzr/repository/indices/5901bb87fc326fc481c268c7093087d6.iix", ".bzr/repository/indices/5901bb87fc326fc481c268c7093087d6.rix", ".bzr/repository/indices/5901bb87fc326fc481c268c7093087d6.six", ".bzr/repository/indices/5901bb87fc326fc481c268c7093087d6.tix", ".bzr/repository/indices/60afa9e7714310e7df9780bb1be8904f.iix", ".bzr/repository/indices/60afa9e7714310e7df9780bb1be8904f.rix", ".bzr/repository/indices/60afa9e7714310e7df9780bb1be8904f.six", ".bzr/repository/indices/60afa9e7714310e7df9780bb1be8904f.tix", ".bzr/repository/indices/6f8954ed6fa3fc3771613f06347014f4.iix", ".bzr/repository/indices/6f8954ed6fa3fc3771613f06347014f4.rix", ".bzr/repository/indices/6f8954ed6fa3fc3771613f06347014f4.six", ".bzr/repository/indices/6f8954ed6fa3fc3771613f06347014f4.tix", ".bzr/repository/indices/764c4380dd16055c6dc1d6ed22ce4c16.iix", ".bzr/repository/indices/764c4380dd16055c6dc1d6ed22ce4c16.rix", ".bzr/repository/indices/764c4380dd16055c6dc1d6ed22ce4c16.six", ".bzr/repository/indices/764c4380dd16055c6dc1d6ed22ce4c16.tix", ".bzr/repository/indices/929fece420d91bbac5a96347aee1b3d6.iix", ".bzr/repository/indices/929fece420d91bbac5a96347aee1b3d6.rix", ".bzr/repository/indices/929fece420d91bbac5a96347aee1b3d6.six", ".bzr/repository/indices/929fece420d91bbac5a96347aee1b3d6.tix", ".bzr/repository/indices/bba034b51d01b176f36c84a60d9f947f.iix", ".bzr/repository/indices/bba034b51d01b176f36c84a60d9f947f.rix", ".bzr/repository/indices/bba034b51d01b176f36c84a60d9f947f.six", ".bzr/repository/indices/bba034b51d01b176f36c84a60d9f947f.tix", ".bzr/repository/indices/de1db3c0ce54620ccf022905ad589c90.iix", ".bzr/repository/indices/de1db3c0ce54620ccf022905ad589c90.rix", ".bzr/repository/indices/de1db3c0ce54620ccf022905ad589c90.six", ".bzr/repository/indices/de1db3c0ce54620ccf022905ad589c90.tix", ".bzr/repository/indices/fac52d20970efba4203df3cef78176a2.iix", ".bzr/repository/indices/fac52d20970efba4203df3cef78176a2.rix", ".bzr/repository/indices/fac52d20970efba4203df3cef78176a2.six", ".bzr/repository/indices/fac52d20970efba4203df3cef78176a2.tix", ".bzr/repository/indices/fd968e63b0439f3eccfaf7ce7d421d0c.iix", ".bzr/repository/indices/fd968e63b0439f3eccfaf7ce7d421d0c.rix", ".bzr/repository/indices/fd968e63b0439f3eccfaf7ce7d421d0c.six", ".bzr/repository/indices/fd968e63b0439f3eccfaf7ce7d421d0c.tix", ".bzr/repository/obsolete_packs/14491a06534831c3c83658e356759a01.iix", ".bzr/repository/obsolete_packs/14491a06534831c3c83658e356759a01.pack", ".bzr/repository/obsolete_packs/14491a06534831c3c83658e356759a01.rix", ".bzr/repository/obsolete_packs/14491a06534831c3c83658e356759a01.six", ".bzr/repository/obsolete_packs/14491a06534831c3c83658e356759a01.tix", ".bzr/repository/obsolete_packs/25281e7274abffc32e7a43da7f8d0461.iix", ".bzr/repository/obsolete_packs/25281e7274abffc32e7a43da7f8d0461.pack", ".bzr/repository/obsolete_packs/25281e7274abffc32e7a43da7f8d0461.rix", ".bzr/repository/obsolete_packs/25281e7274abffc32e7a43da7f8d0461.six", ".bzr/repository/obsolete_packs/25281e7274abffc32e7a43da7f8d0461.tix", ".bzr/repository/obsolete_packs/337318464912506e396a98e2846375ee.iix", ".bzr/repository/obsolete_packs/337318464912506e396a98e2846375ee.pack", ".bzr/repository/obsolete_packs/337318464912506e396a98e2846375ee.rix", ".bzr/repository/obsolete_packs/337318464912506e396a98e2846375ee.six", ".bzr/repository/obsolete_packs/337318464912506e396a98e2846375ee.tix", ".bzr/repository/obsolete_packs/4b641e21199b5b3983ead40baee59157.iix", ".bzr/repository/obsolete_packs/4b641e21199b5b3983ead40baee59157.pack", ".bzr/repository/obsolete_packs/4b641e21199b5b3983ead40baee59157.rix", ".bzr/repository/obsolete_packs/4b641e21199b5b3983ead40baee59157.six", ".bzr/repository/obsolete_packs/4b641e21199b5b3983ead40baee59157.tix", ".bzr/repository/obsolete_packs/69d1464bc492b242c2c80b98f1eaca16.iix", ".bzr/repository/obsolete_packs/69d1464bc492b242c2c80b98f1eaca16.pack", ".bzr/repository/obsolete_packs/69d1464bc492b242c2c80b98f1eaca16.rix", ".bzr/repository/obsolete_packs/69d1464bc492b242c2c80b98f1eaca16.six", ".bzr/repository/obsolete_packs/69d1464bc492b242c2c80b98f1eaca16.tix", ".bzr/repository/obsolete_packs/7e561e10b317a3561596c12162aa0b62.iix", ".bzr/repository/obsolete_packs/7e561e10b317a3561596c12162aa0b62.pack", ".bzr/repository/obsolete_packs/7e561e10b317a3561596c12162aa0b62.rix", ".bzr/repository/obsolete_packs/7e561e10b317a3561596c12162aa0b62.six", ".bzr/repository/obsolete_packs/7e561e10b317a3561596c12162aa0b62.tix", ".bzr/repository/obsolete_packs/873c887bbba83618f871b71b92dd2cab.iix", ".bzr/repository/obsolete_packs/873c887bbba83618f871b71b92dd2cab.pack", ".bzr/repository/obsolete_packs/873c887bbba83618f871b71b92dd2cab.rix", ".bzr/repository/obsolete_packs/873c887bbba83618f871b71b92dd2cab.six", ".bzr/repository/obsolete_packs/873c887bbba83618f871b71b92dd2cab.tix", ".bzr/repository/pack-names", ".bzr/repository/packs/151ac19fd622c8084eca354d80336510.pack", ".bzr/repository/packs/29647a57de6255f81ed838b5aaf89e54.pack", ".bzr/repository/packs/5901bb87fc326fc481c268c7093087d6.pack", ".bzr/repository/packs/60afa9e7714310e7df9780bb1be8904f.pack", ".bzr/repository/packs/6f8954ed6fa3fc3771613f06347014f4.pack", ".bzr/repository/packs/764c4380dd16055c6dc1d6ed22ce4c16.pack", ".bzr/repository/packs/929fece420d91bbac5a96347aee1b3d6.pack", ".bzr/repository/packs/bba034b51d01b176f36c84a60d9f947f.pack", ".bzr/repository/packs/de1db3c0ce54620ccf022905ad589c90.pack", ".bzr/repository/packs/fac52d20970efba4203df3cef78176a2.pack", ".bzr/repository/packs/fd968e63b0439f3eccfaf7ce7d421d0c.pack", ".bzrignore", "History.txt", "LICENSE.txt", "README.txt", "Rakefile", "bin/surpass", "examples/big-16mb.rb", "examples/big-random-strings.rb", "examples/blanks.rb", "examples/col_width.rb", "examples/col_width.xls", "examples/dates.rb", "examples/format.rb", "examples/hello-world.rb", "examples/image.rb", "examples/merged.rb", "examples/merged0.rb", "examples/merged1.rb", "examples/num_formats.rb", "examples/numbers.rb", "examples/numbers.xls", "examples/outline.rb", "examples/outline.xls", "examples/panes.rb", "examples/protection.rb", "examples/python.bmp", "examples/row_styles.rb", "examples/row_styles_empty.rb", "examples/set_cell_and_range_style.rb", "examples/wrapped-text.rb", "examples/wrapped-text.xls", "examples/write_arrays.rb", "examples/write_arrays.xls", "examples/ws_props.rb", "lib/surpass.rb", "lib/surpass/ExcelFormula.g", "lib/surpass/ExcelFormula.tokens", "lib/surpass/ExcelFormulaLexer.rb", "lib/surpass/ExcelFormulaParser.rb", "lib/surpass/biff_record.rb", "lib/surpass/bitmap.rb", "lib/surpass/cell.rb", "lib/surpass/chart.rb", "lib/surpass/column.rb", "lib/surpass/document.rb", "lib/surpass/excel_formula.rb", "lib/surpass/excel_magic.rb", "lib/surpass/formatting.rb", "lib/surpass/row.rb", "lib/surpass/style.rb", "lib/surpass/tokens.txt", "lib/surpass/utilities.rb", "lib/surpass/workbook.rb", "lib/surpass/worksheet.rb", "out.bin", "spec/biff_record_spec.rb", "spec/cell_spec.rb", "spec/data/random-strings.txt", "spec/document_spec.rb", "spec/excel_formula_spec.rb", "spec/formatting_spec.rb", "spec/output/cells-rk.xls", "spec/output/cells.xls", "spec/output/mini.xls", "spec/reference/P-0508-0000507647-3280-5298.xls", "spec/reference/all-cell-styles.bin", "spec/reference/all-number-formats.bin", "spec/reference/all-styles.bin", "spec/reference/mini.xls", "spec/row_spec.rb", "spec/spec_helper.rb", "spec/style_spec.rb", "spec/surpass_spec.rb", "spec/utilities_spec.rb", "spec/workbook_spec.rb", "spec/worksheet_spec.rb", "stats/cloc.txt", "stats/rcov.txt", "stats/specdoc.txt", "test/test_surpass.rb", "webby/.DS_Store", "webby/README.txt", "webby/Sitefile", "webby/content/css/pygments.txt", "webby/content/css/style.css", "webby/content/examples/.array.rb.swp", "webby/content/examples/autoformat.png", "webby/content/examples/autoformat.rb", "webby/content/examples/autoformat.xls", "webby/content/examples/borders.png", "webby/content/examples/borders.rb", "webby/content/examples/borders.xls", "webby/content/examples/colours.png", "webby/content/examples/colours.rb", "webby/content/examples/colours.xls", "webby/content/examples/data.png", "webby/content/examples/data.rb", "webby/content/examples/data.xls", "webby/content/examples/formatting.png", "webby/content/examples/formatting.rb", "webby/content/examples/formatting.xls", "webby/content/examples/hello-world.png", "webby/content/examples/hello-world.py", "webby/content/examples/hello-world.rb", "webby/content/examples/hello-world.xls", "webby/content/examples/number-format-string.png", "webby/content/examples/number-format-string.rb", "webby/content/examples/number-format-string.xls", "webby/content/examples/patterns.png", "webby/content/examples/patterns.rb", "webby/content/examples/patterns.xls", "webby/content/examples/show-greens.sh", "webby/content/examples/surpass-info.sh", "webby/content/img/Thumbs.db", "webby/content/img/bg_menu.gif", "webby/content/img/bg_t.gif", "webby/content/img/bullet.gif", "webby/content/img/logo.png", "webby/content/img/logo_.jpg", "webby/content/img/top_bg.gif", "webby/content/img/top_bg_.gif", "webby/content/index.txt", "webby/content/installation/index.txt", "webby/content/source/ExcelFormulaLexer.txt", "webby/content/source/ExcelFormulaParser.txt", "webby/content/source/biff_record.txt", "webby/content/source/bitmap.txt", "webby/content/source/cell.txt", "webby/content/source/chart.txt", "webby/content/source/column.txt", "webby/content/source/document.txt", "webby/content/source/excel_formula.txt", "webby/content/source/excel_magic.txt", "webby/content/source/formatting.txt", "webby/content/source/row.txt", "webby/content/source/style.txt", "webby/content/source/surpass.txt", "webby/content/source/utilities.txt", "webby/content/source/workbook.txt", "webby/content/source/worksheet.txt", "webby/content/surpass-manual.erb", "webby/layouts/book.txt", "webby/layouts/default.txt", "webby/layouts/two_column.txt", "webby/layouts/web.txt", "webby/output/.cairn", "webby/output/css/pygments.css", "webby/output/css/style.css", "webby/output/examples/autoformat.png", "webby/output/examples/autoformat.rb", "webby/output/examples/autoformat.xls", "webby/output/examples/borders.png", "webby/output/examples/borders.rb", "webby/output/examples/borders.xls", "webby/output/examples/colours.png", "webby/output/examples/colours.rb", "webby/output/examples/colours.xls", "webby/output/examples/data.png", "webby/output/examples/data.rb", "webby/output/examples/data.xls", "webby/output/examples/formatting.png", "webby/output/examples/formatting.rb", "webby/output/examples/formatting.xls", "webby/output/examples/hello-world.png", "webby/output/examples/hello-world.py", "webby/output/examples/hello-world.rb", "webby/output/examples/hello-world.xls", "webby/output/examples/number-format-string.png", "webby/output/examples/number-format-string.rb", "webby/output/examples/number-format-string.xls", "webby/output/examples/patterns.png", "webby/output/examples/patterns.rb", "webby/output/examples/patterns.xls", "webby/output/examples/show-greens.sh", "webby/output/examples/surpass-info.sh", "webby/output/img/Thumbs.db", "webby/output/img/bg_menu.gif", "webby/output/img/bg_t.gif", "webby/output/img/bullet.gif", "webby/output/img/logo.png", "webby/output/img/logo_.jpg", "webby/output/img/top_bg.gif", "webby/output/img/top_bg_.gif", "webby/output/index.html", "webby/output/installation/index.html", "webby/output/source/ExcelFormulaLexer.html", "webby/output/source/ExcelFormulaParser.html", "webby/output/source/biff_record.html", "webby/output/source/bitmap.html", "webby/output/source/cell.html", "webby/output/source/chart.html", "webby/output/source/column.html", "webby/output/source/document.html", "webby/output/source/excel_formula.html", "webby/output/source/excel_magic.html", "webby/output/source/formatting.html", "webby/output/source/row.html", "webby/output/source/style.html", "webby/output/source/surpass.html", "webby/output/source/utilities.html", "webby/output/source/workbook.html", "webby/output/source/worksheet.html", "webby/output/surpass-manual-0-0-5.pdf", "webby/output/surpass-manual.aux", "webby/output/surpass-manual.log", "webby/output/surpass-manual.out", "webby/output/surpass-manual.tex", "webby/output/surpass-manual.toc", "webby/output/surpass-r65.tgz", "webby/rsync-exclude", "webby/tasks/latex.rake", "webby/tasks/screenshots.rb", "webby/templates/article.erb", "webby/templates/book.erb", "webby/templates/page.erb"]
+  s.extra_rdoc_files = ["History.txt", "LICENSE.txt", "README.txt", "bin/surpass", "lib/surpass/ExcelFormula.g", "lib/surpass/ExcelFormulaGrammar.g", "lib/surpass/ExcelFormulaGrammar.tokens", "lib/surpass/tokens.txt"]
+  s.files = ["History.txt", "LICENSE.txt", "README.txt", "Rakefile", "bin/surpass", "lib/surpass.rb", "lib/surpass/ExcelFormula.g", "lib/surpass/ExcelFormulaGrammar.g", "lib/surpass/ExcelFormulaGrammar.tokens", "lib/surpass/ExcelFormulaGrammarLexer.rb", "lib/surpass/ExcelFormulaGrammarParser.rb", "lib/surpass/biff_record.rb", "lib/surpass/bitmap.rb", "lib/surpass/cell.rb", "lib/surpass/chart.rb", "lib/surpass/column.rb", "lib/surpass/document.rb", "lib/surpass/excel_formula.rb", "lib/surpass/excel_magic.rb", "lib/surpass/formatting.rb", "lib/surpass/row.rb", "lib/surpass/style.rb", "lib/surpass/tokens.txt", "lib/surpass/utilities.rb", "lib/surpass/workbook.rb", "lib/surpass/worksheet.rb", "surpass.gemspec"]
   s.homepage = %q{http://surpass.rubyforge.org}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{surpass}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Surpass is writing (and eventually reading) excel workbooks in pure Ruby}
-  s.test_files = ["test/test_surpass.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_development_dependency(%q<bones>, [">= 3.4.1"])
     else
-      s.add_dependency(%q<bones>, [">= 2.5.1"])
+      s.add_dependency(%q<bones>, [">= 3.4.1"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.5.1"])
+    s.add_dependency(%q<bones>, [">= 3.4.1"])
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: surpass
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Ana Nelson
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 +00:00
+date: 2010-05-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
+        segments: 
+        - 3
+        - 4
+        - 1
+        version: 3.4.1
+  type: :development
+  version_requirements: *id001
 description: |-
   Surpass is writing (and eventually reading) excel workbooks in pure Ruby. Surpass is based on xlwt (and pyExcelerator).
   
@@ -47,6 +56,10 @@ files:
 - README.txt
 - Rakefile
 - bin/surpass
+- debug-examples/formula-cell.bin
+- debug-examples/formula-cell.rb
+- debug-examples/formula-record.bin
+- debug-examples/formula-record.rb
 - lib/surpass.rb
 - lib/surpass/ExcelFormula.g
 - lib/surpass/ExcelFormula.tokens
@@ -58,30 +71,16 @@ files:
 - lib/surpass/chart.rb
 - lib/surpass/column.rb
 - lib/surpass/document.rb
-- lib/surpass/excel_formula.rb
 - lib/surpass/excel_magic.rb
 - lib/surpass/formatting.rb
+- lib/surpass/formula.rb
 - lib/surpass/row.rb
 - lib/surpass/style.rb
 - lib/surpass/tokens.txt
 - lib/surpass/utilities.rb
 - lib/surpass/workbook.rb
 - lib/surpass/worksheet.rb
-- out.bin
 - surpass.gemspec
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-- tasks/zentest.rake
 has_rdoc: true
 homepage: http://surpass.rubyforge.org
 licenses: []
@@ -96,18 +95,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: surpass
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Surpass is writing (and eventually reading) excel workbooks in pure Ruby

data/lib/surpass/excel_formula.rb

@@ -1,23 +0,0 @@
-class ExcelFormula
-  NO_CALCS=0x00
-  RECALC_ALWAYS=0x01
-  CALC_ON_OPEN=0x02
-  PART_OF_SHARED_FORMULA=0x08
-  
-  attr_reader :parser
-  
-  def initialize(formula_string)
-    @parser = ExcelFormulaParser.new(formula_string)
-    # begin
-      @parser.formula
-    # rescue RuntimeError => e
-    #   puts e
-    #   raise "invalid Excel formula"
-    # end
-  end
-  
-  def to_biff
-    rpn = @parser.rpn
-    [rpn.size].pack('v') + rpn
-  end
-end

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  file PROJ.ann.file do
-    ann = PROJ.ann
-    puts "Generating #{ann.file}"
-    File.open(ann.file,'w') do |fd|
-      fd.puts("#{PROJ.name} version #{PROJ.version}")
-      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      ann.paragraphs.each do |p|
-        fd.puts "== #{p.upcase}"
-        fd.puts
-        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-        fd.puts
-      end
-      fd.puts ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-    rfc822msg << File.read(ann.file)
-
-    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF

data/tasks/bones.rake

@@ -1,20 +0,0 @@
-
-if HAVE_BONES
-
-namespace :bones do
-
-  desc 'Show the PROJ open struct'
-  task :debug do |t|
-    atr = if t.application.top_level_tasks.length == 2
-      t.application.top_level_tasks.pop
-    end
-
-    if atr then Bones::Debug.show_attr(PROJ, atr)
-    else Bones::Debug.show PROJ end
-  end
-
-end  # namespace :bones
-
-end  # HAVE_BONES
-
-# EOF