terminal-layout 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 717c542a1d6c338e54086d1a3bb5b77dd95cb035
-  data.tar.gz: 2009b46c650de33f6eb1c427acfa59896b27c608
+  metadata.gz: effa639a6efd09195fc644fe6d4b325191ca7905
+  data.tar.gz: 187b259dcc98d8584948c4856772d440c6895564
 SHA512:
-  metadata.gz: 06115b77a9a0176f96793a2a61cd9a518429a96a3583942f13789dd819db2d33e818c2aeee708a0df429ed13bd483940bf5c3d155b6a2e9a7b94f7f64a0e28f9
-  data.tar.gz: 0afcb428fcfdcdb0c2c3d739697e411f81a1e8faeb881a35698c6b338db2c3fcf0c9c54faea966b38857cbff3a6c6315d632130e02d1ef9761119d6d47def123
+  metadata.gz: e2538c3ca865a7d81c0bc562d1a6c6c71da80fc345785ad3f3c138bb1622c0917369b36081244b48e309a7dc1fd63d4399e876341fe0b7834150a5d59c92d982
+  data.tar.gz: 5e57352329d7cf5cecd6b09d98d6d6d65fb8931b32dc0fdc7db510a8428842ec07a6fd58a45b77aee3a803aeaa8ce775a39eda2635a3d9e19b17411752aac86f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    terminal-layout (0.3.1)
+    terminal-layout (0.4.0)
       highline (~> 1.7, >= 1.7.8)
       ruby-terminfo (~> 0.1.1)
       ruby-termios (~> 0.9.6)

data/lib/ansi_string.rb

@@ -42,19 +42,20 @@ class ANSIString
 
     range_begin = range.begin
     range_end = range.end
-    if range.end != range.begin
-      range_end = range.exclude_end? ? range.end - 1 : range.end
+
+    if range.exclude_end?
+      if range_begin == 0 && range_end == 0
+        return ""
+      else
+        range_end -= 1
+      end
     end
 
     range_begin = @without_ansi.length - range.begin.abs if range.begin < 0
     range_end = @without_ansi.length - range.end.abs if range.end < 0
 
-    if range_begin == 0 && range_end == 0 && range.exclude_end?
-      return ""
-    else
-      str = build_string_with_ansi_for(range_begin..range_end)
-      ANSIString.new str if str
-    end
+    str = build_string_with_ansi_for(range_begin..range_end)
+    ANSIString.new str if str
   end
 
   def []=(range, replacement_str)

data/lib/terminal_layout/version.rb

@@ -1,3 +1,3 @@
 module TerminalLayout
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/terminal_layout.rb

@@ -1,5 +1,6 @@
 require 'ansi_string'
 require 'ostruct'
+require 'treefell'
 
 module TerminalLayout
   Dimension = Struct.new(:width, :height)
@@ -80,7 +81,7 @@ module TerminalLayout
 
       define_method("#{method}=") do |value|
         style[method.to_sym] = value
-        @box.computed[method] = value
+        @box.computed[method.to_sym] = value
       end
     end
 
@@ -109,7 +110,7 @@ module TerminalLayout
     end
 
     def to_s
-      "<#{self.class.name} position=(#{x},#{y}) dimensions=#{width}x#{height} content=#{content}/>"
+      "<#{self.class.name} position=(#{x},#{y}) dimensions=#{width}x#{height} content=#{content} name=#{@box.name}/>"
     end
 
     def render
@@ -136,6 +137,7 @@ module TerminalLayout
     end
 
     def layout
+      Treefell['render'].puts "layout #{self.inspect}"
       self.children = []
       @current_x = 0
       @current_y = 0
@@ -151,6 +153,7 @@ module TerminalLayout
       end
 
       children2crawl.each do |cbox|
+        Treefell['render'].puts "layout crawling children #{cbox.inspect}"
         if cbox.display == :float
           next if cbox.width.to_i == 0
 
@@ -175,10 +178,12 @@ module TerminalLayout
             available_width = ending_x_for_current_y - @current_x
           end
 
-          render_object = render_object_for(cbox, content:nil, style: {width: (cbox.width || available_width)})
+          render_object = render_object_for(cbox, content:nil, style: {
+            x: @current_x,
+            y: @current_y,
+            width: (cbox.width || available_width)
+          })
           render_object.layout
-          render_object.x = @current_x
-          render_object.y = @current_y
 
           if cbox.height
             render_object.height = cbox.height
@@ -200,7 +205,18 @@ module TerminalLayout
           loop do
             partial_content = cbox.content[content_i...(content_i + available_width)]
             chars_needed = partial_content.length
-            self.children << render_object_for(cbox, content:partial_content, style: {display: :inline, x:@current_x, y: @current_y, width:chars_needed, height:1})
+            Treefell['render'].puts "laying out inline #{cbox.name} @current_x=#{@current_x} @current_y=#{@current_y} x=#{x} y=#{y}"
+            self.children << render_object_for(
+              cbox,
+              content:partial_content,
+              style: {
+                display: :inline,
+                x: @current_x,
+                y: @current_y,
+                width:chars_needed,
+                height:1
+              }
+            )
 
             content_i += chars_needed
 
@@ -230,6 +246,12 @@ module TerminalLayout
         end
       end
 
+      self.children.each do |child|
+        child.box.computed[:x] += x
+        child.box.computed[:y] += y
+      end
+      Treefell['render'].puts "laid out box=#{box.name} render-object=#{self.children}"
+
       self.children
     end
 
@@ -316,7 +338,7 @@ module TerminalLayout
   class Box
     include EventEmitter
 
-    attr_accessor :style, :children, :content, :computed
+    attr_accessor :style, :children, :content, :computed, :name
 
     def initialize(style:{}, children:[], content:"")
       @style = style
@@ -350,6 +372,17 @@ module TerminalLayout
       emit :child_changed, old_children, new_children
     end
 
+    def find_child_of_type(type, &block)
+      children.each do |child|
+        matches = child.is_a?(type)
+        matches &= block.call(child) if matches && block
+        return child if matches
+        child_matches = child.find_child_of_type(type, &block)
+        return child_matches if child_matches
+      end
+      nil
+    end
+
     def position
       Position.new(x, y)
     end
@@ -375,7 +408,7 @@ module TerminalLayout
     end
 
     def to_s
-      "<Box##{object_id} position=(#{x},#{y})  dimensions=#{width}x#{height} display=#{display.inspect} content=#{content}/>"
+      "<#{self.class}##{object_id} position=(#{x},#{y}) dimensions=#{width}x#{height} display=#{display.inspect} content=#{content} name=#{@name}/>"
     end
 
     def update_computed(style)
@@ -399,7 +432,7 @@ module TerminalLayout
     def subscribe_to_events_on_children
       @children.each do |child|
         child.on(:content_changed) do |*args|
-          emit :child_changed
+          emit :content_changed
         end
         child.on(:child_changed) do |*args|
           emit :child_changed
@@ -407,11 +440,13 @@ module TerminalLayout
         child.on(:position_changed) do |*args|
           emit :position_changed
         end
+        child.on(:focused_changed) do |*args|
+          emit :focused_changed, *args
+        end
       end
     end
   end
 
-
   class InputBox < Box
     # cursor_position is the actual coordinates on the screen of where then
     # cursor is rendered
@@ -421,11 +456,26 @@ module TerminalLayout
     # displayed on a single line
     attr_accessor :position
 
+    def focus!
+      return if @focused
+      @focused = true
+      emit :focus_changed, !@focused, @focused
+    end
+
+    def remove_focus!
+      return unless @focused
+      @focused = false
+      emit :focus_changed, !@focused, @focused
+    end
+
+    def focused? ; !!@focused ; end
+
     def initialize(*args)
       super
       @computed = { x: 0, y: 0 }
       @cursor_position = OpenStruct.new(x: 0, y: 0)
       @position = 0
+      @focused = false
     end
 
     def cursor_off
@@ -457,6 +507,7 @@ module TerminalLayout
       # spans multiple lines. We do not want to update the x/y position(s)
       # in this instance. We want to keep the original starting x/y.
       if style[:y] && style[:y] > 0
+        Treefell['render'].puts "update_computed received a y > 0. Removing Y from update."
         style = style.dup.delete_if { |k,_| [:x, :y].include?(k) }
       end
       @computed.merge!(style)
@@ -480,6 +531,8 @@ module TerminalLayout
     end
 
     def render_cursor(input_box)
+      Treefell['render'].puts "render cursor at box=#{input_box.inspect} computed=#{input_box.computed.inspect}"
+
       move_up_n_rows @y
       move_to_beginning_of_row
 
@@ -526,6 +579,8 @@ module TerminalLayout
       @x = cursor_x
       @y = cursor_y
 
+      Treefell['render'].puts "rendering cursor at x=#{@x} y=#{@y}"
+
       if input_box.style[:cursor] == 'none'
         @output.print @term_info.control_string "civis"
       else
@@ -537,6 +592,14 @@ module TerminalLayout
       dumb_render(object, reset: reset)
     end
 
+    def find_top_of_tree(object)
+      loop do
+        break unless object.parent
+        object = object.parent
+      end
+      object
+    end
+
     def dumb_render(object, reset: false)
       if reset
         @y = 0
@@ -546,10 +609,7 @@ module TerminalLayout
       move_up_n_rows @y
       move_to_beginning_of_row
 
-      loop do
-        break unless object.parent
-        object = object.parent
-      end
+      object = find_top_of_tree(object)
 
       object_width = object.width
 
@@ -571,6 +631,7 @@ module TerminalLayout
           line2print = "#{new_line}\e[0m"
           term_info.control "el"
           move_to_beginning_of_row
+          term_info.control "el"
           Treefell['render'].puts "printing line=#{line2print.inspect}"
           @output.puts line2print
         else
@@ -584,18 +645,14 @@ module TerminalLayout
       lines_drawn = (printable_content.length / object_width.to_f).ceil
       @y = lines_drawn
 
-      input_box = find_input_box(object.box)
+      input_box = object.box.find_child_of_type(InputBox) do |box|
+        box.focused?
+      end
       render_cursor(input_box)
 
       @previously_printed_lines = printable_lines
     end
 
-    def find_input_box(dom_node)
-      dom_node.children.detect do |child|
-        child.is_a?(InputBox) || find_input_box(child)
-      end
-    end
-
     def clear_to_beginning_of_line ; term_info.control "el1" ; end
     def clear_screen ; term_info.control "clear" ; end
     def clear_screen_down ; term_info.control "ed" ; end

data/spec/ansi_string_spec.rb

@@ -261,6 +261,11 @@ describe 'ANSIString' do
       expect(ansi_string[12..14]).to eq "ABC"
     end
 
+    it "returns dos thine" do
+      ansi_string = ANSIString.new("ABC")
+      expect(ansi_string[0...1]).to eq "A"
+    end
+
     it "returns up to the end" do
       expect(ansi_string[-2..-1]).to eq yellow("ow")
     end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 
 require 'pry'
 require 'terminal_layout'
-require 'ansi_string'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-layout
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo