soroban 0.3.1 → 0.4.0

data/Gemfile

@@ -6,12 +6,11 @@ group :development do
   gem "rubyXL", "~> 1.2.7"
   gem "nokogiri", ">= 1.4.4"
   gem "rubyzip", ">= 0.9.4"
-  gem "ditz"
 end
 
 group :test do
   gem "rake"
-  gem "rspec", "~> 2.9.0"
+  gem "rspec", "~> 2.12.0"
   gem "yard", "~> 0.7"
 end
 

data/Gemfile.lock

@@ -2,48 +2,44 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    ditz (0.5)
-      trollop (>= 1.9)
     git (1.2.5)
-    jeweler (1.8.3)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.3)
-    nokogiri (1.5.2)
+    json (1.7.6)
+    nokogiri (1.5.6)
     polyglot (0.3.3)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    redcarpet (2.1.1)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    redcarpet (2.2.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rubyXL (1.2.7)
-    rubyzip (0.9.8)
-    treetop (1.4.10)
+    rspec-mocks (2.12.1)
+    rubyXL (1.2.10)
+    rubyzip (0.9.9)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    trollop (1.16.2)
-    yard (0.8.1)
+    yard (0.8.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ditz
   jeweler (~> 1.8.3)
   nokogiri (>= 1.4.4)
   rake
   rdoc (~> 3.12)
   redcarpet
-  rspec (~> 2.9.0)
+  rspec (~> 2.12.0)
   rubyXL (~> 1.2.7)
   rubyzip (>= 0.9.4)
   treetop (~> 1.4.10)

data/Rakefile

@@ -36,6 +36,10 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = false
 end
 
+task 'treetop' do
+  system('tt lib/soroban/parser/grammar.treetop -o lib/soroban/parser/grammar.rb')
+end
+
 task :default => :spec
 
 require 'yard'

data/Soroban.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "soroban"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Hutchens"]
-  s.date = "2012-05-22"
+  s.date = "2013-01-09"
   s.description = "Soroban makes it easy to extract and execute formulas from Excel spreadsheets. It rewrites Excel formulas as Ruby expressions, and allows you to bind named variables to spreadsheet cells to easily manipulate inputs and capture outputs."
   s.email = "jason.hutchens@agworld.com.au"
   s.extra_rdoc_files = [
@@ -28,10 +28,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "Soroban.gemspec",
     "VERSION",
-    "bugs/issue-096ca8b758759b2b32d9c58a88a2ab05672336b8.yaml",
-    "bugs/issue-2257df466e56d29a07b2ecc2453296d9d1401d77.yaml",
-    "bugs/issue-d84ed3471e4dd2930795446dca750c20700746e0.yaml",
-    "bugs/project.yaml",
     "files/Physics.xlsx",
     "lib/soroban.rb",
     "lib/soroban/cell.rb",
@@ -66,7 +62,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/agworld/soroban"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.summary = "Soroban is a calculating engine that understands Excel formulas."
 
   if s.respond_to? :specification_version then
@@ -77,20 +73,17 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rubyXL>, ["~> 1.2.7"])
       s.add_development_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_development_dependency(%q<rubyzip>, [">= 0.9.4"])
-      s.add_development_dependency(%q<ditz>, [">= 0"])
     else
       s.add_dependency(%q<treetop>, ["~> 1.4.10"])
       s.add_dependency(%q<rubyXL>, ["~> 1.2.7"])
       s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
       s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
-      s.add_dependency(%q<ditz>, [">= 0"])
     end
   else
     s.add_dependency(%q<treetop>, ["~> 1.4.10"])
     s.add_dependency(%q<rubyXL>, ["~> 1.2.7"])
     s.add_dependency(%q<nokogiri>, [">= 1.4.4"])
     s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
-    s.add_dependency(%q<ditz>, [">= 0"])
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/soroban/parser/grammar.rb

@@ -1185,6 +1185,18 @@ module Soroban
     r0
   end
 
+  module Number0
+    def float
+      elements[1]
+    end
+  end
+
+  module Number1
+    def integer
+      elements[1]
+    end
+  end
+
   def _nt_number
     start_index = index
     if node_cache[:number].has_key?(index)
@@ -1205,8 +1217,56 @@ module Soroban
       if r2
         r0 = r2
       else
-        @index = i0
-        r0 = nil
+        i3, s3 = index, []
+        if has_terminal?('-', false, index)
+          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('-')
+          r4 = nil
+        end
+        s3 << r4
+        if r4
+          r5 = _nt_float
+          s3 << r5
+        end
+        if s3.last
+          r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+          r3.extend(Number0)
+        else
+          @index = i3
+          r3 = nil
+        end
+        if r3
+          r0 = r3
+        else
+          i6, s6 = index, []
+          if has_terminal?('-', false, index)
+            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('-')
+            r7 = nil
+          end
+          s6 << r7
+          if r7
+            r8 = _nt_integer
+            s6 << r8
+          end
+          if s6.last
+            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            r6.extend(Number1)
+          else
+            @index = i6
+            r6 = nil
+          end
+          if r6
+            r0 = r6
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
       end
     end
 

data/lib/soroban/parser/grammar.treetop

@@ -42,7 +42,7 @@ grammar Soroban
     logical ( space? ',' space? logical )*
   end
   rule number
-    float / integer
+    ( float / integer / '-' float / '-' integer )
   end
   rule float
     [0-9]* '.' [0-9]+

data/lib/soroban/sheet.rb

@@ -11,7 +11,8 @@ module Soroban
     attr_reader :bindings
 
     # Creates a new sheet.
-    def initialize
+    def initialize(logger=nil)
+      @logger = logger
       @cells = {}
       @bindings = {}
     end
@@ -30,8 +31,10 @@ module Soroban
     # Set the contents of one or more cells or ranges.
     def set(options_hash)
       options_hash.each do |label_or_range, contents|
+        _debug("setting '#{label_or_range}' to '#{contents}'")
         unless range = Soroban::getRange(label_or_range)
-          return _add(label_or_range, contents)
+          _add(label_or_range, contents)
+          next
         end
         fc, fr, tc, tr = range
         if fc == tc || fr == tr
@@ -52,6 +55,7 @@ module Soroban
     # Retrieve the contents of a cell.
     def get(label_or_name)
       label = @bindings[label_or_name.to_sym] || label_or_name
+      _debug("retrieving '#{label_or_name}' from '#{label}'}")
       if Soroban::range?(label)
         walk(label)
       else
@@ -62,6 +66,7 @@ module Soroban
     # Bind one or more named variables to a cell.
     def bind(options_hash)
       options_hash.each do |name, label_or_range|
+        _debug("binding '#{name}' to '#{label_or_range}'}")
         if Soroban::range?(label_or_range)
           LabelWalker.new(label_or_range).each do |label|
             next if @cells.keys.include?(label.to_sym)
@@ -96,6 +101,11 @@ module Soroban
 
   private
 
+    def _debug(message)
+      return if @logger.nil?
+      @logger.debug "SOROBAN: #{message}"
+    end
+
     def _add(label, contents)
       internal = "@#{label}"
       _expose(internal, label)

data/spec/documentation_spec.rb

@@ -30,6 +30,8 @@ describe "Documentation" do
 
     # Bindings
 
+    s = Soroban::Sheet.new()
+
     s.set(:A1 => 'hello', 'B1:B5' => [1,2,3,4,5])
 
     s.bind(:foo => :A1, :bar => 'B1:B5')
@@ -47,6 +49,8 @@ describe "Documentation" do
 
     # Persistence
 
+    s = Soroban::Sheet.new()
+
     s.F1 = "= E1 + SUM(D1:D5)"
 
     s.missing             # => [:E1, :D1, :D2, :D3, :D4, :D5]

data/spec/import_spec.rb

@@ -1,6 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Documentation", :if => Gem.available?("rubyXL") do
+has_rubyxl = begin
+  Gem::Specification::find_by_name("rubyXL") 
+rescue Gem::LoadError
+  false
+end
+
+describe "Documentation", :if => has_rubyxl do
 
   it "can import xlsx files using RubyXL" do
 

data/spec/soroban_spec.rb

@@ -104,4 +104,11 @@ describe "Soroban" do
     }.should raise_error(Soroban::ParseError)
   end
 
+  it "can handle negative numbers" do
+    sheet.set(:A1 => -10)
+    sheet.set(:A2 => "-20")
+    sheet.set(:A3 => '=-10+A2-A1')
+    sheet.A3.should eq(-20)
+  end
+
 end

metadata

@@ -1,110 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: soroban
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Jason Hutchens
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: treetop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.10
   type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 4
-        - 10
+      - !ruby/object:Gem::Version
         version: 1.4.10
-  version_requirements: *id001
-  name: treetop
-- !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency
+  name: rubyXL
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 2
-        - 7
+      - !ruby/object:Gem::Version
         version: 1.2.7
-  version_requirements: *id002
-  name: rubyXL
-- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
-  version_requirements: *id003
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.7
+- !ruby/object:Gem::Dependency
   name: nokogiri
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
   type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  version_requirements: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+- !ruby/object:Gem::Dependency
   name: rubyzip
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
   type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-  name: ditz
-description: Soroban makes it easy to extract and execute formulas from Excel spreadsheets. It rewrites Excel formulas as Ruby expressions, and allows you to bind named variables to spreadsheet cells to easily manipulate inputs and capture outputs.
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.4
+description: Soroban makes it easy to extract and execute formulas from Excel spreadsheets.
+  It rewrites Excel formulas as Ruby expressions, and allows you to bind named variables
+  to spreadsheet cells to easily manipulate inputs and capture outputs.
 email: jason.hutchens@agworld.com.au
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - .travis.yml
@@ -116,10 +96,6 @@ files:
 - Rakefile
 - Soroban.gemspec
 - VERSION
-- bugs/issue-096ca8b758759b2b32d9c58a88a2ab05672336b8.yaml
-- bugs/issue-2257df466e56d29a07b2ecc2453296d9d1401d77.yaml
-- bugs/issue-d84ed3471e4dd2930795446dca750c20700746e0.yaml
-- bugs/project.yaml
 - files/Physics.xlsx
 - lib/soroban.rb
 - lib/soroban/cell.rb
@@ -151,37 +127,31 @@ files:
 - spec/soroban_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/agworld/soroban
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1741913376236821456
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Soroban is a calculating engine that understands Excel formulas.
 test_files: []
-

data/bugs/issue-096ca8b758759b2b32d9c58a88a2ab05672336b8.yaml

@@ -1,18 +0,0 @@
---- !ditz.rubyforge.org,2008-03-06/issue 
-title: Implement dump and restore as a JSON blob
-desc: Dump the entire state out as a JSON blob, and load it back in. Write tests. Makes for easy serialisation.
-type: :task
-component: soroban
-release: 
-reporter: Jason Hutchens <jason@agworld.com.au>
-status: :unstarted
-disposition: 
-creation_time: 2012-05-03 07:50:15.815354 Z
-references: []
-
-id: 096ca8b758759b2b32d9c58a88a2ab05672336b8
-log_events: 
-- - 2012-05-03 07:50:20.319126 Z
-  - Jason Hutchens <jason@agworld.com.au>
-  - created
-  - ""

data/bugs/issue-2257df466e56d29a07b2ecc2453296d9d1401d77.yaml

@@ -1,18 +0,0 @@
---- !ditz.rubyforge.org,2008-03-06/issue 
-title: Fix issue with importing rows of equations
-desc: I have a sheet where the same equation has been copied/pasted between cells, and it only gets imported once.
-type: :bugfix
-component: soroban
-release: 
-reporter: Jason Hutchens <jason@agworld.com.au>
-status: :unstarted
-disposition: 
-creation_time: 2012-05-03 07:51:21.582499 Z
-references: []
-
-id: 2257df466e56d29a07b2ecc2453296d9d1401d77
-log_events: 
-- - 2012-05-03 07:51:24.022969 Z
-  - Jason Hutchens <jason@agworld.com.au>
-  - created
-  - ""

data/bugs/issue-d84ed3471e4dd2930795446dca750c20700746e0.yaml

@@ -1,18 +0,0 @@
---- !ditz.rubyforge.org,2008-03-06/issue 
-title: Rewrite formulas as valud Javascript
-desc: Soroban currently rewrites formulas as valid Ruby for execution on the server. It is possible to rewrite as valid JS code for execution on the client. Do this thing.
-type: :feature
-component: soroban
-release: 
-reporter: Jason Hutchens <jason@agworld.com.au>
-status: :unstarted
-disposition: 
-creation_time: 2012-05-03 07:52:17.446014 Z
-references: []
-
-id: d84ed3471e4dd2930795446dca750c20700746e0
-log_events: 
-- - 2012-05-03 07:52:19.141383 Z
-  - Jason Hutchens <jason@agworld.com.au>
-  - created
-  - ""

data/bugs/project.yaml

@@ -1,8 +0,0 @@
---- !ditz.rubyforge.org,2008-03-06/project 
-name: soroban
-version: "0.5"
-components: 
-- !ditz.rubyforge.org,2008-03-06/component 
-  name: soroban
-releases: []
-