lxl 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,7 @@
+0.4.2
+
+- SpreadSheet example now works directly with ranges.
+
 0.4.1
 
 - LXL::Token, LXL::Parser#token_class, #store, #tokenize updated.
@@ -8,7 +12,7 @@
   - All tokenizing code moved into tokenize (out of eval)
   - Token class added
   - Fixes bug with text (non-formula) strings and constant parsing
-- Removed unnessecary Lexer code
+- Removed unnessecary Lexer code.
 
 0.3.8
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/test/lxl_spreadsheet_test.rb

@@ -1,9 +1,21 @@
 #--
-# LXL interface to Jim Weirich�s SpreadSheet object.
-# http://onestepback.org/index.cgi/Tech/Ruby/SlowingDownCalculations.rdoc
-# http://onestepback.org/cgi-bin/osbwiki.pl?SpreadSheetCode
+# =LXL SpreadSheet Interface
 #
-# NOTE: Spreadsheet#[a,b] does single lookups only.
+#  An LXL interface to Jim Weirich�s SpreadSheet object.
+#
+#  http://onestepback.org/index.cgi/Tech/Ruby/SlowingDownCalculations.rdoc
+#  http://onestepback.org/cgi-bin/osbwiki.pl?SpreadSheetCode
+#
+# =Usage
+#
+#    MyLXL.eval('=A2')        # => <SpreadSheet:1>[1,2]
+#    MyLXL.eval('=Sheet2!C4') # => <SpreadSheet:2>[3,4]
+#
+# =Notes
+#
+# * Spreadsheet#[a,b] does single lookups only.
+# * Uses Range#sheet to specify the SpreadSheet object.
+# * Uses a custom range class to perform lookups on the SpreadSheet object.
 #++
 
 $LOAD_PATH.unshift('../lib')
@@ -15,23 +27,30 @@ require 'lxl'
 # Spreadsheet
 #++
 
-$ss = SpreadSheet.new
-$ss[1,1].value = 5
-$ss[1,2].value = $ss[1,1] * 6
-$ss[1,3].value = $ss[1,2] * 7
+$sheet1 = SpreadSheet.new
+$sheet1[1,2].value = 5 # Sheet1!A2
+
+$sheet2 = SpreadSheet.new
+$sheet2[3,4].value = 8 # Sheet2!C4
+
+$book = {'Sheet1'=>$sheet1, 'Sheet2'=>$sheet2}
 
 #--
 # LXL Interface
 #++
   
-class MyNamespace < LXL::EmptyNamespace
-  def lookup(range)
-    $ss[range.first_colnum, range.first_cell].value
+class SSRange < LXL::Range
+
+  def self.new(first, last)
+    range = super
+    sheet = $book[range.sheet || 'Sheet1']
+    sheet ? sheet[range.first_colnum, range.first_cell].value : 0
   end
-end
 
+end 
+ 
 class MyLXL < LXL::Parser
-  def self.namespace_class() MyNamespace end
+  def self.range_class() SSRange end
 end
 
 #--
@@ -39,7 +58,10 @@ end
 #++
 
 class SpreadsheetTest < Test::Unit::TestCase
-  def test_lookup
-    assert_equal($ss[1,3].value, MyLXL.eval('=LOOKUP(A3)'))
+  def test_range
+    assert_equal(5, MyLXL.eval('=A2'))
+    assert_equal($sheet1[1,2].value, MyLXL.eval('=Sheet1!A2'))
+    assert_equal(8, MyLXL.eval('=Sheet2!C4'))
+    assert_equal($sheet2[3,4].value, MyLXL.eval('=Sheet2!C4'))
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: lxl
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2005-02-16
+  version: 0.4.2
+date: 2005-02-18
 summary: LXL (Like Excel) is a mini-language that mimics Microsoft Excel formulas. Easily extended with new constants and functions.
 require_paths: 
   - lib