soroban 0.2.0 → 0.3.0

data/Gemfile

@@ -6,7 +6,6 @@ group :development do
   gem "rubyXL", "~> 1.2.7"
   gem "nokogiri", ">= 1.4.4"
   gem "rubyzip", ">= 0.9.4"
-# gem "rcov", ">= 0"
 end
 
 group :test do

data/README.md

@@ -40,7 +40,7 @@ puts s.C1             # => 50
 Bindings
 --------
 
-Soroban allows you to bind meaningful variable names to individual cells and to ranges of cells. When bound to a range, variables act as an array,.
+Soroban allows you to bind meaningful variable names to individual cells and to ranges of cells. When bound to a range, variables act as an array.
 
 ```ruby
 s.set(:A1 => 'hello', 'B1:B5' => [1,2,3,4,5])
@@ -77,7 +77,7 @@ s.set("D1:D5" => [1,2,3,4,5])
 
 s.missing             # => []
 
-s.cells               # => {"F1"=>"= E1 + SUM(D1:D5)", "E1"=>"= D1 ^ D2", "D1"=>"1", "D2"=>"2", "D3"=>"3", "D4"=>"4", "D5"=>"5"}
+s.cells               # => {:F1=>"= E1 + SUM(D1:D5)", :E1=>"= D1 ^ D2", :D1=>"1", :D2=>"2", :D3=>"3", :D4=>"4", :D5=>"5"}
 ```
 
 Importers
@@ -86,17 +86,25 @@ Importers
 Soroban has a built-in importer for xlsx files. It requires the [RubyXL](https://github.com/gilt/rubyXL) gem. Use it as follows:
 
 ```ruby
-require 'rubyXL'
-
 BINDINGS = {
-  :gravity => :B1,
+  :planet => :B1,
   :mass => :B2,
-  :force => :B10
+  :force => :B3
 }
 
-s = Soroban::Import::rubyXL("/Users/kranzky/Desktop/Physics.xlsx", 0, BINDINGS )
+s = Soroban::Import::rubyXL("files/Physics.xlsx", 0, BINDINGS )
+
+s.planet = 'Earth'
+s.mass = 80
+puts s.force          # => 783.459251241996
+
+s.planet = 'Venus'
+s.mass = 80
+puts s.force          # => 710.044826106394
 ```
 
+The above example parses the first sheet of Physics.xlsx, which you can [download](https://github.com/agworld/soroban/raw/master/files/Physics.xlsx).
+
 This import process returns a new Soroban::Sheet object that contains all the
 cells required to calculate the values of the bound variables, and which has the
 bindings set up correctly.

data/Soroban.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "soroban"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Hutchens"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "Soroban.gemspec",
     "VERSION",
+    "files/Physics.xlsx",
     "lib/soroban.rb",
     "lib/soroban/cell.rb",
     "lib/soroban/error.rb",
@@ -54,6 +55,7 @@ Gem::Specification.new do |s|
     "lib/soroban/sheet.rb",
     "lib/soroban/value_walker.rb",
     "spec/documentation_spec.rb",
+    "spec/import_spec.rb",
     "spec/soroban_spec.rb",
     "spec/spec_helper.rb"
   ]

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/soroban/cell.rb

@@ -30,6 +30,8 @@ module Soroban
       raise Soroban::RecursionError, "Loop detected when evaluating '#{@excel}'" if @touched
       @touched = true
       eval(@ruby, @binding)
+    rescue TypeError, RangeError, ZeroDivisionError
+      nil
     ensure
       @touched = false
     end

data/lib/soroban/functions/vlookup.rb

@@ -3,8 +3,11 @@
 Soroban::define :VLOOKUP => lambda { |value, range, col, inexact|
   fc, fr, tc, tr = Soroban::getRange(range)
   i = walk("#{fc}#{fr}:#{fc}#{tr}").find_index(value)
-  return nil if i.nil?
-  (0...i).each { fr.next! }
-  (1...col).each { fc.next! }
-  eval("@#{fc}#{fr}.get")
+  if i.nil?
+    nil
+  else
+    (0...i).each { fr.next! }
+    (1...col).each { fc.next! }
+    eval("@#{fc}#{fr}.get")
+  end
 }

data/lib/soroban/helpers.rb

@@ -41,7 +41,7 @@ module Soroban
   def self.getPos(label)
     # TODO: fix for labels such as "BC42"
     match = /^([a-zA-Z]+)([\d]+)$/.match(label.to_s)
-    return match[2].to_i - 1, match[1].upcase[0]-"A"[0]
+    return match[2].to_i - 1, match[1].upcase[0].ord-"A"[0].ord
   end
 
   # Return an array of values for the supplied arguments (which may be numbers, labels and ranges).

data/lib/soroban/import/ruby_xl_importer.rb

@@ -46,7 +46,6 @@ module Soroban
         data = cell.formula rescue nil
         data = "=#{data}" unless data.nil?
         data ||= cell.value.to_s rescue nil
-        puts "#{label} => #{row},#{col} = #{data}"
         @model.set(label.to_sym => data)
       end
 

data/lib/soroban/label_walker.rb

@@ -12,9 +12,15 @@ module Soroban
 
     # Yield the label of each cell referenced by the supplied range.
     def each
-      (@fc..@tc).each do |col|
-        (@fr..@tr).each do |row|
-          yield "#{col}#{row}"
+      col, row = @fc, @fr
+      while true do
+        yield "#{col}#{row}"
+        break if row == @tr && col == @tc
+        if row == @tr
+          row = @fr
+          col = col.next
+        else
+          row = row.next
         end
       end
     end

data/lib/soroban/parser/nodes.rb

@@ -51,14 +51,7 @@ module Soroban
       "'#{value}'"
     end
     def extract(value)
-      fc, fr, tc, tr = Soroban::getRange(value) 
-      retval = []
-      (fc..tc).each do |cc|
-        (fr..tr).each do |cr|
-          retval << "#{cc}#{cr}".to_sym
-        end
-      end
-      retval
+      LabelWalker.new(value).map { |label| "#{label}".to_sym }
     end
   end
 

data/spec/import_spec.rb

@@ -0,0 +1,27 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Documentation", :if => Gem.available?("rubyXL") do
+
+  it "can import xlsx files using RubyXL" do
+
+    BINDINGS = {
+      :planet => :B1,
+      :mass => :B2,
+      :force => :B3
+    }
+
+    s = Soroban::Import::rubyXL("files/Physics.xlsx", 0, BINDINGS )
+
+    s.planet = 'Earth'
+    s.mass = 80
+    puts s.force          # => 783.459251241996
+    s.force.should be_within(0.01).of(783.46)
+
+    s.planet = 'Venus'
+    s.mass = 80
+    puts s.force          # => 710.044826106394
+    s.force.should be_within(0.01).of(710.04)
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soroban
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jason Hutchens
@@ -102,6 +102,7 @@ files:
 - Rakefile
 - Soroban.gemspec
 - VERSION
+- files/Physics.xlsx
 - lib/soroban.rb
 - lib/soroban/cell.rb
 - lib/soroban/error.rb
@@ -128,6 +129,7 @@ files:
 - lib/soroban/sheet.rb
 - lib/soroban/value_walker.rb
 - spec/documentation_spec.rb
+- spec/import_spec.rb
 - spec/soroban_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/agworld/soroban