spreadshit 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8458cafa69246fc6038f2ac8a6823569e39de820
-  data.tar.gz: 2982c754d56740b6234255cf2c90c50b141f78cd
+  metadata.gz: 3b8708f78a939f35fc9529dd41df30a084580930
+  data.tar.gz: a49ecd2eaa4f5565520cb6da994468532d91b3ab
 SHA512:
-  metadata.gz: 0cc85771b717af20087bc7ee1a64da872a26143f6e40d2682acf8afe093eb850193e2737ab2676f5ff1a657b9c3f2523592028583d0516a5c30c2497aab575a7
-  data.tar.gz: 497cb849983596238a0a49b742517c126ddc4473abe2a730ba4540a03a1faee053a0eb74be2fedb0cdc05a538d875424e32fb84c7e9f8db58fac5919c2ab2a0b
+  metadata.gz: 1379f58cb3098c6e12ed2c755651e629da2156a7e4f5de3a35b7e590c693d3ad74ab19978b5260a8b0f62eec86b4cdff1cf9d8cb667d11805238d9bf5defd6cc
+  data.tar.gz: 4d9731115926c43cf44a975c6b3dc7dfda4131b756d2ed383d98a7bffaa5d12775fbe4fdbb7d177e7124333693502d99c67940cd9d5482a8d67cde34d83c221a

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+pkg/

data/lib/spreadshit.rb

@@ -1,4 +1,5 @@
 class Spreadshit
+  require "spreadshit/cell"
   require "spreadshit/formula"
   require "spreadshit/functions"
 
@@ -64,49 +65,3 @@ class Spreadshit
     end
   end
 end
-
-class Cell
-  attr_reader :raw
-
-  def initialize(raw = "", &expression)
-    @raw = raw
-    @observers = Set.new
-    @observed = []
-    update(&expression) if block_given?
-  end
-
-  def value
-    if @@caller
-      @observers << @@caller
-      @@caller.observed << self
-    end
-    @value
-  end
-
-  def update(value = raw || "", &expression)
-    @raw = value
-    @expression = expression
-    compute
-    @value
-  end
-
-  protected
-
-  attr_reader :observers, :observed
-
-  def compute
-    @observed.each { |observed| observed.observers.delete(self) }
-    @observed = []
-
-    @@caller = self
-    new_value = @expression.call
-    @@caller = nil
-
-    if new_value != @value
-      @value = new_value
-      observers = @observers
-      @observers = Set.new
-      observers.each { |observer| observer.compute }
-    end
-  end
-end

data/lib/spreadshit/cell.rb

@@ -0,0 +1,45 @@
+class Spreadshit::Cell
+  attr_reader :raw
+
+  def initialize(raw = "", &expression)
+    @raw = raw
+    @observers = Set.new
+    @observed = []
+    update(&expression) if block_given?
+  end
+
+  def value
+    if @@caller
+      @observers << @@caller
+      @@caller.observed << self
+    end
+    @value
+  end
+
+  def update(value = raw || "", &expression)
+    @raw = value
+    @expression = expression
+    compute
+    @value
+  end
+
+  protected
+
+  attr_reader :observers, :observed
+
+  def compute
+    @observed.each { |observed| observed.observers.delete(self) }
+    @observed = []
+
+    @@caller = self
+    new_value = @expression.call
+    @@caller = nil
+
+    if new_value != @value
+      @value = new_value
+      observers = @observers
+      @observers = Set.new
+      observers.each { |observer| observer.compute }
+    end
+  end
+end

data/lib/spreadshit/version.rb

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

data/lib/spreadshit/window.rb

@@ -1,263 +1,265 @@
 require "curses"
 
-class Spreadshit::Window
-  class Address < Struct.new(:col, :row)
-    def to_s
-      [col, row].join
-    end
+class Spreadshit
+  class Window
+    class Address < Struct.new(:col, :row)
+      def to_s
+        [col, row].join
+      end
 
-    def to_sym
-      to_s.to_sym
+      def to_sym
+        to_s.to_sym
+      end
     end
-  end
 
-  class SpreadsheetDelegate
-    def initialize
-      @cell_updated, @cell_value, @cell_content = Proc.new {}
-    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
+      def cell_updated(&block)
+        if block_given?
+          @cell_updated = block
+        else
+          @cell_updated
+        end
       end
-    end
 
-    def cell_value(&block)
-      if block_given?
-        @cell_value = block
-      else
-        @cell_value
+      def cell_value(&block)
+        if block_given?
+          @cell_value = block
+        else
+          @cell_value
+        end
       end
-    end
 
-    def cell_content(&block)
-      if block_given?
-        @cell_content = block
-      else
-        @cell_content
+      def cell_content(&block)
+        if block_given?
+          @cell_content = block
+        else
+          @cell_content
+        end
       end
     end
-  end
 
-  include Curses
+    include Curses
 
-  def initialize
-    @mode = :navigation
-    @x, @y = 0, 0
-    @sx, @sy = 0, 0
-    @col_width = 13
-    @letters = ("A".."ZZZ").to_a
-    @spreadsheet_delegate = SpreadsheetDelegate.new
-    yield @spreadsheet_delegate
-  end
-
-  def start
-    init_screen
-    start_color
-    init_pair(COLOR_WHITE, COLOR_BLACK, COLOR_WHITE)
-    init_pair(COLOR_BLUE, COLOR_BLACK, COLOR_BLUE)
-    init_pair(COLOR_GREEN, COLOR_BLACK, COLOR_GREEN)
-    init_pair(COLOR_RED, COLOR_BLACK, COLOR_MAGENTA)
-    use_default_colors
-    redraw
-
-    loop { capture_input }
-  end
-
-  private
+    def initialize
+      @mode = :navigation
+      @x, @y = 0, 0
+      @sx, @sy = 0, 0
+      @col_width = 13
+      @letters = ("A".."ZZZ").to_a
+      @spreadsheet_delegate = SpreadsheetDelegate.new
+      yield @spreadsheet_delegate
+    end
 
-  def max_cols
-    cols / @col_width
-  end
+    def start
+      init_screen
+      start_color
+      init_pair(COLOR_WHITE, COLOR_BLACK, COLOR_WHITE)
+      init_pair(COLOR_BLUE, COLOR_BLACK, COLOR_BLUE)
+      init_pair(COLOR_GREEN, COLOR_BLACK, COLOR_GREEN)
+      init_pair(COLOR_RED, COLOR_BLACK, COLOR_MAGENTA)
+      use_default_colors
+      redraw
+
+      loop { capture_input }
+    end
 
-  def max_rows
-    lines - 3
-  end
+    private
 
-  def address
-    Address.new(@letters[@x], @y + 1)
-  end
+    def max_cols
+      cols / @col_width
+    end
 
-  def current_cell_value
-    cell_value_at(address)
-  end
+    def max_rows
+      lines - 3
+    end
 
-  def cell_value_at(address)
-    @spreadsheet_delegate.cell_value.call(address)
-  end
+    def address
+      Address.new(@letters[@x], @y + 1)
+    end
 
-  def current_cell_content
-    @spreadsheet_delegate.cell_content.call(address)
-  end
+    def current_cell_value
+      cell_value_at(address)
+    end
 
-  def current_cell_content=(value)
-    @spreadsheet_delegate.cell_updated.call(address, value)
-  end
+    def cell_value_at(address)
+      @spreadsheet_delegate.cell_value.call(address)
+    end
 
-  def capture_input
-    case @mode
-    when :navigation
-      navigate
-    when :edit
-      read_cell_definition
+    def current_cell_content
+      @spreadsheet_delegate.cell_content.call(address)
     end
-  end
 
-  def navigate
-    cbreak
-    noecho
-    stdscr.keypad = true
-    case getch
-    when KEY_UP
-      @y -= 1
-      @y = 0 if @y < 0
-      @sy -= 1 if @y < @sy
-      @sy = 0 if @sy < 0
-    when KEY_DOWN
-      @y += 1
-      @sy += 1 if @y >= max_rows
-    when KEY_LEFT
-      @x -= 1
-      @x = 0 if @x < 0
-      @sx -= 1 if @x < @sx
-      @sx = 0 if @sx < 0
-    when KEY_RIGHT
-      @x += 1
-      @sx += 1 if @x >= max_cols
-    when 10
-      @mode = :edit
-    when 27
-      exit 0
-    else
-      return
+    def current_cell_content=(value)
+      @spreadsheet_delegate.cell_updated.call(address, value)
     end
 
-    redraw
-  end
+    def capture_input
+      case @mode
+      when :navigation
+        navigate
+      when :edit
+        read_cell_definition
+      end
+    end
 
-  def read_cell_definition
-    echo
-    self.current_cell_content = getstr
-    @mode = :navigation
-    redraw
-  end
+    def navigate
+      cbreak
+      noecho
+      stdscr.keypad = true
+      case getch
+      when KEY_UP
+        @y -= 1
+        @y = 0 if @y < 0
+        @sy -= 1 if @y < @sy
+        @sy = 0 if @sy < 0
+      when KEY_DOWN
+        @y += 1
+        @sy += 1 if @y >= max_rows
+      when KEY_LEFT
+        @x -= 1
+        @x = 0 if @x < 0
+        @sx -= 1 if @x < @sx
+        @sx = 0 if @sx < 0
+      when KEY_RIGHT
+        @x += 1
+        @sx += 1 if @x >= max_cols
+      when 10
+        @mode = :edit
+      when 27
+        exit 0
+      else
+        return
+      end
 
-  def redraw
-    draw_cells
-    draw_letters_header
-    draw_numbers_header
-    draw_text_field
-    cursor_to_input_line
-    refresh
-  end
+      redraw
+    end
 
-  def draw_text_field
-    setpos(divider_line, 0)
+    def read_cell_definition
+      echo
+      self.current_cell_content = getstr
+      @mode = :navigation
+      redraw
+    end
 
-    case @mode
-    when :navigation
-      draw_divider(
-        color: color_pair(COLOR_RED) | A_NORMAL,
-        left_text: current_cell_value.to_s,
-        center_text: "Press ENTER to edit #{address}",
-      )
-      cursor_to_input_line
-      addstr(current_cell_content.to_s)
-      clrtoeol
-    when :edit
-      draw_divider(
-        color: color_pair(COLOR_GREEN) | A_NORMAL,
-        left_text: current_cell_content.to_s,
-        center_text: "Editing #{address}"
-      )
+    def redraw
+      draw_cells
+      draw_letters_header
+      draw_numbers_header
+      draw_text_field
       cursor_to_input_line
-      clrtoeol
+      refresh
     end
-  end
 
-  def draw_divider(color: color_pair(COLOR_GREEN) | A_NORMAL, left_text: "", right_text: "", center_text: "")
-    attron color do
+    def draw_text_field
       setpos(divider_line, 0)
-      addstr(" " * cols)
 
-      setpos(divider_line, 2)
-      addstr(left_text.ljust(cols / 3))
+      case @mode
+      when :navigation
+        draw_divider(
+          color: color_pair(COLOR_RED) | A_NORMAL,
+          left_text: current_cell_value.to_s,
+          center_text: "Press ENTER to edit #{address}",
+        )
+        cursor_to_input_line
+        addstr(current_cell_content.to_s)
+        clrtoeol
+      when :edit
+        draw_divider(
+          color: color_pair(COLOR_GREEN) | A_NORMAL,
+          left_text: current_cell_content.to_s,
+          center_text: "Editing #{address}"
+        )
+        cursor_to_input_line
+        clrtoeol
+      end
+    end
 
-      setpos(divider_line, cols / 3)
-      addstr(center_text.center(cols / 3))
+    def draw_divider(color: color_pair(COLOR_GREEN) | A_NORMAL, left_text: "", right_text: "", center_text: "")
+      attron color do
+        setpos(divider_line, 0)
+        addstr(" " * cols)
 
-      setpos(divider_line, cols - right_text.size - 2)
-      addstr(right_text)
+        setpos(divider_line, 2)
+        addstr(left_text.ljust(cols / 3))
+
+        setpos(divider_line, cols / 3)
+        addstr(center_text.center(cols / 3))
+
+        setpos(divider_line, cols - right_text.size - 2)
+        addstr(right_text)
+      end
     end
-  end
 
-  def visible_letters
-    (@sx...max_cols + @sx).map { |col| @letters[col] }
-  end
+    def visible_letters
+      (@sx...max_cols + @sx).map { |col| @letters[col] }
+    end
 
-  def selected?(row, col)
-    address.col == col && address.row == (@sy + row)
-  end
+    def selected?(row, col)
+      address.col == col && address.row == (@sy + row)
+    end
 
-  def draw_cells(padding: 4)
-    1.upto(max_rows).each do |row|
-      visible_letters.each.with_index do |col, index|
-        setpos(row, padding + index * @col_width)
+    def draw_cells(padding: 4)
+      1.upto(max_rows).each do |row|
+        visible_letters.each.with_index do |col, index|
+          setpos(row, padding + index * @col_width)
 
-        if selected? row, col
-          attron(color_pair(@mode == :edit ? COLOR_GREEN : COLOR_WHITE) | A_TOP) do
+          if selected? row, col
+            attron(color_pair(@mode == :edit ? COLOR_GREEN : COLOR_WHITE) | A_TOP) do
+              draw_cell @sy + row, col
+            end
+          else
             draw_cell @sy + row, col
           end
-        else
-          draw_cell @sy + row, col
         end
       end
     end
-  end
 
-  def draw_letters_header(padding: 4, color: COLOR_BLUE)
-    visible_letters.each.with_index do |letter, index|
-      setpos(0, padding + index * @col_width)
+    def draw_letters_header(padding: 4, color: COLOR_BLUE)
+      visible_letters.each.with_index do |letter, index|
+        setpos(0, padding + index * @col_width)
 
-      attron(color_pair(color) | A_TOP) do
-        addstr(letter.center(@col_width))
+        attron(color_pair(color) | A_TOP) do
+          addstr(letter.center(@col_width))
+        end
       end
     end
-  end
 
-  def draw_numbers_header(padding: 4, color: COLOR_BLUE)
-    1.upto(max_rows).each.with_index do |row, index|
-      setpos(row, 0)
+    def draw_numbers_header(padding: 4, color: COLOR_BLUE)
+      1.upto(max_rows).each.with_index do |row, index|
+        setpos(row, 0)
 
-      attron(color_pair(COLOR_BLUE) | A_TOP) do
-        addstr (@sy + row).to_s.rjust(padding)
+        attron(color_pair(COLOR_BLUE) | A_TOP) do
+          addstr (@sy + row).to_s.rjust(padding)
+        end
       end
     end
-  end
 
-  def draw_cell(row, col)
-    value = cell_value_at(Address.new(col, row)).to_s
+    def draw_cell(row, col)
+      value = cell_value_at(Address.new(col, row)).to_s
 
-    if value == Float::NAN.to_s
-      addstr("#VALUE!".center(@col_width))
-    elsif value.size >= @col_width
-      addstr(value.chars.last(@col_width).join)
-    else
-      addstr(value.rjust(@col_width))
+      if value == Float::NAN.to_s
+        addstr("#VALUE!".center(@col_width))
+      elsif value.size >= @col_width
+        addstr(value.chars.last(@col_width).join)
+      else
+        addstr(value.rjust(@col_width))
+      end
     end
-  end
 
-  def input_line
-    lines - 1
-  end
+    def input_line
+      lines - 1
+    end
 
-  def divider_line
-    lines - 2
-  end
+    def divider_line
+      lines - 2
+    end
 
-  def cursor_to_input_line
-    setpos(input_line, 2)
+    def cursor_to_input_line
+      setpos(input_line, 2)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadshit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rodrigo Navarro
@@ -81,6 +81,7 @@ files:
 - bin/demo
 - bin/setup
 - lib/spreadshit.rb
+- lib/spreadshit/cell.rb
 - lib/spreadshit/formula.rb
 - lib/spreadshit/formula.treetop
 - lib/spreadshit/functions.rb