lxl 0.4.2 → 0.4.3

data/CHANGES

@@ -1,3 +1,7 @@
+0.4.3
+
+- Win32OLE example, Ranges do lookups directly on an Excel xls file.
+
 0.4.2
 
 - SpreadSheet example now works directly with ranges.

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/lib/lxl.rb

@@ -241,8 +241,9 @@ class LXL::Parser
 
   # Initialize namespace and lexer.
   #
-  def initialize(namespace=self.class.namespace_class.new)
-    @namespace = namespace
+  def initialize(options=Hash.new)
+    @namespace = options[:namespace] if options.key?(:namespace)
+    @namespace ||= self.class.namespace_class.new
     ops = EXCEL_OPERATORS.collect { |v| Regexp.quote(v) }.join('|')
     xlr = LXL::Range::EXCEL_RANGE
     @lexer = self.class.lexer_class.new([
@@ -306,6 +307,8 @@ class LXL::Parser
     formulas = [[]]
     separators = [?=, ?;]
     ops = Hash[*EXCEL_OPERATORS.zip(RUBY_OPERATORS).flatten]
+    ns_const_missing = begin [@namespace.const_get(:ConstMissing),true].last rescue false end
+    ns_method_missing = @namespace.respond_to?(:method_missing)
 
     # Translate formula prefixes to `= to avoid clashing with the = operator
     # For lines that start with = (optional leading whitespace)
@@ -357,15 +360,14 @@ class LXL::Parser
             upper = token.to_s.upcase
             lower = token.to_s.downcase
             raise NoMethodError, "protected method `#{token}` called for #{self}" if @namespace.const_get(:METHODS).include?(lower)
-            custom_const_missing = begin [@namespace.const_get(:ConstMissing),true].last rescue false end
             # Constants
             if tokens.first != '('
-              if @namespace.const_defined?(upper) or custom_const_missing
+              if @namespace.const_defined?(upper) or ns_const_missing
                 formulas.last << store(?C, "@namespace.const_get(:#{upper})")
               else formulas.last << t end
             # Functions
             else
-              if @namespace.respond_to?(lower) or @namespace.respond_to?(:method_missing)
+              if @namespace.respond_to?(lower) or ns_method_missing
                 formulas.last << store(?F, "@namespace.#{lower}")
               else formulas.last << t end
             end
@@ -475,6 +477,10 @@ class LXL::Range < Range
     end
   end
   
+  def to_s
+    "#{first}:#{last}"
+  end
+  
 end
 
 # Snapshots the symbol/arguments of a function call for later use.

data/test/lxl_spreadsheet_test.rb

@@ -58,10 +58,12 @@ end
 #++
 
 class SpreadsheetTest < Test::Unit::TestCase
+
   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

data/test/lxl_test.rb

@@ -43,13 +43,13 @@ class LXLTest < Test::Unit::TestCase
     expected += [true, false, :A, :B, false, 6, true, true, [1, 'two', 3.0], true, false, true, 'yes', 'this and that']
     expected += [8, 0.502, true, true, 'embedded percentages 25% and semi-colons ; are working properly']
     MyNamespace.register_symbols(:A, :B)
-    lxl = LXL::Parser.new(MyNamespace.new)
+    lxl = LXL::Parser.new(:namespace=>MyNamespace.new)
     results = lxl.eval(formulas)
     expected.each_index { |i| assert_equal(expected[i], results[i]) }
   end
 
   def test_range
-    lxl = LXL::Parser.new(MyNamespace.new)
+    lxl = LXL::Parser.new(:namespace=>MyNamespace.new)
     res = lxl.eval('=LIST(d5:b3, "x")')
     range = res.first
     assert_equal(LXL::Range, range.class)
@@ -70,7 +70,7 @@ class LXLTest < Test::Unit::TestCase
   
   def test_deferred
     MyNamespace.register_deferred(:TESTING)
-    lxl = LXL::Parser.new(MyNamespace.new)
+    lxl = LXL::Parser.new(:namespace=>MyNamespace.new)
     res = lxl.eval('=TESTING(1,2,3)')
     assert_equal(LXL::Deferred, res.class)
     assert_equal(:testing, res.symbol)
@@ -78,7 +78,7 @@ class LXLTest < Test::Unit::TestCase
   end
   
   def test_range_naming
-    lxl = LXL::Parser.new(MyNamespace.new)
+    lxl = LXL::Parser.new(:namespace=>MyNamespace.new)
     range = lxl.eval('=B1:D2')
     assert_equal('B', range.first_column)
     range = lxl.eval('=Sheet1!B3:D5')

data/test/lxl_win32ole_test.rb

@@ -0,0 +1,68 @@
+#--
+# =LXL Win32OLE Interface
+#
+#  An LXL interface to an Excel xls file via Win32OLE.
+#  
+#++
+
+$LOAD_PATH.unshift('../lib')
+require 'test/unit'
+require 'lxl'
+require 'win32ole'
+
+#--
+# Excel workbook
+#++
+
+$xl = WIN32OLE.new('Excel.Application')
+$xl.Visible = false
+$xl.DisplayAlerts = false
+$xl.ScreenUpdating = false
+$xl.Interactive = false
+$xl.AskToUpdateLinks = false
+
+workbook = $xl.Workbooks.Add
+w1 = $xl.Worksheets(1)
+w2 = $xl.Worksheets(2)
+w1.Range("A2").Value = 5
+w2.Range("C4").Value = 8
+
+#workbook.SaveAs(Dir.getwd+'/workbook.xls')
+
+#--
+# LXL Interface
+#++
+  
+class XLRange < LXL::Range
+
+  def self.new(first, last)
+    range = super
+    sheet = range.sheet || 'Sheet1'
+    $xl.Range("#{sheet}!#{range}").Value
+  end
+
+end 
+ 
+class MyLXL < LXL::Parser
+  def self.range_class() XLRange end
+end
+
+#--
+# Test
+#++
+
+class XLTest < Test::Unit::TestCase
+
+  def test_range
+    assert_equal(5, MyLXL.eval('=A2'))
+    assert_equal($xl.Range('A2').Value, MyLXL.eval('=Sheet1!A2'))
+    assert_equal(8, MyLXL.eval('=Sheet2!C4'))
+    assert_equal($xl.Range('Sheet2!C4').Value, MyLXL.eval('=Sheet2!C4'))
+  end
+
+  def test_z # finalizer
+    $xl.ActiveWorkbook.Close(0)
+    $xl.Quit
+  end
+
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.3
+rubygems_version: 0.8.6
 specification_version: 1
 name: lxl
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2005-02-18
+  version: 0.4.3
+date: 2005-03-07
 summary: LXL (Like Excel) is a mini-language that mimics Microsoft Excel formulas. Easily extended with new constants and functions.
 require_paths: 
   - lib
@@ -27,17 +27,18 @@ platform: ruby
 authors: 
   - Kevin Howe
 files: 
-  - lib
-  - VERSION
   - test
-  - CHANGES
+  - lib
   - lxl.gemspec
   - setup.rb
+  - VERSION
+  - CHANGES
   - README.en
-  - lib/lxl.rb
-  - test/spreadsheet.rb
-  - test/lxl_spreadsheet_test.rb
   - test/lxl_test.rb
+  - test/lxl_spreadsheet_test.rb
+  - test/spreadsheet.rb
+  - test/lxl_win32ole_test.rb
+  - lib/lxl.rb
 test_files: 
   - test/lxl_test.rb
 rdoc_options: