rubyfromexcel 0.0.9 → 0.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -189,7 +189,7 @@ class Formula < RubyPeg
189
189
  end
190
190
 
191
191
  def reference
192
- terminal(/\$?[A-Za-z]{1,3}\$?[0-9]+/)
192
+ terminal(/\$?[A-Za-z]{1,3}\$?[0-9]+(?![0-9A-Za-z_])/)
193
193
  end
194
194
 
195
195
  def boolean
@@ -33,7 +33,7 @@ area := reference `':' reference
33
33
  cell := reference
34
34
  row = /\$?\d+/
35
35
  column = /\$?[A-Za-z]{1,3}/
36
- reference = /\$?[A-Za-z]{1,3}\$?[0-9]+/
36
+ reference = /\$?[A-Za-z]{1,3}\$?[0-9]+(?![0-9A-Za-z_])/
37
37
  boolean = boolean_true | boolean_false
38
38
  boolean_true := `'TRUE'
39
39
  boolean_false := `'FALSE'
@@ -144,6 +144,8 @@ describe Formula do
144
144
 
145
145
  it "returns named references" do
146
146
  Formula.parse('EF.NaturalGas.N2O').to_ast.should == [:formula,[:named_reference,'EF.NaturalGas.N2O']]
147
+ Formula.parse('USD2009_').to_ast.should == [:formula,[:named_reference,'USD2009_']]
148
+ 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"]]]]
147
149
  end
148
150
 
149
151
  it "returns infix modifiers in edge cases" do
metadata CHANGED
@@ -1,12 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rubyfromexcel
3
3
  version: !ruby/object:Gem::Version
4
- prerelease: false
5
- segments:
6
- - 0
7
- - 0
8
- - 9
9
- version: 0.0.9
4
+ prerelease:
5
+ version: 0.0.10
10
6
  platform: ruby
11
7
  authors:
12
8
  - Thomas Counsell, Green on Black Ltd
@@ -14,7 +10,7 @@ autorequire:
14
10
  bindir: bin
15
11
  cert_chain: []
16
12
 
17
- date: 2011-04-06 00:00:00 +01:00
13
+ date: 2011-04-15 00:00:00 +01:00
18
14
  default_executable:
19
15
  dependencies:
20
16
  - !ruby/object:Gem::Dependency
@@ -25,10 +21,6 @@ dependencies:
25
21
  requirements:
26
22
  - - ">="
27
23
  - !ruby/object:Gem::Version
28
- segments:
29
- - 1
30
- - 4
31
- - 1
32
24
  version: 1.4.1
33
25
  type: :runtime
34
26
  version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
40
32
  requirements:
41
33
  - - ">="
42
34
  - !ruby/object:Gem::Version
43
- segments:
44
- - 0
45
- - 0
46
- - 1
47
35
  version: 0.0.1
48
36
  type: :runtime
49
37
  version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
55
43
  requirements:
56
44
  - - ">="
57
45
  - !ruby/object:Gem::Version
58
- segments:
59
- - 0
60
- - 0
61
- - 2
62
46
  version: 0.0.2
63
47
  type: :runtime
64
48
  version_requirements: *id003
@@ -311,23 +295,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
311
295
  requirements:
312
296
  - - ~>
313
297
  - !ruby/object:Gem::Version
314
- segments:
315
- - 1
316
- - 9
317
- - 1
318
298
  version: 1.9.1
319
299
  required_rubygems_version: !ruby/object:Gem::Requirement
320
300
  none: false
321
301
  requirements:
322
302
  - - ">="
323
303
  - !ruby/object:Gem::Version
324
- segments:
325
- - 0
326
304
  version: "0"
327
305
  requirements: []
328
306
 
329
307
  rubyforge_project:
330
- rubygems_version: 1.3.7
308
+ rubygems_version: 1.6.2
331
309
  signing_key:
332
310
  specification_version: 3
333
311
  summary: Converts .xlxs files into pure ruby 1.9 code so that they can be executed without excel