scryglass 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69ff16003c6e5b4ceb6e93e9c5f9ee8aed269b50954db3869963fdf9ab64215b
-  data.tar.gz: 6d5c2f92d50b86a1e837033646b7793ee08e5115df98c47c2772775132875337
+  metadata.gz: 8ad4ef5f3d5410c0e51263df62ce42683e10f6434222dca7952796a32fac75d2
+  data.tar.gz: 7018ee7c1fce2ef08f6f82769bd2644c62138bfcb60cde986143b36ec582f504
 SHA512:
-  metadata.gz: 2f76204b2d6a0e67901e5cee79c5b4a1dcbe7fd08bf03c289cc95268b6e562d86bc49804f215a476e2239a7dfa388e66771c2ad1b1206b23b0b16aeee00607a1
-  data.tar.gz: 25171585025b50992b202bff43a881715a11cb7e48c0cfef522281357ea9d2de0de2b584446ba36d979fce45eba7509b69531118f98ce55d3b02c03c5534129e
+  metadata.gz: 3bf1c0efce7dac36445bb2daaea5fdff89fc7390999694994d88a1f7f8f9854c63a4ec436f4e6b911d2438542cb3ac8a7f7fc7fdeb7d8aacbbee3e693f8201f4
+  data.tar.gz: f836192852e3115f85fa8e8807da0fa8053e81e510730144097f5eae24ad803b536887ea45ece8a103389fe87e1f7ca824b1710d780d9eb46466f9ed81981af0

data/CHANGELOG.md

@@ -11,18 +11,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changed
 
+## Removed
+
 ## Fixed
 
-## [2.0.2] - 2020-01-14
+## [2.1.0] - 2021-03-21
 
 ## Added
 
+- Can now press `t`/`T` to create a new tab (or restart current tab) using the current/selected object(s) as the seed object.
+- Can now press `c` to enter custom eval/method text to call on the current/selected object(s), producing a navigable sub-row(s) with the returned object(s).
+
 ## Changed
 
-- Added a default character limit to the method_showcase_for lens to speed it up (Some AR objects have over 1000 methods).
+- Substantial speed improvements for large object sets.
 
 ## Fixed
 
+- Fixed broken method_showcase_for (frozen string error).
+
+## [2.0.2] - 2020-01-14
+
+## Changed
+
+- Added a default character limit to the method_showcase_for lens to speed it up (Some AR objects have over 1000 methods).
+
 ## [2.0.1] - 2020-01-13
 
 ## Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scryglass (2.0.2)
+    scryglass (2.1.0)
       amazing_print
       binding_of_caller
       method_source

data/README.md

@@ -159,11 +159,14 @@ Scryglass has two features to make wait time a little easier:
 | `.` | Build ActiveRecord association sub-rows for current or selected row(s) | If the `ActiveRecord` constant is not defined by the system, this will do nothing. If it is, this will navigate the reflections of the the class of the object (or value of a key-value pair) in order to find its AR Associations and turn them into key-value sub-items. Note: With the default configuration, the way it uses reflections *purposefully ignores `:through` relations and `scope`d relations (e.g. the extraneous `CURRENT_phone_numbers`).* Note: The `·` cursor indicator does not take the time to traverse all reflections, nor account for all configured filters. It's possible that `.` will produce no sub-rows despite the indicator. |
 | `(` | Attempt to smart-build sub-rows for current or selected row(s), if Enumerable. Usually '@' is preferable | Attempts a "smart reading" of the object (or value of a key-value pair) of the current or selected rows. If the object is an Enumerable, it will attempt to parse it into sub-items. if the object has keys, it will be parsed as key-value pairs like a hash, otherwise singular objects like an array. This can sometimes create sub-items that would otherwise be more neatly accesible under a single instance variable if instance variables are built instead, so default to trying that first. |
 | `o` | Quick Open: builds the most likely helpful sub-rows ( '.' \|\| '@' \|\| '(' ) | "Quick Open" first tries opening AR Associations. If none are produced, it tries for instance variables. If none are produced, it attempts to open as it would an unknown Enumerable type. Can be pressed repeatedly to produce all types of sub-rows. |
+| `c` | Enter method text to call on object(s), results becomes navigable sub-rows | The text is eval'd, and allows formats like (obj)`.count(nil)` & (obj)`[:test].select { |s| s.include?(@named_string) }`. The execution CAN be used to mutate/destroy objects, though the rows representing those objects, and lenses which were already loaded for it, won't change (this is available but not formally supported). |
 | `*` | Select/Deselect ALL rows | This includes hidden rows. If all rows are already selected, they will be unselected, regardless of how they became selected. |
 | `\|` | Select/Deselect every sibling row under the same parent row | If all siblings under that parent row are already selected, they will be unselected, regardless of how they became selected. |
 | `-` | Select/Deselect current row | If these objects are later returned, the order in which they were selected will determine their order in the returned array. |
 | `Tab` | Change session tab (to the right) (`Shift`+`Tab` moves left) | Changes which scry session is the current one, and brings up the tab bar for a couple seconds. |
-| `Q` | Close current session tab | Permanently exits the current session tab, but keeps scry running if another tab remains. Switches one tab to left if there is one.
+| `Q` | Close current session tab | Permanently exits the current session tab, but keeps scry running if another tab remains. Switches one tab to left if there is one. |
+| `t` | Open new session tab with current or selected row(s) as the seed | The seed subject of the tab will either be the current row's subject or an array of the selected rows' subjects. |
+| `T` | Restart session tab with current or selected row(s) as the seed | This will delete the current session tab and replace it. The seed subject of the new tab will either be the current row's subject or an array of the selected rows' subjects. This can be useful for managing memory load. |
 | `/` | Begin a text search (in tree view) | Begins a case-sensitive regex search of all items, in a loop, starting with just below the current row. For a matching object to be found, the search must match its *truncated sample string in tree view* (regardless of what is on or off screen) (it must match either the key or the value, not the full line they create) (known enumerable types, like `[•••]`, may count as a match if they contain the string in the backend). |
 | `n` | Move to next search result | Will, using the most recent search entry, move the cursor on to the next match downward, cycling through all rows. This follows the same matching rules as the original search. |
 | `=` | Open prompt to type a console handle for current or selected row(s) | Gets text from user (not including the '@') and saves the current subject, or array of selected row(s) subjects, under that instance variable name. These variables live in the console itself: the binding of wherever `scry` was called. Care is taken not to allow them to conflict with preexisting IV names or method names. Note: But still, if you are prying inside an object/context, your IVs will be defined on that object. Note: If you switch from one pry context to another and then back, your first pry's instance variables will be there despite not being listed in the IV outro message. |

data/lib/scryglass.rb

@@ -76,8 +76,10 @@ module Scryglass
       ·    For current or selected row(s)...                                                ·
       ·      \e[36m@\e[0m : Build instance variable sub-rows                                           ·
       ·      \e[36m.\e[0m : Build ActiveRecord association sub-rows                                    ·
-      ·      \e[36m(\e[0m : Attempt to smart-build sub-rows, if Enumerable. Usually '@' is preferable. ·
+      ·      \e[36m(\e[0m : Attempt to smart-build sub-rows, if Enumerable. Usually '@' is preferable  ·
       ·      \e[36mo\e[0m : Quick Open: builds the most likely helpful sub-rows ( '.' || '@' || '(' )  ·
+      ·        ·                                                                            ·
+      ·      \e[36mc\e[0m : Enter method text to call on object(s), results becomes navigable sub-rows ·
       ·                                                                                     ·
       ·  SELECTING ROWS:                                                                    ·
       ·    \e[36m*\e[0m : Select/Deselect ALL rows                                                     ·
@@ -87,13 +89,15 @@ module Scryglass
       ·  MANAGING MULTIPLE SESSION TABS:                                                    ·
       ·    \e[36mTab\e[0m : Change session tab (to the right)  (\e[36mShift+Tab\e[0m moves left)                  ·
       ·      \e[36mQ\e[0m : Close current session tab                                                  ·
+      ·      \e[36mt\e[0m : [Open new]... session tab with current or selected row(s) as the seed      ·
+      ·      \e[36mT\e[0m :  [Restart]... session tab with current or selected row(s) as the seed      ·
       ·                                                                                     ·
       ·  TEXT SEARCH:                                                                       ·
       ·    \e[36m/\e[0m : Begin a text search (in tree view)                                           ·
       ·    \e[36mn\e[0m : Move to next search result                                                   ·
       ·                                                                                     ·
       ·                                                                                     ·
-      ·  \e[36m=\e[0m   : Open prompt to type a console handle for current or selected row(s)            ·
+      ·  \e[36m=\e[0m   : Open prompt to type a console handle for current or selected row(s)          ·
       ·                                                                                     ·
       ·  \e[36mEsc\e[0m : Resets selection, last search, and number-to-move. (or returns to Tree View) ·
       ·                                                                                     ·

data/lib/scryglass/lens_helper.rb

@@ -11,7 +11,7 @@ module Scryglass
 
       label_space = [method_list.map(&:length).max, 45].min
       method_list.sort!
-      running_method_showcase = ''
+      running_method_showcase = ''.dup
 
       method_list.each do |method_name|
         label = method_name.to_s

data/lib/scryglass/ro.rb

@@ -89,20 +89,43 @@ module Scryglass
         dot = '•'
         dot = "\e[36m#{dot}\e[00m" if Scryglass.config.dot_coloring # cyan then back to *default*
       special_sub_ro_expansion_indicator =
-        special_sub_ros.any? && !expanded ? dot : ' '
+        any_special_sub_ros? && !expanded ? dot : ' '
 
       left_fill_string + special_sub_ro_expansion_indicator +
         key_value_spacer + value_indicator
     end
 
     def next_visible_ro_down
-      subsequent_ros = scry_session.all_ros[(index + 1)..-1]
-      subsequent_ros.find(&:visible?)
+      raise '(Must be called on a "visible" row)' unless visible?
+
+      first_sub_ro = sub_ros.first
+      return first_sub_ro if expanded && first_sub_ro
+      return nil if top_ro?
+
+      next_sibling = sibling_down
+      return next_sibling if next_sibling
+
+      # Note: since this ro is known to be visible, all its parents are, too.
+      upward_feeler_ro = self.parent_ro
+      parents_lower_sibling = upward_feeler_ro.sibling_down
+      until parents_lower_sibling || upward_feeler_ro.top_ro?
+        upward_feeler_ro = upward_feeler_ro.parent_ro
+        parents_lower_sibling = upward_feeler_ro.sibling_down
+      end
+
+      parents_lower_sibling
     end
 
     def next_visible_ro_up
-      preceding_ros = scry_session.all_ros[0...index]
-      preceding_ros.reverse.find(&:visible?)
+      raise '(Must be called on a "visible" row)' unless visible?
+
+      return nil if top_ro?
+
+      next_sibling = sibling_up
+      return next_sibling if next_sibling
+
+      # Note: since this ro is known to be visible, all its parents are, too.
+      parent_ro
     end
 
     def current_subject
@@ -124,8 +147,8 @@ module Scryglass
     # (Used for recalculate_indeces after new Ros have been injected)
     def next_ro_without_using_index
       return sub_ros.first if sub_ros.first
-      return nil if top_ro?
       return sibling_down if sibling_down
+      return nil if top_ro?
 
       upward_feeler_ro = self
       until upward_feeler_ro.sibling_down || upward_feeler_ro.top_ro?
@@ -144,6 +167,16 @@ module Scryglass
       siblings[self_index + 1]
     end
 
+    def sibling_up
+      return nil if top_ro?
+
+      siblings = parent_ro.sub_ros
+      self_index = siblings.index(self)
+      return nil if self_index.zero?
+
+      siblings[self_index - 1]
+    end
+
     ## This exists so that an easy *unordered array match* can occur elsewhere.
     def <=>(other)
       unless self.class == other.class
@@ -187,10 +220,20 @@ module Scryglass
       sub_ros.reject(&:special_sub_ro_type)
     end
 
+    def any_normal_sub_ros?
+      !!sub_ros.find { |ro| !ro.special_sub_ro_type }
+    end
+
+    def any_special_sub_ros?
+      !!sub_ros.last&.special_sub_ro_type
+    end
+
     def bucket_indicator
-      if expanded && normal_sub_ros.any?
+      return wrappers unless any_normal_sub_ros?
+
+      if expanded
         wrappers[0]
-      elsif normal_sub_ros.any?
+      else
         # Number of dots indicating order of magnitude for Enumerable's count:
         #   Turning this off (the consistent three dots is more like an ellipsis,
         #   communicating with a solid preexisting symbol), but keeping the idea here:
@@ -199,8 +242,6 @@ module Scryglass
         dots = '•••'
         dots = "\e[36m#{dots}\e[00m" if Scryglass.config.dot_coloring # cyan then back to *default*
         wrappers.dup.insert(1, dots)
-      else
-        wrappers
       end
     end
 

data/lib/scryglass/ro_builder.rb

@@ -175,6 +175,32 @@ module Scryglass
       recalculate_indeces unless new_ro_count == original_ro_count
     end
 
+    def build_method_results_for_target_ros(method_text)
+      if special_command_targets.any?
+        task = Prog::Task.new(max_count: special_command_targets.count)
+        progress_bar << task
+
+        target_ros = special_command_targets.dup # dup because some commands
+        #   create ros which are added to all_ros and then this process starts
+        #   adding them to the list of things it tries to act on!
+        target_ros.each.with_index do |target_ro, index|
+          build_method_result_sub_ros_for(target_ro,
+                                          method_text: method_text,
+                                          index: index)
+          task.tick
+          print_progress_bar
+        end
+        self.special_command_targets = []
+      else
+        build_method_result_sub_ros_for(current_ro,
+                                        method_text: method_text)
+
+        expand!(current_ro)
+      end
+
+      recalculate_indeces
+    end
+
     def build_instance_variables_for_target_ros
       original_ro_count = all_ros.count
       original_iv_sub_ro_count = current_ro.iv_sub_ros.count
@@ -303,6 +329,38 @@ module Scryglass
       task.force_finish # Just in case
     end
 
+    def build_method_result_sub_ros_for(ro, method_text:, index: false)
+      current_console_binding = session_manager.current_console_binding
+
+      ro_eval_string =
+        if index
+          "$scry_session_manager.current_session.subjects_of_target_ros[#{index}]"
+        else
+          '$scry_session_manager.current_session.current_ro.current_subject'
+        end
+
+      console_eval_string = "#{ro_eval_string}#{method_text}"
+
+      method_result =
+        rescue_to_viewwrapped_error do
+          Hexes.hide_db_outputs do
+            # COULD implement Timeout.timeout(10)
+            current_console_binding.eval(console_eval_string)
+          end
+        end
+
+      method_key = Scryglass::ViewWrapper.new(method_text,
+                                              string: "_#{method_text}")
+      ro.sub_ros << roify(method_result,
+                          parent_ro: ro,
+                          key: method_key,
+                          key_value_relationship_indicator: ' -> ',
+                          special_sub_ro_type: :method_result,
+                          depth: ro.depth + 1)
+
+      true
+    end
+
     def build_iv_sub_ros_for(ro)
       return if ro.iv_sub_ros.any?
 

data/lib/scryglass/session.rb

@@ -9,7 +9,9 @@ class Scryglass::Session
 
   attr_accessor :current_view_coords, :current_lens, :current_subject_type,
                 :view_panels, :current_panel_type,
-                :progress_bar, :current_warning_messages
+                :progress_bar, :current_warning_messages,
+                :content_shape_changed,
+                :previous_screen_dimensions
 
   attr_accessor :user_signals, :last_search, :number_to_move
 
@@ -17,16 +19,13 @@ class Scryglass::Session
                 :tab_icon, :session_view_start_time
 
   CURSOR_CHARACTER = '–' # These are en dashes (alt+dash), not hyphens or em dashes.
-
   SEARCH_PROMPT = "\e[7mSearch for (regex, case-sensitive):  /\e[00m"
-
   VARNAME_PROMPT = "\e[7mName your object(s):  @\e[00m"
-
+  METHOD_NAME_PROMPT = "\e[7mMethod(s) to call on object(s):  object\e[00m"
   SUBJECT_TYPES = [
     :value,
     :key
   ].freeze
-
   CSI = "\e[" # "(C)ontrol (S)equence (I)ntroducer" for ANSI sequences
 
   KEY_MAP = {
@@ -36,6 +35,8 @@ class Scryglass::Session
     delete_session_tab: 'Q',
     change_session_right: "\t", # Tab
     change_session_left: 'Z', # Shift+Tab (well, one of its signals, after "\e" and "[")
+    start_new_session_from_target: 't',
+    restart_session_from_target: 'T',
     digit_1: '1',
     digit_2: '2',
     digit_3: '3',
@@ -50,12 +51,12 @@ class Scryglass::Session
     move_cursor_down: 'B', # Down arrow (well, one of its signals, after "\e" and "[")
     open_bucket: 'C',     # Right arrow (well, one of its signals, after "\e" and "[")
     close_bucket: 'D',     # Left arrow (well, one of its signals, after "\e" and "[")
-    homerow_move_cursor_up: 'k',   # To be like VIM arrow keys
+    homerow_move_cursor_up: 'k',        # To be like VIM arrow keys
     homerow_move_cursor_up_fast: 'K',   # To be like VIM arrow keys
-    homerow_move_cursor_down: 'j', # To be like VIM arrow keys
+    homerow_move_cursor_down: 'j',      # To be like VIM arrow keys
     homerow_move_cursor_down_fast: 'J', # To be like VIM arrow keys
-    homerow_open_bucket: 'l',      # To be like VIM arrow keys
-    homerow_close_bucket: 'h',     # To be like VIM arrow keys
+    homerow_open_bucket: 'l',           # To be like VIM arrow keys
+    homerow_close_bucket: 'h',          # To be like VIM arrow keys
     # Note, shift-UP and shift-DOWN are not here, as those work very
     #   differently: by virtue of the type-a-number-first functionality.
     toggle_view_panel: ' ',
@@ -74,6 +75,7 @@ class Scryglass::Session
     build_ar_relations: '.',
     build_enum_children: '(',
     smart_open: 'o',
+    build_method_results: 'c',
     select_siblings: '|',
     select_all: '*',
     select_current: '-',
@@ -104,6 +106,8 @@ class Scryglass::Session
     self.tab_icon = nil
     self.session_is_current = false
     self.session_view_start_time = nil
+    self.content_shape_changed = true
+    self.previous_screen_dimensions = $stdout.winsize
 
     top_ro = roify(seed, parent_ro: nil, depth: 1)
     top_ro.has_cursor = true
@@ -128,7 +132,7 @@ class Scryglass::Session
 
   def run_scry_ui
     redraw = true
-    signal_to_manager = nil
+    self.signal_to_manager = nil
     self.session_view_start_time = Time.now # For this particular tab/session
 
     ## On hold: Record/Playback Functionality:
@@ -280,15 +284,23 @@ class Scryglass::Session
 
       when KEY_MAP[:build_instance_variables]
         build_instance_variables_for_target_ros
+        self.content_shape_changed = true
         tree_view.slide_view_to_cursor # Just a nice-to-have
       when KEY_MAP[:build_ar_relations]
         build_activerecord_relations_for_target_ros
+        self.content_shape_changed = true
         tree_view.slide_view_to_cursor # Just a nice-to-have
       when KEY_MAP[:build_enum_children]
         build_enum_children_for_target_ros
+        self.content_shape_changed = true
         tree_view.slide_view_to_cursor # Just a nice-to-have
       when KEY_MAP[:smart_open]
         smart_open_target_ros
+        self.content_shape_changed = true
+        tree_view.slide_view_to_cursor # Just a nice-to-have
+      when KEY_MAP[:build_method_results]
+        build_method_result_ros
+        self.content_shape_changed = true
         tree_view.slide_view_to_cursor # Just a nice-to-have
 
       when KEY_MAP[:select_siblings]
@@ -323,13 +335,19 @@ class Scryglass::Session
       when KEY_MAP[:start_search]
         initiate_search
       when KEY_MAP[:continue_search]
+        # TODO: extract in separate commit
         if last_search
           go_to_next_search_result
         else
           message = { text: 'No Search has been entered', end_time: Time.now + 2 }
           self.current_warning_messages << message
         end
-
+      when KEY_MAP[:start_new_session_from_target]
+        self.signal_to_manager = :start_new_session_from_target
+        return subjects_of_target_ros
+      when KEY_MAP[:restart_session_from_target]
+        self.signal_to_manager = :restart_session_from_target
+        return subjects_of_target_ros
       when KEY_MAP[:change_session_right]
         self.signal_to_manager = :change_session_right
         return
@@ -340,9 +358,7 @@ class Scryglass::Session
         name_subjects_of_target_ros
       when KEY_MAP[:return_objects]
         self.signal_to_manager = :return
-        subjects = subjects_of_target_ros
-        self.special_command_targets = []
-        return subjects
+        return subjects_of_target_ros
       end
 
       beep_if_user_had_to_wait(wait_start_time)
@@ -414,6 +430,8 @@ class Scryglass::Session
 
     self.number_to_move = ''
     tree_view.slide_view_to_cursor
+
+    self.content_shape_changed = true if current_panel_type == :lens
   end
 
   def move_cursor_down_action(action_count = nil)
@@ -422,6 +440,8 @@ class Scryglass::Session
 
     self.number_to_move = ''
     tree_view.slide_view_to_cursor
+
+    self.content_shape_changed = true if current_panel_type == :lens
   end
 
   def clear_tracked_values
@@ -507,8 +527,7 @@ class Scryglass::Session
         scanning_ro = scanning_ro.parent_ro
       end
 
-      tree_view.recalculate_boundaries # Yes, necessary :)
-      lens_view.recalculate_boundaries # Yes, necessary :)
+      self.content_shape_changed = true # Needed here even if ros weren't expanded.
       tree_view.current_view_coords = { y: 0, x: 0 }
       tree_view.slide_view_to_cursor
     else
@@ -593,6 +612,7 @@ class Scryglass::Session
     end
 
     move_cursor_to(current_ro.parent_ro) until current_ro.visible?
+    self.content_shape_changed = true
     tree_view.slide_view_to_cursor
   end
 
@@ -606,6 +626,8 @@ class Scryglass::Session
     else
       expand!(current_ro)
     end
+
+    self.content_shape_changed = true
   end
 
   def reset_the_view_or_cursor
@@ -617,8 +639,17 @@ class Scryglass::Session
   end
 
   def draw_screen
-    current_view_panel.recalculate_boundaries # This now happens at every screen
-    #   draw to account for the user changing the screen size. Otherwise glitch.
+    current_screen_dimensions = $stdout.winsize
+    screen_size_changed = current_screen_dimensions != previous_screen_dimensions
+    self.previous_screen_dimensions = current_screen_dimensions
+
+    if content_shape_changed || screen_size_changed
+      current_view_panel.recalculate_boundaries
+      # ^This no longer happens at every screen draw, but only when
+      #   determined necessary.
+      self.content_shape_changed = false
+    end
+
     current_view_panel.ensure_correct_view_coords
     screen_string = current_view_panel.screen_string
 
@@ -640,6 +671,41 @@ class Scryglass::Session
     $stdin.gets.chomp
   end
 
+  def get_method_text_from_user
+    _screen_height, screen_width = $stdout.winsize
+    $stdout.write "#{CSI}1;1H" # (Moves console cursor to top left corner)
+    $stdout.print ' ' * screen_width
+    $stdout.write "#{CSI}1;1H" # (Moves console cursor to top left corner)
+    $stdout.print METHOD_NAME_PROMPT
+    $stdout.write "#{CSI}1;#{METHOD_NAME_PROMPT.ansiless_length + 1}H" # (Moves
+    #   console cursor to just after the search prompt, before user types)
+    $stdin.gets.chomp
+  end
+
+  def build_method_result_ros
+    method_text = get_method_text_from_user
+
+    if method_text.empty?
+      message = { text: 'Call text cannot be blank',
+                  end_time: Time.now + 2 }
+      self.current_warning_messages << message
+      print "\a" # (Audio 'beep')
+      return
+    end
+
+    if method_text[0] =~ /[a-z]|[A-Z]/
+      message = { text: 'Call text must start with \'.\' or other symbol',
+                  end_time: Time.now + 3 }
+      self.current_warning_messages << message
+      print "\a" # (Audio 'beep')
+      return
+    end
+
+    build_method_results_for_target_ros(method_text)
+
+    self.special_command_targets = []
+  end
+
   def name_subjects_of_target_ros
     typed_name = get_subject_name_from_user
     typed_name = typed_name.tr(' ', '')
@@ -722,6 +788,8 @@ class Scryglass::Session
       when :lens
         :tree
       end
+
+    self.content_shape_changed = true
   end
 
   def toggle_current_subject_type
@@ -732,10 +800,13 @@ class Scryglass::Session
       when :key
         :value
       end
+
+    self.content_shape_changed = true
   end
 
   def scroll_lens_type
     self.current_lens += 1
+    self.content_shape_changed = true
   end
 
   def move_cursor_to(new_ro)

data/lib/scryglass/session_manager.rb

@@ -79,18 +79,16 @@ module Scryglass
           visually_close_ui(floor_the_cursor: true)
           return
         when :delete
-          old_session = current_session
-          visually_close_ui
-          if scry_sessions.index(old_session) > 0
-            change_session_left!
-          else
-            change_session_right!
-          end
-          delete_session!(old_session)
+          visually_close_ui if scry_sessions.count == 1
+          delete_current_session!
         when :change_session_left # and if there's only one session?
           change_session_left!
         when :change_session_right # and if there's only one session?
           change_session_right!
+        when :start_new_session_from_target
+          start_new_session_from_target!(session_return)
+        when :restart_session_from_target
+          restart_session_from_target!(session_return)
         end
       end
     end
@@ -120,8 +118,15 @@ module Scryglass
       puts current_user_named_variables.map { |s| "  #{s}\n" }
     end
 
-    def delete_session!(session)
-      scry_sessions.delete(session)
+    def delete_current_session!
+      old_session = current_session
+      if scry_sessions.index(old_session) > 0
+        change_session_left!
+      else
+        change_session_right!
+      end
+
+      scry_sessions.delete(old_session)
     end
 
     def session_right_of(session)
@@ -146,6 +151,22 @@ module Scryglass
       set_current_session!(next_session)
     end
 
+    def start_new_session_from_target!(session_return)
+      new_session = Scryglass::Session.new(session_return)
+      self << new_session
+      set_current_session!(new_session)
+    end
+
+    def restart_session_from_target!(session_return)
+      old_session = current_session
+
+      new_session = Scryglass::Session.new(session_return)
+      self << new_session
+      set_current_session!(new_session)
+
+      scry_sessions.delete(old_session)
+    end
+
     def set_current_session!(session)
       scry_sessions.each { |session| session.session_is_current = false }
       session.session_is_current = true

data/lib/scryglass/tree_panel.rb

@@ -102,6 +102,7 @@ module Scryglass
     end
 
     def recalculate_y_boundaries
+      # number_of_lines is 41% of the runtime when slogging through massive array
       number_of_lines = scry_session.all_ros.select(&:visible?).count
       preview_row = 1
       self.y_boundaries = 0...(number_of_lines + preview_row)
@@ -118,6 +119,7 @@ module Scryglass
       self.x_boundaries = 0...(max_line_length + preview_column)
     end
 
+    # Scales linearly with number of visible ros above view... can be harsh with lower parts of colossal sets.
     def top_visible_ro_of_tree_view
       top_ro = scry_session.top_ro
 

data/lib/scryglass/version.rb

@@ -1,3 +1,3 @@
 module Scryglass
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scryglass
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Gavin Myers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler