spreadshit 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b8708f78a939f35fc9529dd41df30a084580930
-  data.tar.gz: a49ecd2eaa4f5565520cb6da994468532d91b3ab
+  metadata.gz: afbbc45721fdfc44ce9068c0935b1ad91bd90a0c
+  data.tar.gz: edcb00a7df61aee3315c36bfc7252666b31cc6f5
 SHA512:
-  metadata.gz: 1379f58cb3098c6e12ed2c755651e629da2156a7e4f5de3a35b7e590c693d3ad74ab19978b5260a8b0f62eec86b4cdff1cf9d8cb667d11805238d9bf5defd6cc
-  data.tar.gz: 4d9731115926c43cf44a975c6b3dc7dfda4131b756d2ed383d98a7bffaa5d12775fbe4fdbb7d177e7124333693502d99c67940cd9d5482a8d67cde34d83c221a
+  metadata.gz: 3f9f27822a3c55cd10b67d7d85397db2311a77f12f365271e18416d2a6bbbf0a962a02553a930a41d12ac2775d11e11af90a849b9f8a75550116fd9e21807a68
+  data.tar.gz: 15838fb7ba9ed67b51c6b8780c33dba4a9b0b1aadd0708555d2b03f8df67cf652ea70c80d7051fd09feb4b4d881c66636664793e084da58032faa69fc9305529

data/bin/demo

@@ -29,6 +29,8 @@ end
 window = Spreadshit::Window.new do |delegate|
   delegate.cell_updated { |address, value| sheet[address] = value }
   delegate.cell_value { |address| sheet[address] }
-  delegate.cell_content { |address| sheet.cell_at(address).raw }
+  delegate.cell_content { |address| sheet.raw(address) }
+  delegate.cell_dependents { |address| sheet.cell(address).send(:observers).map(&:address) }
+  delegate.cell_dependencies { |address| sheet.cell(address).send(:observed).map(&:address) }
 end
 window.start

data/lib/spreadshit.rb

@@ -1,10 +1,12 @@
+require "matrix"
+
 class Spreadshit
   require "spreadshit/cell"
   require "spreadshit/formula"
   require "spreadshit/functions"
 
   def initialize(parser = Formula.new, functions = Functions.new)
-    @cells = Hash.new { |hash, key| hash[key] = Cell.new }
+    @cells = Hash.new { |cells, address| cells[address] = Cell.new(address) }
     @parser = parser
     @functions = functions
   end
@@ -17,7 +19,11 @@ class Spreadshit
     @cells[address.to_sym].update(value) { parse(value) }
   end
 
-  def cell_at(address)
+  def raw(address)
+    @cells[address.to_sym].raw
+  end
+
+  def cell(address)
     @cells[address.to_sym]
   end
 
@@ -31,37 +37,34 @@ class Spreadshit
     end
   end
 
-  def eval(expression, refs = Set.new)
+  def eval(expression)
     case expression
     when Formula::Literal
       expression.content
     when Formula::Addition
-      @functions.add(eval(expression.left, refs), eval(expression.right, refs))
+      @functions.add(eval(expression.left), eval(expression.right))
     when Formula::Subtraction
-      @functions.minus(eval(expression.left, refs), eval(expression.right, refs))
+      @functions.minus(eval(expression.left), eval(expression.right))
     when Formula::Multiplication
-      @functions.multiply(eval(expression.left, refs), eval(expression.right, refs))
+      @functions.multiply(eval(expression.left), eval(expression.right))
     when Formula::Division
-      @functions.divide(eval(expression.left, refs), eval(expression.right, refs))
+      @functions.divide(eval(expression.left), eval(expression.right))
     when Formula::Function
-      @functions.send(expression.name.downcase, *expression.arguments.map { |arg| eval arg, refs })
+      @functions.send(expression.name.downcase, *expression.arguments.map { |arg| eval arg })
     when Formula::Reference
-      if refs.include? expression.address
-        "CYCLIC"
-      else
-        refs << expression.address
-        self[expression.address]
-      end
+      self[expression.address]
     when Formula::Range
-      expand_range(expression.top, expression.bottom).map { |ref| eval ref, refs }
+      expand_range(expression.top, expression.bottom).map { |ref| eval ref }
     end
   end
 
   def expand_range(top, bottom)
     cols = top.col..bottom.col
     rows = top.row..bottom.row
-    cols.flat_map do |col|
+    refs = cols.map do |col|
       rows.map { |row| Formula::Reference.new(col, row) }
     end
+
+    Matrix[*refs].transpose
   end
 end

data/lib/spreadshit/cell.rb

@@ -1,8 +1,8 @@
 class Spreadshit::Cell
-  attr_reader :raw
+  attr_reader :address, :raw
 
-  def initialize(raw = "", &expression)
-    @raw = raw
+  def initialize(address, &expression)
+    @address = address
     @observers = Set.new
     @observed = []
     update(&expression) if block_given?

data/lib/spreadshit/functions.rb

@@ -10,11 +10,15 @@ class Spreadshit::Functions
   end
 
   def sum(*args)
-    to_number args.flatten.map { |arg| to_number(arg) }.reduce(:+)
+    to_number number_list(*args).reduce(:+)
   end
 
   def average(*args)
-    to_number(sum(*args) / args.size.to_f)
+    to_number(sum(*args) / count(*args).to_f)
+  end
+
+  def count(*args)
+    args.size
   end
 
   def sqrt(number)
@@ -26,11 +30,13 @@ class Spreadshit::Functions
   end
 
   def var(*args)
-    average = average(*args)
+    mean = average(*args)
 
-    args.flatten.map { |arg| to_number(arg) }.reduce(0) do |variance, value|
-      variance + (value - average) ** 2
+    distance_from_mean = number_list(*args).reduce(0) do |total, value|
+      total + (value - mean) ** 2
     end
+
+    to_number(distance_from_mean / (count(*args) - 1).to_f)
   end
 
   def stdev(*args)
@@ -65,4 +71,8 @@ class Spreadshit::Functions
       Float::NAN
     end
   end
+
+  def number_list(*args)
+    args.map { |item| item.respond_to?(:to_a) ? item.to_a : item }.flatten.map { |arg| to_number arg }
+  end
 end

data/lib/spreadshit/version.rb

@@ -1,3 +1,3 @@
 class Spreadshit
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/spreadshit/window.rb

@@ -13,32 +13,16 @@ class Spreadshit
     end
 
     class SpreadsheetDelegate
-      def initialize
-        @cell_updated, @cell_value, @cell_content = Proc.new {}
-      end
-
-      def cell_updated(&block)
-        if block_given?
-          @cell_updated = block
-        else
-          @cell_updated
+      [:cell_updated, :cell_value, :cell_content, :cell_dependents, :cell_dependencies].each do |delegate|
+        define_method delegate do |&block|
+          block ?
+            instance_variable_set("@#{delegate}", block) :
+            instance_variable_get("@#{delegate}")
         end
       end
 
-      def cell_value(&block)
-        if block_given?
-          @cell_value = block
-        else
-          @cell_value
-        end
-      end
-
-      def cell_content(&block)
-        if block_given?
-          @cell_content = block
-        else
-          @cell_content
-        end
+      def initialize
+        @cell_updated = @cell_value = @cell_value = @cell_dependents = @cell_dependencies = Proc.new {}
       end
     end
 
@@ -50,6 +34,9 @@ class Spreadshit
       @sx, @sy = 0, 0
       @col_width = 13
       @letters = ("A".."ZZZ").to_a
+
+      @show_dependencies = false
+
       @spreadsheet_delegate = SpreadsheetDelegate.new
       yield @spreadsheet_delegate
     end
@@ -61,6 +48,8 @@ class Spreadshit
       init_pair(COLOR_BLUE, COLOR_BLACK, COLOR_BLUE)
       init_pair(COLOR_GREEN, COLOR_BLACK, COLOR_GREEN)
       init_pair(COLOR_RED, COLOR_BLACK, COLOR_MAGENTA)
+      init_pair(COLOR_YELLOW, COLOR_BLACK, COLOR_YELLOW)
+      init_pair(COLOR_CYAN, COLOR_BLACK, COLOR_CYAN)
       use_default_colors
       redraw
 
@@ -97,11 +86,22 @@ class Spreadshit
       @spreadsheet_delegate.cell_updated.call(address, value)
     end
 
+    def current_cell_dependencies
+      @spreadsheet_delegate.cell_dependencies.call(address) || []
+    end
+
+    def current_cell_dependents
+      @spreadsheet_delegate.cell_dependents.call(address) || []
+    end
+
     def capture_input
       case @mode
       when :navigation
+        curs_set(0)
         navigate
       when :edit
+        redraw
+        curs_set(2)
         read_cell_definition
       end
     end
@@ -129,6 +129,8 @@ class Spreadshit
         @sx += 1 if @x >= max_cols
       when 10
         @mode = :edit
+      when "d", "D"
+        @show_dependencies = !@show_dependencies
       when 27
         exit 0
       else
@@ -159,10 +161,16 @@ class Spreadshit
 
       case @mode
       when :navigation
+        dependencies_text = if @show_dependencies
+          " and D to hide dependencies"
+        else
+          " and D to show dependencies"
+        end
+
         draw_divider(
           color: color_pair(COLOR_RED) | A_NORMAL,
           left_text: current_cell_value.to_s,
-          center_text: "Press ENTER to edit #{address}",
+          center_text: "Press ENTER to edit #{address}" + dependencies_text
         )
         cursor_to_input_line
         addstr(current_cell_content.to_s)
@@ -212,7 +220,19 @@ class Spreadshit
               draw_cell @sy + row, col
             end
           else
-            draw_cell @sy + row, col
+            cell_address = Address.new(col, @sy + row).to_sym
+
+            if @show_dependencies && current_cell_dependencies.include?(cell_address)
+              attron(color_pair(COLOR_CYAN) | A_LOW) do
+                draw_cell @sy + row, col
+              end
+            elsif @show_dependencies && current_cell_dependents.include?(cell_address)
+              attron(color_pair(COLOR_YELLOW) | A_LOW) do
+                draw_cell @sy + row, col
+              end
+            else
+              draw_cell @sy + row, col
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadshit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rodrigo Navarro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop