rubyfromexcel 0.0.9 → 0.0.10

data/lib/formulae/parse/formula_peg.rb

@@ -189,7 +189,7 @@ class Formula < RubyPeg
   end
   
   def reference
-    terminal(/\$?[A-Za-z]{1,3}\$?[0-9]+/)
+    terminal(/\$?[A-Za-z]{1,3}\$?[0-9]+(?![0-9A-Za-z_])/)
   end
   
   def boolean

data/lib/formulae/parse/formula_peg.txt

@@ -33,7 +33,7 @@ area                            := reference `':' reference
 cell                            := reference
 row                              = /\$?\d+/
 column                           = /\$?[A-Za-z]{1,3}/
-reference                        = /\$?[A-Za-z]{1,3}\$?[0-9]+/
+reference                        = /\$?[A-Za-z]{1,3}\$?[0-9]+(?![0-9A-Za-z_])/
 boolean                          = boolean_true | boolean_false
 boolean_true                    := `'TRUE'
 boolean_false                   := `'FALSE'

data/spec/formula_peg_spec.rb

@@ -144,6 +144,8 @@ describe Formula do
   
   it "returns named references" do
     Formula.parse('EF.NaturalGas.N2O').to_ast.should == [:formula,[:named_reference,'EF.NaturalGas.N2O']]
+    Formula.parse('USD2009_').to_ast.should == [:formula,[:named_reference,'USD2009_']]
+    Formula.parse('(F47*(USD2009_/Unit.boe))*(Price2009)').to_ast.should == [:formula, [:arithmetic, [:brackets, [:arithmetic, [:cell, "F47"], [:operator, "*"], [:brackets, [:arithmetic, [:named_reference, "USD2009_"], [:operator, "/"], [:named_reference, "Unit.boe"]]]]], [:operator, "*"], [:brackets, [:named_reference, "Price2009"]]]]
   end
   
   it "returns infix modifiers in edge cases" do

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rubyfromexcel
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  prerelease: 
+  version: 0.0.10
 platform: ruby
 authors: 
 - Thomas Counsell, Green on Black Ltd
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +01:00
+date: 2011-04-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
         version: 1.4.1
   type: :runtime
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 1
         version: 0.0.1
   type: :runtime
   version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 2
         version: 0.0.2
   type: :runtime
   version_requirements: *id003
@@ -311,23 +295,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ~>
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Converts .xlxs files into pure ruby 1.9 code so that they can be executed without excel