rubyfromexcel 0.0.17 → 0.0.18

data/lib/formulae/parse/formula_peg.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rubypeg'
 
 class Formula < RubyPeg
@@ -111,7 +112,7 @@ class Formula < RubyPeg
   end
   
   def table_name
-    terminal(/[.a-zA-Z0-9_]+/)
+    terminal(/[.\p{Word}]+/)
   end
   
   def range_structured_reference
@@ -132,7 +133,7 @@ class Formula < RubyPeg
   
   def named_reference
     node :named_reference do
-      terminal(/[#a-zA-Z][\w_.!]+/)
+      terminal(/[\p{Word}#][\p{Word}.!]*/)
     end
   end
   
@@ -144,7 +145,7 @@ class Formula < RubyPeg
   
   def sheet_reference
     node :sheet_reference do
-      terminal(/[a-zA-Z0-9][\w_.]+/) && ignore { terminal("!") } && (sheetless_reference || named_reference)
+      terminal(/[\p{Word}][\p{Word}_.]+/) && ignore { terminal("!") } && (sheetless_reference || named_reference)
     end
   end
   

data/lib/formulae/parse/formula_peg.txt

@@ -17,14 +17,14 @@ operator                        := '+' | '-' | '/' | '*' | '^'
 external_reference              := /\[\d+\]!?/ any_internal_reference
 table_reference                 := table_name `'[' (range_structured_reference | complex_structured_reference | simple_structured_reference) `']'
 local_table_reference           := `'[' (range_structured_reference | complex_structured_reference | overly_structured_reference | simple_structured_reference) `']'
-table_name                       = /[.a-zA-Z0-9_]+/
+table_name                       = /[.\p{Word}]+/
 range_structured_reference       = /\[[^\u005d]*\],\[[^\u005d]*\]:\[[^\u005d]*\]/
 complex_structured_reference     = /\[[^\u005d]*\],\[[^\u005d]*\]/
 overly_structured_reference      = `'[' simple_structured_reference `']'
 simple_structured_reference      = /[^\u005d]*/
-named_reference                 := /[#a-zA-Z][\w_.!]+/
+named_reference                 := /[\p{Word}#][\p{Word}.!]*/
 quoted_sheet_reference          := single_quoted_string `'!' (sheetless_reference | named_reference)
-sheet_reference                 := /[a-zA-Z0-9][\w_.]+/ `'!' (sheetless_reference | named_reference)
+sheet_reference                 := /[\p{Word}][\p{Word}_.]+/ `'!' (sheetless_reference | named_reference)
 single_quoted_string             = `"'" /[^']*/ `"'"
 sheetless_reference              = column_range | row_range | area | cell
 column_range                    := column `':' column

data/lib/formulae/run/reference.rb

@@ -9,7 +9,7 @@ module RubyFromExcel
   
     def self.column_to_integer(string)
       @column_to_integer_cache ||= {}
-      return @column_to_integer_cache[string] ||= string.downcase.each_byte.to_a.reverse.each.with_index.inject(0) do |memo,byte_with_index|
+      return @column_to_integer_cache[string] ||= string.downcase.each_byte.to_a.reverse.each.with_index.inject(0) do |memo,byte_with_index,c|
         memo = memo + ((byte_with_index.first - 96) * (26**byte_with_index.last))
       end
     end

data/spec/formula_peg_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require_relative 'spec_helper'
 
 require 'textpeg2rubypeg'
@@ -199,4 +200,16 @@ INDEX(INDIRECT(BI$19&"!Year.Matrix"),MATCH("Subtotal.Consumption",INDIRECT(BI$19
   it "parses tricky indirect match table combos" do
     Formula.parse(%q|INDEX(INDIRECT("'"&XVI.a.Inputs[#Headers]&"'!Year.Matrix"), MATCH("Subtotal."&$A$2, INDIRECT("'"&XVI.a.Inputs[#Headers]&"'!Year.Modules"), 0), MATCH([Vector], INDIRECT("'"&XVI.a.Inputs[#Headers]&"'!Year.Vectors"), 0))|).to_ast.should == [:formula, [:function, "INDEX", [:function, "INDIRECT", [:string_join, [:string, "'"], [:table_reference, "XVI.a.Inputs", "#Headers"], [:string, "'!Year.Matrix"]]], [:function, "MATCH", [:string_join, [:string, "Subtotal."], [:cell, "$A$2"]], [:function, "INDIRECT", [:string_join, [:string, "'"], [:table_reference, "XVI.a.Inputs", "#Headers"], [:string, "'!Year.Modules"]]], [:number, "0"]], [:function, "MATCH", [:local_table_reference, "Vector"], [:function, "INDIRECT", [:string_join, [:string, "'"], [:table_reference, "XVI.a.Inputs", "#Headers"], [:string, "'!Year.Vectors"]]], [:number, "0"]]]]
   end
+  
+  it "parses chinese characters" do
+    Formula.parse("结果!A1").to_ast.should == [:formula, [:sheet_reference, '结果', [:cell, 'A1']]]
+    Formula.parse("'结果'!A1").to_ast.should == [:formula, [:quoted_sheet_reference, '结果', [:cell, 'A1']]]
+    Formula.parse("结果[2007]").to_ast.should == [:formula,[:table_reference,'结果','2007']]
+    Formula.parse("结果[结果]").to_ast.should == [:formula,[:table_reference,'结果','结果']]
+    Formula.parse("结果[[结果],[结果]]").to_ast.should == [:formula,[:table_reference,'结果','[结果],[结果]']]
+    Formula.parse("Hello!w").to_ast.should == [:formula, [:sheet_reference, 'Hello', [:named_reference, 'w']]]
+    Formula.parse("结果!果").to_ast.should == [:formula, [:sheet_reference, '结果', [:named_reference, '果']]]
+    Formula.parse("结果").to_ast.should == [:formula, [:named_reference, '结果']]
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyfromexcel
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-19 00:00:00.000000000Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70264556132060 !ruby/object:Gem::Requirement
+  requirement: &70132958509220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264556132060
+  version_requirements: *70132958509220
 - !ruby/object:Gem::Dependency
   name: rubyscriptwriter
-  requirement: &70264556131560 !ruby/object:Gem::Requirement
+  requirement: &70132958508720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264556131560
+  version_requirements: *70132958508720
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70264556131100 !ruby/object:Gem::Requirement
+  requirement: &70132958508260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70264556131100
+  version_requirements: *70132958508260
 description: 
 email: ruby-from-excel@greenonblack.com
 executables:
@@ -153,6 +153,18 @@ files:
 - examples/ruby-versions/table-test-ruby/specs/sheet2_rspec.rb
 - examples/ruby-versions/table-test-ruby/specs/sheet3_rspec.rb
 - examples/ruby-versions/table-test-ruby/spreadsheet.rb
+- examples/ruby-versions/test1-ruby/sheets/sheet1.rb
+- examples/ruby-versions/test1-ruby/sheets/sheet2.rb
+- examples/ruby-versions/test1-ruby/specs/sheet1_rspec.rb
+- examples/ruby-versions/test1-ruby/specs/sheet2_rspec.rb
+- examples/ruby-versions/test1-ruby/spreadsheet.rb
+- examples/ruby-versions/test2-ruby/sheets/sheet1.rb
+- examples/ruby-versions/test2-ruby/sheets/sheet2.rb
+- examples/ruby-versions/test2-ruby/sheets/sheet3.rb
+- examples/ruby-versions/test2-ruby/specs/sheet1_rspec.rb
+- examples/ruby-versions/test2-ruby/specs/sheet2_rspec.rb
+- examples/ruby-versions/test2-ruby/specs/sheet3_rspec.rb
+- examples/ruby-versions/test2-ruby/spreadsheet.rb
 - examples/sheets/2050Model.xlsx
 - examples/sheets/2050ModelCutDown.xlsx
 - examples/sheets/array-formulas.xlsx
@@ -162,7 +174,79 @@ files:
 - examples/sheets/pruning.xlsx
 - examples/sheets/sharedFormulaTest.xlsx
 - examples/sheets/table-test.xlsx
+- examples/sheets/test1.xlsx
+- examples/sheets/test2.xlsx
 - examples/sheets/~$array-formulas.xlsx
+- examples/sheets/~$test1.xlsx
+- examples/unzipped-sheets/array-formulas/[Content_Types].xml
+- examples/unzipped-sheets/array-formulas/docProps/app.xml
+- examples/unzipped-sheets/array-formulas/docProps/core.xml
+- examples/unzipped-sheets/array-formulas/docProps/thumbnail.jpeg
+- examples/unzipped-sheets/array-formulas/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/array-formulas/xl/calcChain.xml
+- examples/unzipped-sheets/array-formulas/xl/sharedStrings.xml
+- examples/unzipped-sheets/array-formulas/xl/styles.xml
+- examples/unzipped-sheets/array-formulas/xl/theme/theme1.xml
+- examples/unzipped-sheets/array-formulas/xl/workbook.xml
+- examples/unzipped-sheets/array-formulas/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/array-formulas/xl/worksheets/sheet2.xml
+- examples/unzipped-sheets/checkpoint/[Content_Types].xml
+- examples/unzipped-sheets/checkpoint/docProps/app.xml
+- examples/unzipped-sheets/checkpoint/docProps/core.xml
+- examples/unzipped-sheets/checkpoint/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/checkpoint/xl/calcChain.xml
+- examples/unzipped-sheets/checkpoint/xl/charts/chart1.xml
+- examples/unzipped-sheets/checkpoint/xl/charts/chart2.xml
+- examples/unzipped-sheets/checkpoint/xl/comments1.xml
+- examples/unzipped-sheets/checkpoint/xl/comments2.xml
+- examples/unzipped-sheets/checkpoint/xl/drawings/_rels/drawing1.xml.rels
+- examples/unzipped-sheets/checkpoint/xl/drawings/_rels/drawing2.xml.rels
+- examples/unzipped-sheets/checkpoint/xl/drawings/drawing1.xml
+- examples/unzipped-sheets/checkpoint/xl/drawings/drawing2.xml
+- examples/unzipped-sheets/checkpoint/xl/drawings/vmlDrawing1.vml
+- examples/unzipped-sheets/checkpoint/xl/drawings/vmlDrawing2.vml
+- examples/unzipped-sheets/checkpoint/xl/sharedStrings.xml
+- examples/unzipped-sheets/checkpoint/xl/styles.xml
+- examples/unzipped-sheets/checkpoint/xl/theme/theme1.xml
+- examples/unzipped-sheets/checkpoint/xl/workbook.xml
+- examples/unzipped-sheets/checkpoint/xl/worksheets/_rels/sheet1.xml.rels
+- examples/unzipped-sheets/checkpoint/xl/worksheets/_rels/sheet2.xml.rels
+- examples/unzipped-sheets/checkpoint/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/checkpoint/xl/worksheets/sheet2.xml
+- examples/unzipped-sheets/complex-test/[Content_Types].xml
+- examples/unzipped-sheets/complex-test/docProps/app.xml
+- examples/unzipped-sheets/complex-test/docProps/core.xml
+- examples/unzipped-sheets/complex-test/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/complex-test/xl/calcChain.xml
+- examples/unzipped-sheets/complex-test/xl/charts/chart1.xml
+- examples/unzipped-sheets/complex-test/xl/charts/chart2.xml
+- examples/unzipped-sheets/complex-test/xl/comments1.xml
+- examples/unzipped-sheets/complex-test/xl/comments2.xml
+- examples/unzipped-sheets/complex-test/xl/drawings/_rels/drawing1.xml.rels
+- examples/unzipped-sheets/complex-test/xl/drawings/_rels/drawing2.xml.rels
+- examples/unzipped-sheets/complex-test/xl/drawings/drawing1.xml
+- examples/unzipped-sheets/complex-test/xl/drawings/drawing2.xml
+- examples/unzipped-sheets/complex-test/xl/drawings/vmlDrawing1.vml
+- examples/unzipped-sheets/complex-test/xl/drawings/vmlDrawing2.vml
+- examples/unzipped-sheets/complex-test/xl/sharedStrings.xml
+- examples/unzipped-sheets/complex-test/xl/styles.xml
+- examples/unzipped-sheets/complex-test/xl/theme/theme1.xml
+- examples/unzipped-sheets/complex-test/xl/workbook.xml
+- examples/unzipped-sheets/complex-test/xl/worksheets/_rels/sheet1.xml.rels
+- examples/unzipped-sheets/complex-test/xl/worksheets/_rels/sheet2.xml.rels
+- examples/unzipped-sheets/complex-test/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/complex-test/xl/worksheets/sheet2.xml
+- examples/unzipped-sheets/namedReferenceTest/[Content_Types].xml
+- examples/unzipped-sheets/namedReferenceTest/docProps/app.xml
+- examples/unzipped-sheets/namedReferenceTest/docProps/core.xml
+- examples/unzipped-sheets/namedReferenceTest/docProps/thumbnail.jpeg
+- examples/unzipped-sheets/namedReferenceTest/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/namedReferenceTest/xl/calcChain.xml
+- examples/unzipped-sheets/namedReferenceTest/xl/styles.xml
+- examples/unzipped-sheets/namedReferenceTest/xl/theme/theme1.xml
+- examples/unzipped-sheets/namedReferenceTest/xl/workbook.xml
+- examples/unzipped-sheets/namedReferenceTest/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/namedReferenceTest/xl/worksheets/sheet2.xml
 - examples/unzipped-sheets/pruning/[Content_Types].xml
 - examples/unzipped-sheets/pruning/docProps/app.xml
 - examples/unzipped-sheets/pruning/docProps/core.xml
@@ -178,6 +262,64 @@ files:
 - examples/unzipped-sheets/pruning/xl/worksheets/sheet1.xml
 - examples/unzipped-sheets/pruning/xl/worksheets/sheet2.xml
 - examples/unzipped-sheets/pruning/xl/worksheets/sheet3.xml
+- examples/unzipped-sheets/sharedFormulaTest/[Content_Types].xml
+- examples/unzipped-sheets/sharedFormulaTest/docProps/app.xml
+- examples/unzipped-sheets/sharedFormulaTest/docProps/core.xml
+- examples/unzipped-sheets/sharedFormulaTest/docProps/thumbnail.jpeg
+- examples/unzipped-sheets/sharedFormulaTest/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/sharedFormulaTest/xl/calcChain.xml
+- examples/unzipped-sheets/sharedFormulaTest/xl/styles.xml
+- examples/unzipped-sheets/sharedFormulaTest/xl/theme/theme1.xml
+- examples/unzipped-sheets/sharedFormulaTest/xl/workbook.xml
+- examples/unzipped-sheets/sharedFormulaTest/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/table-test/[Content_Types].xml
+- examples/unzipped-sheets/table-test/docProps/app.xml
+- examples/unzipped-sheets/table-test/docProps/core.xml
+- examples/unzipped-sheets/table-test/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/table-test/xl/calcChain.xml
+- examples/unzipped-sheets/table-test/xl/printerSettings/printerSettings1.bin
+- examples/unzipped-sheets/table-test/xl/sharedStrings.xml
+- examples/unzipped-sheets/table-test/xl/styles.xml
+- examples/unzipped-sheets/table-test/xl/tables/table1.xml
+- examples/unzipped-sheets/table-test/xl/theme/theme1.xml
+- examples/unzipped-sheets/table-test/xl/workbook.xml
+- examples/unzipped-sheets/table-test/xl/worksheets/_rels/sheet1.xml.rels
+- examples/unzipped-sheets/table-test/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/table-test/xl/worksheets/sheet2.xml
+- examples/unzipped-sheets/table-test/xl/worksheets/sheet3.xml
+- examples/unzipped-sheets/test1/[Content_Types].xml
+- examples/unzipped-sheets/test1/docProps/app.xml
+- examples/unzipped-sheets/test1/docProps/core.xml
+- examples/unzipped-sheets/test1/docProps/thumbnail.jpeg
+- examples/unzipped-sheets/test1/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/test1/xl/calcChain.xml
+- examples/unzipped-sheets/test1/xl/sharedStrings.xml
+- examples/unzipped-sheets/test1/xl/styles.xml
+- examples/unzipped-sheets/test1/xl/theme/theme1.xml
+- examples/unzipped-sheets/test1/xl/workbook.xml
+- examples/unzipped-sheets/test1/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/test1/xl/worksheets/sheet2.xml
+- examples/unzipped-sheets/test2/[Content_Types].xml
+- examples/unzipped-sheets/test2/docProps/app.xml
+- examples/unzipped-sheets/test2/docProps/core.xml
+- examples/unzipped-sheets/test2/xl/_rels/workbook.xml.rels
+- examples/unzipped-sheets/test2/xl/calcChain.xml
+- examples/unzipped-sheets/test2/xl/charts/chart1.xml
+- examples/unzipped-sheets/test2/xl/charts/chart2.xml
+- examples/unzipped-sheets/test2/xl/charts/chart3.xml
+- examples/unzipped-sheets/test2/xl/charts/chart4.xml
+- examples/unzipped-sheets/test2/xl/drawings/_rels/drawing1.xml.rels
+- examples/unzipped-sheets/test2/xl/drawings/drawing1.xml
+- examples/unzipped-sheets/test2/xl/sharedStrings.xml
+- examples/unzipped-sheets/test2/xl/styles.xml
+- examples/unzipped-sheets/test2/xl/tables/table1.xml
+- examples/unzipped-sheets/test2/xl/theme/theme1.xml
+- examples/unzipped-sheets/test2/xl/workbook.xml
+- examples/unzipped-sheets/test2/xl/worksheets/_rels/sheet1.xml.rels
+- examples/unzipped-sheets/test2/xl/worksheets/_rels/sheet3.xml.rels
+- examples/unzipped-sheets/test2/xl/worksheets/sheet1.xml
+- examples/unzipped-sheets/test2/xl/worksheets/sheet2.xml
+- examples/unzipped-sheets/test2/xl/worksheets/sheet3.xml
 homepage: http://github.com/tamc/rubyfromexcel
 licenses: []
 post_install_message: 
@@ -198,9 +340,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Converts .xlxs files into pure ruby 1.9 code so that they can be executed
   without excel
 test_files: []
+has_rdoc: false