mars_base_10 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ea353d6a59cf0d1ad388a521fa07a121cd94942eb4556c23ee4a11603622141
-  data.tar.gz: 6fd28ad9bd47d54172c4a3c6a0f64e5e4da244af6065ad8514f779cc388dc0c6
+  metadata.gz: b0d8748c4298354146d42d5f36cbba46c4957d2e4604b58465b365c980041089
+  data.tar.gz: b881836e892d29f0e195422690ecdb4913daf0f58daeed3170bb9b8d4eeb83c0
 SHA512:
-  metadata.gz: 248ae50be666debca25a7c253822e941af1c3ba19ac484b6e21423526497c9777419b4b2417756a565bc890afb9dc817d0eb3060eb0b7db34bab0ae5c396ac58
-  data.tar.gz: 20e525d483036e6a815f0e46a3529cdf6d1bee8e4a96bc8c32cc0d27b774331e13d1ae3c76177904da39b845224ed12cfa6b4dc3cb667e943704c75799cb7360
+  metadata.gz: 0c14c3247c13710a5a053da98bc140e14bbf501d1f4f5888aba12ca8fd54c3807352da004b82e891beaff9b0b6da286f8151e105989b0d3dad3f5705d331045d
+  data.tar.gz: 3323624dc9690b1eb539ada863729cc615c63743679a824dc21ab07e82fee61b875025c64f329df6802527884379f133a9e622a2159f11b1c406a9be245458ae

data/bin/mb10

@@ -2,10 +2,10 @@
 # frozen_string_literal: true
 
 # require "bundler/setup"
-# require "mars_base_10/comm_central"
+# require "mars_base_10/mission_control"
 
 # begin
-#   cc = MarsBase10::CommCentral.new
+#   cc = MarsBase10::MissionControl.new
 #   cc.activate
 # ensure
 #   cc.shutdown

data/lib/mars_base_10/action_bar.rb

@@ -60,8 +60,8 @@ module MarsBase10
       1
     end
 
-    def remove_action(key)
-      self.actions.delete_if {|k, v| k == key}
+    def remove_actions(keys)
+      self.actions.delete_if {|k, v| keys.include? k}
       self
     end
 

data/lib/mars_base_10/cli.rb

@@ -39,9 +39,9 @@ module MarsBase10
         invoke :help, ["launch"]
       else
         if (config)
-          require_relative "comm_central"
+          require_relative "mission_control"
           begin
-            cc = MarsBase10::CommCentral.new config_filename: config
+            cc = MarsBase10::MissionControl.new config_filename: config
             cc.activate
           ensure
             cc.shutdown

data/lib/mars_base_10/{graph_rover.rb → controller/graph_rover.rb}

@@ -1,38 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'ship'
-require_relative 'stack'
-require_relative 'subject'
+require_relative '../controller'
 
 module MarsBase10
-  class GraphRover
-    attr_reader :manager, :panes, :ship, :viewport
-
-    def initialize(manager:, ship_connection:, viewport:)
-      @manager = manager
-      @ship = Ship.new connection: ship_connection
-      @stack = Stack.new
-      @viewport = viewport
-      @viewport.controller = self
-
-      self.wire_up_panes
-      self.viewport.action_bar = ActionBar.Default.add_action({'i': 'Inspect'})
-      self.viewport.activate pane: @graph_list_pane
-      self.resync
-    end
-
+  class GraphRover < Controller
     def active_node_index
       @node_list_pane.current_subject_index
     end
 
-    def active_node
-      self.ship.fetch_node(resource: self.active_resource, index: self.active_node_index)
-    end
-
-    def active_resource
-      @graph_list_pane.current_subject_index
-    end
-
     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)
@@ -49,7 +24,8 @@ module MarsBase10
       when 'd'    # (D)ive
         begin
           if @node_view_pane.subject.contents[4].include?('true')
-            self.viewport.action_bar.add_action({'p': 'Pop Out'})
+            self.action_bar.add_action({'p': 'Pop Out'})
+            self.action_bar.remove_actions([:d, :g])
             @stack.push(self.active_resource)
             @node_list_pane.clear
             @node_list_pane.subject.contents = self.ship.fetch_node_children(resource: self.active_resource, index: self.active_node_index)
@@ -58,12 +34,12 @@ module MarsBase10
       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'})
+          self.action_bar.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
+        unless @pane_1.active?
+          self.viewport.activate pane: @pane_1
           # resync_needed = false
         end
       when 'p'    # (P)op
@@ -73,7 +49,7 @@ module MarsBase10
             @node_list_pane.subject.contents = self.ship.fetch_node_list(resource: resource)
           end
           if (@stack.length == 0)
-            self.viewport.action_bar.remove_action(:p)
+            self.action_bar.remove_actions([:p])
           end
         end
       when 'X'
@@ -98,7 +74,7 @@ module MarsBase10
     end
 
     def resync_node_list
-      if @graph_list_pane == self.viewport.active_pane
+      if @pane_1 == self.viewport.active_pane
         @node_list_pane.clear
         @node_list_pane.subject.title = "Nodes of #{self.active_resource}"
         @node_list_pane.subject.contents = self.ship.fetch_node_list(resource: self.active_resource)
@@ -123,16 +99,16 @@ module MarsBase10
       @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)
+      @pane_1 = @viewport.add_pane width_pct: 0.3
+      @pane_1.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 = @viewport.add_variable_width_pane at_col: @pane_1.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 = @viewport.add_variable_both_pane at_row: @node_list_pane.last_row, at_col: @pane_1.last_col
       @node_view_pane.view(subject: @ship.empty_node)
     end
   end
-end
+end   # Module Mars::Base::10

data/lib/mars_base_10/controller/group_room.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require_relative '../controller'
+
+module MarsBase10
+    class GroupRoom < Controller
+      def active_subject(pane:)
+        pane.current_subject_index
+      end
+
+      def load_history
+        return 0 unless @pane_3 == self.viewport.active_pane
+        new_content = self.ship.fetch_older_nodes(resource: self.active_resource, node: self.active_node)
+        @pane_3.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 'g'    # (G)raph View
+          unless @pane_1.active?
+            self.action_bar.remove_actions([:r])
+            self.viewport.activate pane: @pane_1
+          end
+        when 'i'    # (I)nspect
+          begin
+            resync_needed = false
+            self.action_bar.add_action({'g': 'Group List'})
+            self.action_bar.add_action({'r': 'Read Channel'})
+            self.viewport.activate pane: @pane_3
+          end
+        when 'r'    # (r)ead -> go to the Social Lounge
+          if @pane_3.active?
+            resync_needed = false
+            self.action_bar.remove_actions([:g, :r])
+            opts = {
+              group_title:   self.active_subject(pane: @pane_1),
+              channel_title: self.active_subject(pane: @pane_3)
+            }
+            self.manager.assign(controller_class: SocialLounge, options: opts)
+          end
+        when 'X'
+          resync_needed = false
+          self.manager.swap_controller
+        end
+        self.resync if resync_needed
+      end
+
+      private
+
+      def resync
+        self.resync_node_list
+        self.resync_node_view
+      end
+
+      def resync_node_list
+        if @pane_1 == self.viewport.active_pane
+          group_title = self.active_subject(pane: @pane_1)
+          @pane_2.clear
+          @pane_2.subject.title = "#{group_title}"
+          @pane_2.subject.contents = self.ship.fetch_group(group_title: group_title)
+
+          @pane_3.clear
+          @pane_3.subject.title = "Channels of #{self.active_subject(pane: @pane_1)}"
+          @pane_3.subject.contents = self.ship.fetch_group_channels(group_title: self.active_subject(pane: @pane_1))
+        end
+        nil
+      end
+
+      def resync_node_view
+        channel_title = self.active_subject(pane: @pane_3)
+        @pane_4.subject.title = "#{channel_title}"
+        @pane_4.clear
+        @pane_4.subject.contents = self.ship.fetch_channel_props(group_title: self.active_subject(pane: @pane_1), channel_title: channel_title)
+        nil
+      end
+
+      def wire_up_panes
+        @panes = []
+
+        # Pane #1 is the Group list, It is a fixed height and width in the upper left corner.
+        @pane_1 = @viewport.add_pane height_pct: 0.5, width_pct: 0.5
+        # if @ship.group_names.empty?
+          # @pane_1.view(subject: @ship.graph_names)
+        # else
+          @pane_1.view(subject: @ship.group_names)
+        # end
+
+        # Pane 2 displays the properties of the selected Group. It is variable height in the bottom left corner.
+        @pane_2 = @viewport.add_variable_height_pane at_row: @pane_1.last_row, width_pct: 0.5
+        @pane_2.view(subject: @ship.empty_node)
+        @pane_2.highlight = false
+
+        # Pane 3 is the Channel list. It is a variable width, fixed height pane in the upper right.
+        @pane_3 = @viewport.add_variable_width_pane at_col: @pane_1.last_col, height_pct: 0.5
+        @pane_3.view(subject: @ship.empty_node_list)
+
+        # The single node viewer is a variable width, variable height pane in the lower right.
+        @pane_4 = @viewport.add_variable_both_pane at_row: @pane_3.last_row, at_col: @pane_1.last_col
+        @pane_4.view(subject: @ship.empty_node)
+        @pane_4.highlight = false
+      end
+    end
+end   # Module Mars::Base::10

data/lib/mars_base_10/controller/social_lounge.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require_relative '../controller'
+
+module MarsBase10
+  class SocialLounge < Controller
+    attr_accessor :channel
+
+    def initialize(manager:, ship_connection:, viewport:, options: {})
+      @index_ary = []
+      @group_title = options[:group_title]
+      @channel_title = options[:channel_title]
+      super(manager: manager, ship_connection: ship_connection, viewport: viewport)
+    end
+
+    def active_channel
+      if self.channel.nil?
+        self.channel = self.ship.fetch_channel(group_title: @group_title, channel_title: @channel_title)
+      end
+      self.channel
+    end
+
+    def active_node_index
+      @index_ary[@pane_1.index]
+    end
+
+    def active_resource
+      self.active_channel.resource # '~winter-paches/top-shelf-6391'
+    end
+
+    def active_subject(pane:)
+      pane.current_subject_index
+    end
+
+    def fetch_channel_messages
+      if @pane_1 == self.viewport.active_pane
+        @pane_1.clear
+        @pane_1.subject.title = "Messages in #{self.active_channel.title}"
+        @pane_1.subject.contents = self.load_messages(count: @pane_1.last_visible_row)
+      end
+      nil
+    end
+
+    def load_history
+      return 0 unless @pane_1 == self.viewport.active_pane
+      messages = self.node_indexes_to_messages(node_indexes: self.ship.fetch_older_nodes(resource: self.active_resource, node: self.active_node, count: @pane_1.last_visible_row))
+      @pane_1.subject.prepend_content(ary: messages)
+      messages.length
+    end
+
+    def load_messages(count:)
+      self.node_indexes_to_messages(node_indexes: self.ship.fetch_node_list(resource: self.active_resource, count: count))
+    end
+
+    # This will eventually be a native part of the Airlock API
+    def message(node:)
+      "~#{node.to_h[:author]}  #{self.message_content(node_content: node.to_h[:contents])}"
+    end
+
+    def message_content(node_content:)
+      n0 = node_content[0]
+      if n0["reference"]
+        # http://localhost:8080/apps/landscape/perma/group/~winter-paches/the-great-north/graph/~winter-paches/top-shelf-6391/170141184505732100235824355185168220160
+        ref = n0["reference"]["graph"]
+        # grup = ref["group"].split('/').last
+        # graf = ref["graph"].split('/').last
+        return "=> #{node_content[2]["mention"]} -> #{node_content[3]["text"]} (#{ref["index"]})"
+      end
+      n0["text"] || n0["url"]
+    end
+
+    def node_indexes_to_messages(node_indexes:)
+      @index_ary =  node_indexes + @index_ary
+      messages = node_indexes.map do |i|
+        # Can't use fetch_node_contents because we're formatting differently now.
+        # This will eventually be a native part of the Airlock API
+        self.message(node: self.ship.fetch_node(resource: self.active_resource, index: i))
+      end
+    end
+
+    #
+    # Called by a pane in this controller for bubbling a key press up
+    #
+    def send(key:)
+      case key
+      when 'g'    # (G)raph View
+        unless @pane_1.active?
+          self.viewport.activate pane: @pane_1
+          self.action_bar.remove_actions([:g])
+        end
+      when 'i'    # (I)nspect
+        begin
+          self.viewport.activate pane: @pane_3
+          self.action_bar.add_action({'g': 'Group List'})
+        end
+      when 'X'
+        self.manager.swap_controller
+      end
+    end
+
+    def show
+      self.fetch_channel_messages
+    end
+
+    private
+
+    def wire_up_panes
+      @panes = []
+      # Pane #1 is the Chat Channel Reader. It takes up the entire Viewport. (For now?)
+      @pane_1 = self.viewport.add_pane height_pct: 1.0, width_pct: 1.0
+      @pane_1.view(subject: self.ship.empty_node_list)
+    end
+  end
+end   # Module Mars::Base::10

data/lib/mars_base_10/controller.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require_relative 'ship'
+require_relative 'stack'
+require_relative 'subject'
+
+module MarsBase10
+  class Controller
+    attr_reader :manager, :panes, :ship, :viewport
+
+    def initialize(manager:, ship_connection:, viewport:, options: {})
+      @manager = manager
+      @ship = Ship.new connection: ship_connection
+      @stack = Stack.new
+      @viewport = viewport
+      @viewport.controller = self
+
+      self.wire_up_panes
+      self.action_bar = ActionBar.Default.add_action({'i': 'Inspect'})
+      self.viewport.activate pane: @pane_1
+      self.show
+    end
+
+    def action_bar
+      self.viewport.action_bar
+    end
+
+    def active_node
+      self.ship.fetch_node(resource: self.active_resource, index: self.active_node_index)
+    end
+
+    def active_resource
+      @pane_1.current_subject_index
+    end
+
+    def show
+      self.resync
+    end
+
+    def start
+      self.viewport.open
+    end
+
+    def stop
+      self.viewport.close
+    end
+
+    private
+
+    def action_bar=(an_action_bar)
+      self.viewport.action_bar = an_action_bar
+    end
+  end
+end

data/lib/mars_base_10/{comm_central.rb → mission_control.rb}

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 require 'urbit'
 
-require_relative  'graph_rover'
-require_relative  'group_room'
+require_relative  'controller/group_room'
+require_relative  'controller/graph_rover'
+require_relative  'controller/social_lounge'
 require_relative  'viewport'
 
 module MarsBase10
   class Error < StandardError; end
 
-  class CommCentral
+  class MissionControl
+    attr_accessor :controller
+    attr_reader   :ship
+
     def initialize(config_filename:)
-      @viewport = Viewport.new
       @ship = Urbit.connect(config_file: config_filename)
       @ship.login
       sleep 2  # This is temporary for now, we need a way to know that the subscription callbacks have finished.
+      @viewport = Viewport.new
       @controller = GroupRoom.new manager: self, ship_connection: @ship, viewport: @viewport
     end
 
@@ -21,28 +25,24 @@ module MarsBase10
       self.controller.start
     end
 
-    def swap_controller
-      self.controller.stop
-      if GroupRoom == self.controller.class
-        @controller = GraphRover.new manager: self, ship_connection: self.ship, viewport: @viewport
-      else
-        @controller = GroupRoom.new  manager: self, ship_connection: self.ship, viewport: @viewport
-      end
-      self.controller.start
+    def assign(controller_class:, options: {})
+      @viewport.dispose_panes
+      self.controller = controller_class.send(:new, {manager: self, ship_connection: self.ship, viewport: @viewport, options: options})
     end
 
     def shutdown
       self.controller.stop
     end
 
-    private
-
-    def controller
-      @controller
-    end
-
-    def ship
-      @ship
+    def swap_controller
+      if GroupRoom == self.controller.class
+        cls = GraphRover
+      elsif GraphRover == self.controller.class
+        cls = SocialLounge
+      else
+        cls = GroupRoom
+      end
+      self.assign(controller_class: cls)
     end
   end
 end

data/lib/mars_base_10/pane.rb

@@ -3,22 +3,24 @@ require 'curses'
 
 module MarsBase10
   class Pane
-    attr_accessor :draw_row, :draw_col, :highlight, :index, :latch, :subject
+    attr_accessor :cur_draw_row, :cur_draw_col, :extended_lines, :highlight, :index, :latch, :subject
     attr_reader   :height_pct, :left_edge_col, :top_row, :viewport, :width_pct
 
     def initialize(viewport:, at_row:, at_col:, height_pct: 1, width_pct: 1)
-      @top_row       = at_row
-      @left_edge_col = at_col
-      @height_pct    = height_pct
-      @highlight     = true
-      @index         = 1
-      @latch         = ''
-      @latch_depth   = 0
-      @subject       = nil
-      @win           = nil
-      @viewport      = viewport
-      @visible_content_shift = 0
-      @width_pct     = width_pct
+      @first_visible_index   = 1
+      @height_pct            = height_pct
+      @highlight             = false
+      @index                 = 1
+      @last_visible_index    = 0
+      @latch                 = ''
+      @latch_depth           = 0
+      @left_edge_col         = at_col
+      @subject               = nil
+      @top_row               = at_row
+      @win                   = nil
+      @viewport              = viewport
+      # @visible_content_shift = 0
+      @width_pct             = width_pct
     end
 
     def active?
@@ -29,13 +31,17 @@ module MarsBase10
       self.reset
       self.prepare_for_writing_contents
       (0..(self.last_row - 1)).each do |item|
-        self.window.setpos(self.draw_row, self.draw_col)
+        self.window.setpos(self.cur_draw_row, self.cur_draw_col)
         self.window.addstr("")
         self.window.clrtoeol
-        self.draw_row += 1
+        self.cur_draw_row += 1
       end
     end
 
+    def current_item_index
+      (self.cur_draw_row - self.extended_lines) + self.visible_content_shift
+    end
+
     def current_subject_index
       self.subject.at(index: self.index)
     end
@@ -43,33 +49,42 @@ module MarsBase10
     def draw
       self.prepare_for_writing_contents
 
-      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) && self.highlight
+      while self.cur_draw_row <= self.last_drawable_row
+        if self.current_item_index <= self.subject.item_index_range.last
+          if (self.current_item_index == self.index) && !self.highlight
+            self.window.attron(Curses::A_REVERSE)
+            self.highlight = true
+          end
 
-        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 - 2).map(&:join)
-          chunks.each do |c|
-            self.window.addstr(c)
-            self.draw_row += 1
+          if self.subject.line_length_at(index: self.current_item_index) > self.last_col
+            chunks = self.subject.line_at(index: self.current_item_index).chars.each_slice(self.last_col - 2).map(&:join)
+            chunks.each do |c|
+              self.draw_line
+              self.window.addstr("#{c}")
+              self.cur_draw_row += 1
+              self.extended_lines += 1
+            end
+            self.extended_lines -= 1
+          else
             self.draw_line
-            last_draw_row -= 1  # pull the last drawing row in 1 for each new line added.
+            self.window.addstr("#{self.subject.line_at(index: self.current_item_index)}")
+            self.cur_draw_row += 1
+          end
+
+          if self.highlight
+            self.window.attroff(Curses::A_REVERSE)
+            self.highlight = false
           end
-          self.draw_row -= 1
         else
-          self.window.addstr("#{self.subject.line_at(index: item_index)}")
+          self.draw_line
+          self.window.addstr(" ")
+          self.cur_draw_row += 1
         end
-
-        self.window.attroff(Curses::A_REVERSE) if (item_index == self.index) && self.highlight
         self.window.clrtoeol
-        self.draw_row += 1
       end
-
       self.draw_border
+
+      @last_visible_index = self.current_item_index - 1  # Subtract one b/c we have already incremented before loop
     end
 
     def draw_border
@@ -80,7 +95,7 @@ module MarsBase10
     end
 
     def draw_line
-      self.window.setpos(self.draw_row, self.draw_col)
+      self.window.setpos(self.cur_draw_row, self.cur_draw_col)
     end
 
     def draw_title
@@ -88,11 +103,11 @@ module MarsBase10
       self.window.addstr(" #{self.subject.title} (#{self.max_contents_rows} total) ")
     end
 
-    def first_col
+    def first_drawable_col
       1
     end
 
-    def first_row
+    def first_drawable_row
       1
     end
 
@@ -104,7 +119,8 @@ module MarsBase10
     # This is the _relative_ last column, e.g. the width of the pane in columns.
     #
     def last_col
-      [(self.viewport.max_cols * self.width_pct).floor, self.min_column_width].max
+      # [(self.viewport.max_cols * self.width_pct).floor, self.min_column_width].max
+      (self.viewport.max_cols * self.width_pct).floor
     end
 
     def last_drawable_row
@@ -112,12 +128,15 @@ module MarsBase10
     end
 
     #
-    # This is the _relative_ last row, e.g. the height of the pane in columns.
+    # This is the _relative_ last row, e.g. the height of the pane in rows
     #
     def last_row
       (self.viewport.max_rows * self.height_pct).floor
     end
 
+    #
+    # This is the height of the pane minus the border
+    #
     def last_visible_row
       self.last_row - 2
     end
@@ -138,8 +157,11 @@ module MarsBase10
     end
 
     def prepare_for_writing_contents
-      self.draw_row = self.first_row
-      self.draw_col = self.first_col
+      self.cur_draw_row = self.first_drawable_row
+      self.cur_draw_col = self.first_drawable_col
+      self.extended_lines = 0
+      @first_visible_index = self.cur_draw_row + self.visible_content_shift
+      @last_visible_index = self.subject.item_count if @last_visible_index < @first_visible_index
     end
 
     #
@@ -159,7 +181,7 @@ module MarsBase10
       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))
+        self.index = self.set_row(self.index - self.visible_content_range.count)
       when 'q'
         exit 0
       when ('0'..'9')
@@ -185,7 +207,7 @@ module MarsBase10
       @index = 1
       @latch = ''
       @latch_depth = 0
-      @visible_content_shift = 0
+      # @visible_content_shift = 0
     end
 
     def right_pad
@@ -193,12 +215,19 @@ module MarsBase10
     end
 
     def scroll_to_row(index)
+      jump = [(index - self.index), (self.max_contents_rows - self.visible_content_range.last)].min
       if index > self.index
         # Scrolling down
-        @visible_content_shift = [(index - self.last_drawable_row), 0].max
+        if index > self.visible_content_range.last
+          @first_visible_index = @first_visible_index + jump
+          @last_visible_index = @last_visible_index + jump
+        end
       else
         # Scrolling up
-        @visible_content_shift = [(index - self.first_row), 0].max
+        if index < self.visible_content_range.first
+            @first_visible_index = [(@first_visible_index + jump), 1].max
+            @last_visible_index = @last_visible_index + jump
+        end
       end
       [index, 1].max
     end
@@ -215,7 +244,12 @@ module MarsBase10
 
       # Check if we have tried to move "above" the visible screen limit (i = 1) and retrieve more items, if possible.
       if (i < 1)
+        if i < 0
+          target_index = self.index
+          self.index = 1
+        end
         i = [self.viewport.controller.load_history, 1].max
+        i = target_index if target_index
       end
 
       return self.scroll_to_row(i)
@@ -226,7 +260,12 @@ module MarsBase10
     end
 
     def visible_content_range
-      ((self.first_row + @visible_content_shift)..(self.last_drawable_row + @visible_content_shift))
+      # ((self.first_drawable_row + @visible_content_shift)..(self.last_drawable_row + @visible_content_shift))
+      (@first_visible_index..@last_visible_index)
+    end
+
+    def visible_content_shift
+      self.visible_content_range.first - self.first_drawable_row
     end
 
     def window

data/lib/mars_base_10/ship.rb

@@ -27,20 +27,27 @@ module MarsBase10
     def fetch_channel(group_title:, channel_title:)
       if (group = @ship.groups[title: group_title])
         if (channel = group.graphs.select {|c| channel_title == c.title unless c.nil?}.first)
-          # What we are calling a channel here is really a graph in the urbit-ruby bridge.
-          # This is the equivalent of node.to_pretty_array
-          props = {
-            title:       channel.title,
-            description: channel.description,
-            creator:     channel.creator,
-            host_ship:   channel.host_ship,
-            resource:    channel.resource,
-            type:        channel.type
-          }
-          return props.each.map {|k, v| "#{k}#{(' ' * [(18 - k.length), 0].max)}#{v}"}
+          return channel
         end
       end
-      ["Group not found."]
+      nil
+    end
+
+    def fetch_channel_props(group_title:, channel_title:)
+      if (channel = self.fetch_channel(group_title: group_title, channel_title: channel_title))
+        # What we are calling a channel here is really a graph in the urbit-ruby bridge.
+        # This is the equivalent of node.to_pretty_array
+        props = {
+          title:       channel.title,
+          description: channel.description,
+          creator:     channel.creator,
+          host_ship:   channel.host_ship,
+          resource:    channel.resource,
+          type:        channel.type
+        }
+        return props.each.map {|k, v| "#{k}#{(' ' * [(18 - k.length), 0].max)}#{v}"}
+      end
+      ["Channel not found."]
     end
 
     def fetch_group(group_title:)
@@ -71,12 +78,12 @@ module MarsBase10
       n.to_pretty_array
     end
 
-    def fetch_node_list(resource:)
-      @ship.graph(resource: resource).newest_nodes(count: 60).map {|node| node.index}.sort
+    def fetch_node_list(resource:, count: 60)
+      @ship.graph(resource: resource).newest_nodes(count: count).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
+    def fetch_older_nodes(resource:, node:, count: 60)
+      @ship.graph(resource: resource).older_sibling_nodes(node: node, count: count).map {|node| node.index}.sort
     end
   end
 end

data/lib/mars_base_10/version.rb

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

data/lib/mars_base_10/viewport.rb

@@ -108,6 +108,11 @@ module MarsBase10
       Curses.close_screen
     end
 
+    def dispose_panes
+      @active_pane = nil
+      @panes = []
+    end
+
     def max_cols
       self.win.maxx
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mars_base_10
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daryl Richter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -150,9 +150,11 @@ files:
 - lib/mars_base_10.rb
 - lib/mars_base_10/action_bar.rb
 - lib/mars_base_10/cli.rb
-- lib/mars_base_10/comm_central.rb
-- lib/mars_base_10/graph_rover.rb
-- lib/mars_base_10/group_room.rb
+- lib/mars_base_10/controller.rb
+- lib/mars_base_10/controller/graph_rover.rb
+- lib/mars_base_10/controller/group_room.rb
+- lib/mars_base_10/controller/social_lounge.rb
+- lib/mars_base_10/mission_control.rb
 - lib/mars_base_10/pane.rb
 - lib/mars_base_10/ship.rb
 - lib/mars_base_10/stack.rb

data/lib/mars_base_10/group_room.rb

@@ -1,128 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'ship'
-require_relative 'stack'
-require_relative 'subject'
-
-module MarsBase10
-  class GroupRoom
-    attr_reader :manager, :panes, :ship, :viewport
-
-    def initialize(manager:, ship_connection:, viewport:)
-      @manager = manager
-      @ship = Ship.new connection: ship_connection
-      @stack = Stack.new
-      @viewport = viewport
-      @viewport.controller = self
-
-      self.wire_up_panes
-      self.viewport.action_bar = ActionBar.Default.add_action({'i': 'Inspect'})
-      self.viewport.activate pane: @pane_1
-      self.resync
-    end
-
-    def active_node
-      self.ship.fetch_node(resource: self.active_resource, index: self.active_node_index)
-    end
-
-    def active_resource
-      @pane_1.current_subject_index
-    end
-
-    def active_subject(pane:)
-      pane.current_subject_index
-    end
-
-    def load_history
-      return 0 unless @pane_3 == self.viewport.active_pane
-      new_content = self.ship.fetch_older_nodes(resource: self.active_resource, node: self.active_node)
-      @pane_3.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 'g'    # (G)raph View
-        unless @pane_1.active?
-          self.viewport.activate pane: @pane_1
-        end
-      when 'i'    # (I)nspect
-        begin
-          self.viewport.activate pane: @pane_3
-          self.viewport.action_bar = ActionBar.Default.add_action({'g': 'Group List'})
-          resync_needed = false
-        end
-      when 'X'
-        self.manager.swap_controller
-      end
-      self.resync if resync_needed
-    end
-
-    def start
-      self.viewport.open
-    end
-
-    def stop
-      self.viewport.close
-    end
-
-    private
-
-    def resync
-      self.resync_node_list
-      self.resync_node_view
-    end
-
-    def resync_node_list
-      if @pane_1 == self.viewport.active_pane
-        group_title = self.active_subject(pane: @pane_1)
-        @pane_2.clear
-        @pane_2.subject.title = "#{group_title}"
-        @pane_2.subject.contents = self.ship.fetch_group(group_title: group_title)
-
-        @pane_3.clear
-        @pane_3.subject.title = "Channels of #{self.active_subject(pane: @pane_1)}"
-        @pane_3.subject.contents = self.ship.fetch_group_channels(group_title: self.active_subject(pane: @pane_1))
-      end
-      nil
-    end
-
-    def resync_node_view
-      channel_title = self.active_subject(pane: @pane_3)
-      @pane_4.subject.title = "#{channel_title}"
-      @pane_4.clear
-      @pane_4.subject.contents = self.ship.fetch_channel(group_title: self.active_subject(pane: @pane_1), channel_title: channel_title)
-      nil
-    end
-
-    def wire_up_panes
-      @panes = []
-
-      # Pane #1 is the Group list, It is a fixed height and width in the upper left corner.
-      @pane_1 = @viewport.add_pane height_pct: 0.5, width_pct: 0.5
-      # if @ship.group_names.empty?
-        # @pane_1.view(subject: @ship.graph_names)
-      # else
-        @pane_1.view(subject: @ship.group_names)
-      # end
-
-      # Pane 2 displays the properties of the selected Group. It is variable height in the bottom left corner.
-      @pane_2 = @viewport.add_variable_height_pane at_row: @pane_1.last_row, width_pct: 0.5
-      @pane_2.view(subject: @ship.empty_node)
-      @pane_2.highlight = false
-
-      # The node list is a variable width, fixed height pane in the upper right.
-      @pane_3 = @viewport.add_variable_width_pane at_col: @pane_1.last_col, height_pct: 0.5
-      @pane_3.view(subject: @ship.empty_node_list)
-
-      # The single node viewer is a variable width, variable height pane in the lower right.
-      @pane_4 = @viewport.add_variable_both_pane at_row: @pane_3.last_row, at_col: @pane_1.last_col
-      @pane_4.view(subject: @ship.empty_node)
-      @pane_4.highlight = false
-    end
-  end
-end