remedy 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2efe0ed0180c60202b73b0cf9f0fce46b51bcfeefe2a83171f4915c9d2b022ad
-  data.tar.gz: 2b11a6544dec2796c6bdf5ce96691be0c7b232f132174d0b79496098252fe5ab
+  metadata.gz: af17b629f35cdae5c8a15c47a6e23f5aa51bce006afa7f7e129a8640c9d191b1
+  data.tar.gz: 36568e55906c286e97666183f9e6eb704535b6155830bc93acda7c59299a2ab6
 SHA512:
-  metadata.gz: c76c67debc47dd95b9b614a6681923cb5e47f53c4135335c39170243bcb9a007630af5bc364894f33489cde79c5692e9a28d97ed0f5caf0bfbe83e229ad394eb
-  data.tar.gz: a001aa18bd36640ebe267c8d6ae4bf68e7e73d60df0017e31875b222ff30b87169c4c36d06130c27096def9e4ccfa26c50ad350ea1d2cf2adbb42228af5dcf8d
+  metadata.gz: 447afaf7d518eb6b8ddeb80dc9d7b4cae579a978ec6af952749dafe52b2d95b930ef6e6bbc24378ebab81ec48807102453d07e0f8196b251d62ffd84662f80a9
+  data.tar.gz: 7d800899e64c41e9acd31215df9b66fd1dd96f9da52a735e3393c855bf91f8d75f1fc224dc559f9560fedaa89a4c88468cce94b9713bd3bb1ef3e2b428d52e61

data/examples/from_readme/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "remedy", path: "../.."

data/examples/menu/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "remedy", path: "../.."

data/examples/menu/menu.rb

@@ -11,11 +11,6 @@ class Menu
 
   # will do basic setup and then loop over user input
   def listen
-    # get the screen in a reliable state and clear it
-    ANSI.screen.safe_reset!
-    ANSI.cursor.home!
-    ANSI.command.clear_screen!
-
     # if the user resizes the screen we redraw it to fit the new dimensions
     Console.set_console_resized_hook! do |size|
       draw
@@ -24,10 +19,10 @@ class Menu
     # create an interaction object to handle user input
     interaction = Interaction.new
 
-    # call draw here because interaction blocks until it gets input
+    # call draw here because the interaction loop blocks until it gets input
     draw
 
-    # loop over user input (individual keypresses)
+    # loop over individual keypresses or ANSI codes from the terminal
     interaction.loop do |key|
       @last_key = key
       if key == "q" then
@@ -39,7 +34,7 @@ class Menu
 
   # this tells the Viewport to draw to the screen
   def draw
-    @viewport.draw content, Size([0,0]), header, footer
+    @viewport.draw content, Size.zero, header, footer
   end
 
   # this is the body of our menu, it will be squished if the terminal is too small

data/lib/remedy/partial.rb

@@ -16,6 +16,7 @@ module Remedy
       reset_width!
       line = "#{line}" # opportunistically convert any object into a string
       @lines += clean line unless line.nil? || line.empty?
+      self
     end
 
     def first
@@ -26,16 +27,17 @@ module Remedy
       lines.last
     end
 
-    def length
+    def height
       lines.length
     end
+    alias_method :length, :height
 
     def width
-      @width ||= lines.max{|line| line.length }.length
+      lines.map{|line| line.length }.max
     end
 
     def size
-      Size.new length, width
+      Size.new height, width
     end
 
     def to_a

data/lib/remedy/size.rb

@@ -11,6 +11,10 @@ module Remedy
     end
     attr_accessor :dimensions
 
+    def self.zero
+      self.new([0,0])
+    end
+
     def - other_size
       if other_size.respond_to? :length then
         self.class.new subtract(other_size)
@@ -41,11 +45,13 @@ module Remedy
     def rows
       dimensions[0]
     end
+    alias_method :height, :rows
 
     def cols
       dimensions[1]
     end
-    alias :columns :cols
+    alias_method :columns, :cols
+    alias_method :width, :cols
 
     def [] index
       dimensions[index]

data/lib/remedy/version.rb

@@ -1,3 +1,3 @@
 module Remedy
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/remedy/viewport.rb

@@ -5,14 +5,10 @@ require 'remedy/ansi'
 
 module Remedy
   class Viewport
-    def draw content, center = Size.new(0,0), header = [], footer = []
-      range = range_find content, center, content_size(header,footer)
+    def draw content, scroll = Size.zero, header = Partial.new, footer = Partial.new
+      range = range_find content, scroll, available_space(header,footer)
 
-      if content.size.fits_into? range then
-        viewable_content = content
-      else
-        viewable_content = content.excerpt *range
-      end
+      viewable_content = content.excerpt *range
 
       view = View.new viewable_content, header, footer
 
@@ -20,19 +16,22 @@ module Remedy
       Console.output << view
     end
 
-    def range_find partial, center, heightwidth
-      row_size, col_size = heightwidth
-      row_limit, col_limit = partial.size
+    def range_find partial, scroll, available_heightwidth
+      avail_height, avail_width = available_heightwidth
+      partial_height, partial_width = partial.size
+
+      center_row, center_col = scroll
 
-      center_row, center_col = center
+      row_range = get_range center_row, partial_height, avail_height
+      col_range = get_range center_col, partial_width, avail_width
 
-      row_range = center_range center_row, row_size, row_limit
-      col_range = center_range center_col, col_size, col_limit
       [row_range, col_range]
     end
 
-    def content_size header, footer
-      trim = Size [header.length + footer.length, 0]
+    # This determines the maximum amount of room left available for Content
+    # after taking into consideration the height of the Header and Footer
+    def available_space header, footer
+      trim = Size [header.height + footer.height, 0]
       size - trim
     end
 
@@ -40,20 +39,26 @@ module Remedy
       Size Console.size
     end
 
-    def center_range center, width, limit
-      range_start = center - (width / 2)
+    def get_range offset, actual, available
+      # if the actual content can fit into the available space, then we're done
+      return (0...actual) if actual <= available
 
-      if range_start + width > limit then
-        range_start = limit - width
-      end
+      # otherwise start looking at the scrolling offset, if any
 
-      if range_start < 0 then
+      # clamp the offset within the possible range of the actual content
+      if offset < 0 then
         range_start = 0
+      elsif offset > actual then
+        range_start = actual
+      else
+        range_start = offset
       end
 
-      range_end = range_start + width
+      # determine the subset of content that can be displayed
+      range_end = range_start + (available - offset)
 
       (range_start...range_end)
     end
+
   end
 end

data/spec/viewport_spec.rb

@@ -3,11 +3,17 @@ require 'remedy/viewport'
 
 describe Remedy::Viewport do
   it 'should be able to execute the example code from the readme' do
+    @stdout = $stdout
     joke = ::Remedy::Partial.new
     joke << "Q: What's the difference between a duck?"
     joke << "A: Purple, because ice cream has no bones!"
 
     screen = ::Remedy::Viewport.new
+    sio = StringIO.new
+    $stdout = sio
     screen.draw joke unless ENV['CI']
+    expect(sio.string).to include("ice cream")
+  ensure
+    $stdout = @stdout
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remedy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Anthony M. Cook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -42,7 +42,9 @@ files:
 - LICENSE.txt
 - README.markdown
 - Rakefile
+- examples/from_readme/Gemfile
 - examples/from_readme/readme.rb
+- examples/menu/Gemfile
 - examples/menu/menu.rb
 - lib/remedy.rb
 - lib/remedy/ansi.rb