mars_base_10 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d66886ffab2da6f395505f68090aa88ea77f7e9bb17669c79a562d9298338227
-  data.tar.gz: '084f5515249cad9b00649ccf84743e848e835cc3b234f95608efb6bcd5bf5ab7'
+  metadata.gz: fd093ec957e418592f791bb2dfc1e1e7efa56973fd553534278a6dcb818f3482
+  data.tar.gz: 478b185df1d0c2280788691e4bd61bfac817c200348e63bb29a7a36e05f1eb84
 SHA512:
-  metadata.gz: 8c4284d80f4071dfde88bef0f7cf1dfa2f684675a8861b13527740f891bf67bb59e48a6cc95afe627425d1017cd6f355ba8075def3e144ac0066287d90c84ab3
-  data.tar.gz: 46fdbcd3ddae7f293f21bd067c042555ce235daef318f4431edc2d30ea05ce92f0783bf96c7103455f3c41f15f1c2f2f94b8dc5382780d7a6ea4f2fb89e6e052
+  metadata.gz: e9044477c9eb149f2212f5dd5e7e44eb8d0fa247e0db7a382aa5256708ba53027e8c48c18f992b4c2c7dde36281cd5f725f86662283d71f713f50ed6a08662a2
+  data.tar.gz: ac4c86d4ab841a92e262138bdf6a290af01d93e65d1afe514d6076681bb217dc59bde4ec2e90ccd3e10d4936ae298387ae0d662565e3030e88658a1f0a78deb6

data/lib/mars_base_10/action_bar.rb

@@ -11,7 +11,7 @@ module MarsBase10
     end
 
     def self.Default
-      ActionBar.new actions: {'j': 'Move Down', 'k': 'Move Up', 'q': 'Quit'}
+      ActionBar.new actions: {'j': 'Move Down', 'k': 'Move Up', 'J': 'Page Down', 'K': 'Page Up', 'q': 'Quit'}
     end
 
     def actions_first_col

data/lib/mars_base_10/comm_central.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'urbit/urbit'
+require 'urbit'
 
 require_relative  'graph_rover'
 require_relative  'viewport'

data/lib/mars_base_10/graph_rover.rb

@@ -14,66 +14,69 @@ module MarsBase10
       @viewport = viewport
       @viewport.controller = self
 
-      @panes = []
+      self.wire_up_panes
+      self.viewport.action_bar = ActionBar.Default.add_action({'i': 'Inspect'})
+      self.viewport.activate pane: @graph_list_pane
+      self.resync
+    end
 
-      # The graph list is a fixed width, variable height (full screen) pane on the left.
-      @graph_list_pane = @viewport.add_pane width_pct: 0.3
-      @graph_list_pane.viewing subject: @ship.graph_names
+    def active_node_index
+      @node_list_pane.current_subject_index
+    end
 
-      # The node list is a variable width, fixed height pane in the upper right.
-      @node_list_pane = @viewport.add_variable_width_pane at_col: @graph_list_pane.last_col,
-                                                          height_pct: 0.5
-      @node_list_pane.viewing subject: @ship.node_list
+    def active_node
+      self.ship.fetch_node(resource: self.active_resource, index: self.active_node_index)
+    end
 
-      # The single node viewer is a variable width, variable height pane in the lower right.
-      @node_view_pane = @viewport.add_variable_both_pane at_row: @node_list_pane.last_row,
-                                                         at_col: @graph_list_pane.last_col
-      @node_view_pane.viewing subject: @ship.node
+    def active_resource
+      @graph_list_pane.current_subject_index
+    end
 
-      self.viewport.action_bar = ActionBar.Default.add_action({'i': 'Inspect'})
-      self.viewport.activate pane: @graph_list_pane
-      self.resync
+    def load_history
+      return 0 unless @node_list_pane == self.viewport.active_pane
+      new_content = self.ship.fetch_older_nodes(resource: self.active_resource, node: self.active_node)
+      @node_list_pane.subject.prepend_content(ary: new_content)
+      new_content.length
     end
 
     #
     # Called by a pane in this controller for bubbling a key press up
     #
     def send(key:)
+      resync_needed = true
       case key
       when 'd'    # (D)ive
         begin
           if @node_view_pane.subject.contents[4].include?('true')
             self.viewport.action_bar.add_action({'p': 'Pop Out'})
-            resource = @graph_list_pane.current_subject
-            node_index = @node_list_pane.current_subject
-            @stack.push(resource)
+            @stack.push(self.active_resource)
             @node_list_pane.clear
-            @node_list_pane.subject.contents = self.ship.fetch_node_children resource: resource, index: node_index
-            @node_list_pane.index = 0
+            @node_list_pane.subject.contents = self.ship.fetch_node_children(resource: self.active_resource, index: self.active_node_index)
           end
         end
       when 'i'    # (I)nspect
         begin
           self.viewport.activate pane: @node_list_pane
           self.viewport.action_bar = ActionBar.Default.add_action({'d': 'Dive In', 'g': 'Graph List'})
+          resync_needed = false
         end
       when 'g'    # (G)raph View
         unless @graph_list_pane.active?
           self.viewport.activate pane: @graph_list_pane
+          # resync_needed = false
         end
       when 'p'    # (P)op
         begin
           if (resource = @stack.pop)
             @node_list_pane.clear
             @node_list_pane.subject.contents = self.ship.fetch_node_list(resource: resource)
-            @node_list_pane.index = 0
           end
           if (@stack.length == 0)
             self.viewport.action_bar.remove_action(:p)
           end
         end
       end
-      self.resync
+      self.resync if resync_needed
     end
 
     def start
@@ -87,25 +90,24 @@ module MarsBase10
     private
 
     def resync
-      self.resync_node_view(self.resync_node_list)
+      self.resync_node_list
+      self.resync_node_view
     end
 
     def resync_node_list
-      resource = @graph_list_pane.current_subject
       if @graph_list_pane == self.viewport.active_pane
-        @node_list_pane.subject.title = "Nodes of #{resource}"
         @node_list_pane.clear
-        @node_list_pane.subject.first_row = 0
-        @node_list_pane.subject.contents = self.ship.fetch_node_list resource: resource
+        @node_list_pane.subject.title = "Nodes of #{self.active_resource}"
+        @node_list_pane.subject.contents = self.ship.fetch_node_list(resource: self.active_resource)
       end
-      resource
+      nil
     end
 
-    def resync_node_view(resource)
-      node_index = @node_list_pane.current_subject
-      @node_view_pane.subject.title = "Node #{self.short_index node_index}"
+    def resync_node_view
+      @node_view_pane.subject.title = "Node #{self.short_index self.active_node_index}"
       @node_view_pane.clear
-      @node_view_pane.subject.contents = self.ship.fetch_node_contents(resource: resource, index: node_index)
+      @node_view_pane.subject.contents = self.ship.fetch_node_contents(resource: self.active_resource, index: self.active_node_index)
+      nil
     end
 
     def short_index(index)
@@ -113,5 +115,21 @@ module MarsBase10
       tokens = index.split('.')
       "#{tokens[0]}..#{tokens[tokens.size - 2]}.#{tokens[tokens.size - 1]}"
     end
+
+    def wire_up_panes
+      @panes = []
+
+      # The graph list is a fixed width, variable height (full screen) pane on the left.
+      @graph_list_pane = @viewport.add_pane width_pct: 0.3
+      @graph_list_pane.view(subject: @ship.graph_names)
+
+      # The node list is a variable width, fixed height pane in the upper right.
+      @node_list_pane = @viewport.add_variable_width_pane at_col: @graph_list_pane.last_col, height_pct: 0.5
+      @node_list_pane.view(subject: @ship.empty_node_list)
+
+      # The single node viewer is a variable width, variable height pane in the lower right.
+      @node_view_pane = @viewport.add_variable_both_pane at_row: @node_list_pane.last_row, at_col: @graph_list_pane.last_col
+      @node_view_pane.view(subject: @ship.empty_node)
+    end
   end
 end

data/lib/mars_base_10/pane.rb

@@ -10,11 +10,13 @@ module MarsBase10
       @top_row       = at_row
       @left_edge_col = at_col
       @height_pct    = height_pct
-      @index         = 0
-      @latch         = -1
+      @index         = 1
+      @latch         = ''
+      @latch_depth   = 0
       @subject       = nil
       @win           = nil
       @viewport      = viewport
+      @visible_content_shift = 0
       @width_pct     = width_pct
     end
 
@@ -23,6 +25,7 @@ module MarsBase10
     end
 
     def clear
+      self.reset
       self.prepare_for_writing_contents
       (0..(self.last_row - 1)).each do |item|
         self.window.setpos(self.draw_row, self.draw_col)
@@ -32,19 +35,35 @@ module MarsBase10
       end
     end
 
-    def current_subject
-      self.subject.at index: self.index
+    def current_subject_index
+      self.subject.at(index: self.index)
     end
 
     def draw
       self.prepare_for_writing_contents
 
-      (0..(self.max_contents_rows - 1)).each do |item|
-        self.window.setpos(self.draw_row, self.draw_col)
-        # The string here is the gutter followed by the window contents. improving the gutter is tbd.
-        self.window.attron(Curses::A_REVERSE) if item == self.index
-        self.window.addstr("#{"%02d" % item}  #{self.subject.at index: item}")
-        self.window.attroff(Curses::A_REVERSE) # if item == self.index
+      first_draw_row = self.first_row
+      last_draw_row  = self.last_drawable_row
+
+      (first_draw_row..last_draw_row).each do |index|
+        self.draw_line
+        item_index = index + @visible_content_shift
+        self.window.attron(Curses::A_REVERSE) if item_index == self.index
+
+        if self.subject.line_length_at(index: item_index) > self.last_col
+          chunks = self.subject.line_at(index: item_index).chars.each_slice(self.last_col).map(&:join)
+          chunks.each do |c|
+            self.window.addstr(c)
+            self.draw_row += 1
+            self.draw_line
+            last_draw_row -= 1  # pull the last drawing row in 1 for each new line added.
+          end
+          self.draw_row -= 1
+        else
+          self.window.addstr("#{self.subject.line_at(index: item_index)}")
+        end
+
+        self.window.attroff(Curses::A_REVERSE) if item_index == self.index
         self.window.clrtoeol
         self.draw_row += 1
       end
@@ -59,9 +78,13 @@ module MarsBase10
       self.window.attroff(Curses.color_pair(1) | Curses::A_BOLD) if self.active?
     end
 
+    def draw_line
+      self.window.setpos(self.draw_row, self.draw_col)
+    end
+
     def draw_title
       self.window.setpos(0, 2)
-      self.window.addstr(" #{self.subject.title} (#{self.subject.rows} total) ")
+      self.window.addstr(" #{self.subject.title} (#{self.max_contents_rows} total) ")
     end
 
     def first_col
@@ -73,7 +96,7 @@ module MarsBase10
     end
 
     def gutter_width
-      4
+      self.subject.index_width
     end
 
     #
@@ -83,6 +106,10 @@ module MarsBase10
       [(self.viewport.max_cols * self.width_pct).floor, self.min_column_width].max
     end
 
+    def last_drawable_row
+      [self.last_visible_row, self.max_contents_rows].min
+    end
+
     #
     # This is the _relative_ last row, e.g. the height of the pane in columns.
     #
@@ -90,19 +117,23 @@ module MarsBase10
       (self.viewport.max_rows * self.height_pct).floor
     end
 
+    def last_visible_row
+      self.last_row - 2
+    end
+
     #
     # The pane is latched if it has consumed 1 key 0-9 and is awaiting the next key.
     #
     def latched?
-      self.latch != -1
+      @latch_depth > 0
     end
 
     def max_contents_rows
-      self.subject.rows
+      self.subject.item_index_range.last
     end
 
     def min_column_width
-      self.gutter_width + self.subject.cols + self.right_pad
+      self.gutter_width + self.subject.max_content_width + self.right_pad
     end
 
     def prepare_for_writing_contents
@@ -121,17 +152,27 @@ module MarsBase10
       key = self.window.getch.to_s
       case key
       when 'j'
-        self.set_row(self.index + 1)
+        self.index = self.set_row(self.index + 1)
       when 'k'
-        self.set_row(self.index - 1)
+        self.index = self.set_row(self.index - 1)
+      when 'J'
+        self.index = self.set_row([self.index + (self.last_visible_row), self.max_contents_rows].min)
+      when 'K'
+        self.index = self.set_row(self.index - (self.last_visible_row))
       when 'q'
         exit 0
       when ('0'..'9')
         if self.latched?
-          self.set_row((self.latch * 10) + key.to_i)
-          self.latch = -1
+          self.latch << key
+          @latch_depth += 1
+          if @latch_depth == self.gutter_width
+            self.index = self.set_row(self.latch.to_i)
+            self.latch = ""
+            @latch_depth = 0
+          end
         else
-          self.latch = key.to_i
+          self.latch = key
+          @latch_depth = 1
         end
       end
 
@@ -139,38 +180,54 @@ module MarsBase10
       self.viewport.controller.send key: key
     end
 
+    def reset
+      @index = 1
+      @latch = ''
+      @latch_depth = 0
+      @visible_content_shift = 0
+    end
+
     def right_pad
       2
     end
 
+    def scroll_to_row(index)
+      if index > self.index
+        # Scrolling down
+        @visible_content_shift = [(index - self.last_drawable_row), 0].max
+      else
+        # Scrolling up
+        @visible_content_shift = [(index - self.first_row), 0].max
+      end
+      [index, 1].max
+    end
+
     #
     # this is a no-op if the index is out of range
     #
     def set_row(i)
-      self.subject.scroll_limit = [self.last_row - 1, self.max_contents_rows].min
-
-      if (i < 0)
-       self.subject.scroll_up
-       i = 0
-      end
+      return i if self.visible_content_range.include?(i)
 
       # If we've reached the end of the content, it's a no-op.
-       if (i >= self.max_contents_rows)
-         i -= 1
-      end
+      current_index = self.index
+      return self.max_contents_rows if (i > self.max_contents_rows)
 
-      if (i >= self.last_row - 2)
-        self.subject.scroll_down
-        i -= 1
+      # Check if we have tried to move "above" the visible screen limit (i = 1) and retrieve more items, if possible.
+      if (i < 1)
+        i = [self.viewport.controller.load_history, 1].max
       end
 
-      self.index = i # if (i <= self.max_contents_rows) && (i >= 0)
+      return self.scroll_to_row(i)
     end
 
-    def viewing(subject:)
+    def view(subject:)
       @subject = subject
     end
 
+    def visible_content_range
+      ((self.first_row + @visible_content_shift)..(self.last_drawable_row + @visible_content_shift))
+    end
+
     def window
       return @win if @win
       @win = Curses::Window.new(self.last_row, self.last_col, self.top_row, self.left_edge_col)

data/lib/mars_base_10/ship.rb

@@ -8,18 +8,18 @@ module MarsBase10
       @ship = connection
     end
 
-    def graph_names
-      Subject.new title: 'Graphs', contents: @ship.graph_names
-    end
-
-    def node
+    def empty_node
       Subject.new title: 'Node', contents: []
     end
 
-    def node_list
+    def empty_node_list
       Subject.new title: 'Node List', contents: []
     end
 
+    def graph_names
+      Subject.new title: 'Graphs', contents: @ship.graph_names
+    end
+
     def fetch_node(resource:, index:)
       @ship.graph(resource: resource).node(index: index)
     end
@@ -34,7 +34,11 @@ module MarsBase10
     end
 
     def fetch_node_list(resource:)
-      @ship.graph(resource: resource).newest_nodes(count: 20).map {|node| node.index}.sort
+      @ship.graph(resource: resource).newest_nodes(count: 60).map {|node| node.index}.sort
+    end
+
+    def fetch_older_nodes(resource:, node:)
+      @ship.graph(resource: resource).older_sibling_nodes(node: node, count: 60).map {|node| node.index}.sort
     end
   end
 end

data/lib/mars_base_10/subject.rb

@@ -2,22 +2,21 @@
 
 module MarsBase10
   class Subject
-    attr_accessor :first_row, :scroll_limit, :title
+    attr_accessor :current_item, :scroll_limit, :title
 
     def initialize(title: 'Untitled', contents:)
-      @contents   = contents
-      @first_row  = 0
-      @title      = title
+      @contents     = contents
+      @title        = title
     end
 
-    # Returns the item at: the index: relative to the first_row.
-    def at(index:)
-      self.contents[self.first_row + index]
+    def prepend_content(ary:)
+      self.contents = ary + self.contents
     end
 
-    def cols
-      return @cols if @cols
-      @cols = @contents.inject(0) {|a, n| n.length > a ? n.length : a}
+    # Returns the item at: the index: relative to the current_item.
+    def at(index:)
+      index = [1, index].max
+      self.contents[index - 1]
     end
 
     def contents
@@ -25,22 +24,33 @@ module MarsBase10
     end
 
     def contents=(a_contents_array)
-      @rows = nil
-      $cols = nil
       @contents = a_contents_array
     end
 
-    def rows
-      return @rows if @rows
-      @rows = @contents.size
+    def index_width
+      [self.item_count.to_s.length, 2].max
+    end
+
+    def line_at(index:)
+      # The string here is the gutter followed by the window contents. improving the gutter is tbd.
+      "#{"%0#{self.index_width}d" % (index)}  #{self.at(index: index)}"
+    end
+
+    def line_length_at(index:)
+      return 0 if self.at(index: index).nil?
+      (self.at(index: index)).length
+    end
+
+    def item_count
+      @contents.size
     end
 
-    def scroll_down
-      self.first_row = [self.first_row + 1, (self.rows - self.scroll_limit)].min
+    def item_index_range
+      1..self.item_count
     end
 
-    def scroll_up
-      self.first_row = [self.first_row - 1, 0].max
+    def max_content_width
+      @contents.inject(0) {|a, n| n.length > a ? n.length : a}
     end
   end
 end

data/lib/mars_base_10/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MarsBase10
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/mars_base_10.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sorted_set", "~> 1.0"
   spec.add_dependency "thor",       "~> 1.1"
   spec.add_dependency "tty-font",   "~> 0.5"
-  spec.add_dependency "urbit-api",  "~> 0.2.1"
+  spec.add_dependency "urbit-api",  "~> 0.5"
 
   spec.add_development_dependency "pry",     "~> 0.13"
   spec.add_development_dependency "rspec",   "~> 3.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mars_base_10
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daryl Richter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/mb10
+- lib/.DS_Store
 - lib/mars_base_10.rb
 - lib/mars_base_10/action_bar.rb
 - lib/mars_base_10/cli.rb