vedeu 0.3.3 → 0.3.4

data/lib/vedeu/distributed/templates/default_configuration.vedeu

@@ -0,0 +1,31 @@
+Vedeu.configure do
+  colour_mode 16777216
+  log         '/tmp/vedeu_test_helper.log'
+  debug!
+  drb!
+  drb_host    'localhost'
+  drb_port    21420
+  drb_width   80
+  drb_height  25
+
+  # cooked!
+  # raw!
+
+  # run_once!
+
+  # interactive!
+  # standalone!
+
+  # trace!
+
+  # System keys can be redefined
+  # exit_key        'q'
+  # focus_next_key  :tab
+  # focus_prev_key  :shift_tab
+  # mode_switch_key :escape
+
+  # Not used yet
+  # stdin  File.open("/dev/tty", "r")
+  # stdout File.open("/dev/tty", "w")
+  # stderr File.open("/tmp/vedeu_error.log", "w+")
+end

data/lib/vedeu/distributed/templates/default_events.vedeu

@@ -0,0 +1 @@
+Vedeu.bind(:_initialize_) { Vedeu.trigger(:_refresh_) }

data/lib/vedeu/distributed/templates/default_geometries.vedeu

@@ -0,0 +1,7 @@
+Vedeu.geometry 'test_interface' do
+  # centred!
+  height 6
+  width  26
+  x      4
+  y      4
+end

data/lib/vedeu/distributed/templates/default_interfaces.vedeu

@@ -0,0 +1,4 @@
+Vedeu.interface 'test_interface' do
+  colour foreground: '#ff0000', background: '#000000'
+  cursor!
+end

data/lib/vedeu/distributed/templates/default_keymaps.vedeu

@@ -0,0 +1,6 @@
+Vedeu.keymap 'test_interface' do
+  key(:up,    'k') { Vedeu.trigger(:_cursor_up_)    }
+  key(:right, 'l') { Vedeu.trigger(:_cursor_right_) }
+  key(:down,  'j') { Vedeu.trigger(:_cursor_down_)  }
+  key(:left,  'h') { Vedeu.trigger(:_cursor_left_)  }
+end

data/lib/vedeu/distributed/templates/default_menus.vedeu

@@ -0,0 +1,3 @@
+Vedeu.menu 'test_interface' do
+  # ...
+end

data/lib/vedeu/distributed/templates/default_views.vedeu

@@ -0,0 +1,14 @@
+Vedeu.renders do
+  view 'test_interface' do
+    lines do
+      line 'a1b1c1d1e1f1g1h1i1j1k1l1m1n1o1p1q1r1s1t1u1v1w1x1y1z1'
+      line 'a2b2c2d2e2f2g2h2i2j2k2l2m2n2o2p2q2r2s2t2u2v2w2x2y2z2'
+      line 'a3b3c3d3e3f3g3h3i3j3k3l3m3n3o3p3q3r3s3t3u3v3w3x3y3z3'
+      line 'a4b4c4d4e4f4g4h4i4j4k4l4m4n4o4p4q4r4s4t4u4v4w4x4y4z4'
+      line 'a5b5c5d5e5f5g5h5i5j5k5l5m5n5o5p5q5r5s5t5u5v5w5x5y5z5'
+      line 'a6b6c6d6e6f6g6h6i6j6k6l6m6n6o6p6q6r6s6t6u6v6w6x6y6z6'
+      line 'a7b7c7d7e7f7g7h7i7j7k7l7m7n7o7p7q7r7s7t7u7v7w7x7y7z7'
+      line 'a8b8c8d8e8f8g8h8i8j8k8l8m8n8o8p8q8r8s8t8u8v8w8x8y8z8'
+    end
+  end
+end

data/lib/vedeu/distributed/test_application.rb

@@ -0,0 +1,99 @@
+require 'erb'
+
+module Vedeu
+
+  # Create a test application as a string.
+  #
+  # @example
+  #   test_app = TestApplication.build do |app|
+  #     app.borders       = ''
+  #     app.configuration = ''
+  #     app.events        = ''
+  #     app.geometries    = ''
+  #     app.interfaces    = ''
+  #     app.keymaps       = ''
+  #     app.menus         = ''
+  #     app.views         = ''
+  #   end
+  #
+  class TestApplication
+
+    attr_accessor :borders,
+      :configuration,
+      :events,
+      :geometries,
+      :interfaces,
+      :keymaps,
+      :menus,
+      :views
+
+    # @return [String]
+    def self.build(attributes = {}, &block)
+      new(attributes).build(&block)
+    end
+
+    # @param attributes [Hash]
+    # @option attributes borders [String]
+    # @option attributes configuration [String]
+    # @option attributes events [String]
+    # @option attributes geometries [String]
+    # @option attributes interfaces [String]
+    # @option attributes keymaps [String]
+    # @option attributes menus [String]
+    # @option attributes views [String]
+    # @param block [Proc]
+    # @return [TestApplication]
+    def initialize(attributes = {})
+      @attributes = defaults.merge(attributes)
+
+      @attributes.each do |k, v|
+        instance_variable_set("@#{k.to_s}", @attributes[k])
+      end
+    end
+
+    # @param block [Proc]
+    # @return [String]
+    def build(&block)
+      self.instance_eval(&block) if block_given?
+
+      @object = self
+
+      ERB.new(application, nil, '-').result(binding)
+    end
+
+    # @return [String]
+    def lib_dir
+      File.dirname(__FILE__) + "/../../../lib"
+    end
+
+    private
+
+    # @return [String]
+    def application
+      @application ||= read('default_application.vedeu')
+    end
+
+    # @todo Don't like all this file reading.
+    #
+    # @return [Hash]
+    def defaults
+      {
+        borders:       read('default_borders.vedeu'),
+        configuration: read('default_configuration.vedeu'),
+        events:        read('default_events.vedeu'),
+        geometries:    read('default_geometries.vedeu'),
+        interfaces:    read('default_interfaces.vedeu'),
+        keymaps:       read('default_keymaps.vedeu'),
+        menus:         read('default_menus.vedeu'),
+        views:         read('default_views.vedeu'),
+      }
+    end
+
+    # @return [String]
+    def read(filename)
+      File.read(File.dirname(__FILE__) + '/templates/' + filename)
+    end
+
+  end # TestApplication
+
+end # Vedeu

data/lib/vedeu/distributed/uri.rb

@@ -0,0 +1,38 @@
+module Vedeu
+
+  module Distributed
+
+    # Value class which provides the host and port for the DRb server and
+    # client.
+    class Uri
+
+      attr_reader :host, :port
+
+      # @param host [String] Hostname or IP address.
+      # @param port [Fixnum|String]
+      # @return [Uri]
+      def initialize(host = 'localhost', port = 21420)
+        @host = host || 'localhost'
+        @port = port || 21420
+      end
+
+      # @example
+      #   'druby://localhost:21420'
+      #
+      # @return [String] The host and port as a single value.
+      def to_s
+        [scheme, host, ':', port].join
+      end
+
+      private
+
+      # @return [String]
+      def scheme
+        'druby://'
+      end
+
+    end # Uri
+
+  end # Distributed
+
+end # Vedeu

data/lib/vedeu/input/mapper.rb

@@ -64,28 +64,38 @@ module Vedeu
 
     attr_reader :key, :repository
 
+    # Is the key a global key?
+    #
     # @return [Boolean]
     def global_key?
       key_defined?(global)
     end
 
+    # Is the key a system key?
+    #
     # @return [Boolean]
     def system_key?
       key_defined?(system)
     end
 
+    # Is the key defined in the named keymap?
+    #
     # @param named [NilClass|String]
     # @return [Boolean]
     def key_defined?(named = name)
       keymap?(named) && keymap(named).key_defined?(key)
     end
 
+    # Fetch the named keymap from the repository.
+    #
     # @param named [NilClass|String]
     # @return [Keymap]
     def keymap(named = name)
       repository.find(named)
     end
 
+    # Does the keymaps repository have the named keymap already registered?
+    #
     # @param named [NilClass|String]
     # @return [Boolean]
     def keymap?(named = name)

data/lib/vedeu/launcher.rb

@@ -67,6 +67,10 @@ module Vedeu
     # @return []
     def configuration
       Vedeu::Configuration.configure(argv)
+
+      # Configuration.configure(argv, { stdin:  @stdin,
+      #                                 stdout: @stdout,
+      #                                 stderr: @stderr })
     end
 
   end # Launcher

data/lib/vedeu/models/geometry.rb

@@ -127,47 +127,23 @@ module Vedeu
       end
     end
 
-    # Returns a dynamic value calculated from the current terminal width,
-    # combined with the desired column start point.
+    # Returns a dynamic value calculated from the current terminal dimensions,
+    # combined with the desired start point.
     #
     # If the interface is `centred` then if the terminal resizes, this value
     # should attempt to accommodate that.
     #
     # For uncentred interfaces, when the terminal resizes, then this will help
-    # Vedeu render the view to ensure no row/line overruns or that the content
-    # is not off-screen.
+    # Vedeu render the view to ensure the content is not off-screen.
     #
     # @return [Fixnum]
     def width
-      if (x + @width) > Terminal.width
-        new_width = @width - ((x + @width) - Terminal.width)
-        return new_width < 1 ? 1 : new_width
-
-      else
-        @width
-
-      end
+      Vedeu::Limit.apply(x, @width, Terminal.width, Terminal.origin)
     end
 
-    # Returns a dynamic value calculated from the current terminal height,
-    # combined with the desired row start point.
-    #
-    # If the interface is `centred` then if the terminal resizes, this value
-    # should attempt to accommodate that.
-    #
-    # For uncentred interfaces, when the terminal resizes, then this will help
-    # Vedeu render the view to ensure the content is not off-screen.
-    #
-    # @return [Fixnum]
+    # @see Vedeu::Geometry#width
     def height
-      if (y + @height) > Terminal.height
-        new_height = @height - ((y + @height) - Terminal.height)
-        return new_height < 1 ? 1 : new_height
-
-      else
-        @height
-
-      end
+      Vedeu::Limit.apply(y, @height, Terminal.height, Terminal.origin)
     end
 
     # Returns an escape sequence to position the cursor at the top-left
@@ -177,7 +153,16 @@ module Vedeu
     # @param block [Proc]
     # @return [String]
     def origin(index = 0, &block)
-      Esc.set_position(virtual_y[index], left, &block)
+      Esc.set_position(*raw_origin(index), &block)
+    end
+
+    # Returns a tuple which positions the cursor at the top-left coordinate,
+    # relative to the interface's position.
+    #
+    # @param index [Fixnum]
+    # @return [Array<Fixnum>]
+    def raw_origin(index = 0)
+      [virtual_y[index], left]
     end
 
     # Returns the top coordinate of the interface, a fixed or dynamic value

data/lib/vedeu/models/view/char.rb

@@ -13,8 +13,8 @@ module Vedeu
 
     include Vedeu::Presentation
 
-    attr_accessor :parent
-    attr_reader :position
+    attr_accessor :parent,
+      :position
 
     class << self
 
@@ -58,16 +58,16 @@ module Vedeu
     def initialize(value = nil, parent = nil, colour = nil, style = nil, position = nil)
       @value    = value
       @parent   = parent
-      @colour   = colour
+      @colour   = Vedeu::Colour.coerce(colour)
       @style    = style
-      @position = position
+      @position = Vedeu::Position.coerce(position)
     end
 
     # Returns log friendly output.
     #
     # @return [String]
     def inspect
-      "<#{self.class.name} (value:#{@value})>"
+      "<#{self.class.name} (value:'#{@value}')>"
     end
 
     # @param other []

data/lib/vedeu/models/view/interface.rb

@@ -45,7 +45,8 @@ module Vedeu
       :left,
       :width,
       :height,
-      :origin
+      :origin,
+      :raw_origin
 
     # Return a new instance of Interface.
     #

data/lib/vedeu/output/all.rb

@@ -1,7 +1,9 @@
 require 'vedeu/output/border'
 require 'vedeu/output/compositor'
+require 'vedeu/output/position_index'
 require 'vedeu/output/output'
 require 'vedeu/output/viewport'
+require 'vedeu/output/virtual_terminal'
 require 'vedeu/output/wordwrap'
 require 'vedeu/output/writer'
 

data/lib/vedeu/output/output.rb

@@ -25,6 +25,8 @@ module Vedeu
     #
     # @return [Array]
     def render
+      Vedeu.trigger(:_output_, virtual_view)
+
       Terminal.output(view, interface.cursor.to_s)
     end
 
@@ -66,6 +68,44 @@ module Vedeu
       @_viewport ||= Vedeu::Viewport.new(interface).render
     end
 
+    # omg!
+    def virtual_clear
+      out = []
+      interface.height.times do |hi|
+        row = []
+        interface.width.times do |wi|
+          v   = interface.raw_origin(hi)
+          pos = Vedeu::Position.new(v.first, (v.last + wi))
+          row << Vedeu::Char.new(' ', nil, interface.colour, nil, pos)
+        end
+        out << row
+      end
+      out
+    end
+
+    # omg!
+    def virtual_view
+      out = [ virtual_clear ]
+
+      viewport.each_with_index do |line, line_index|
+        row = []
+        line.each_with_index do |char, char_index|
+          v   = interface.raw_origin(line_index)
+          pos = Vedeu::Position.new(v.first, (v.last + char_index))
+          row << if char.is_a?(Vedeu::Char)
+            char.position=(pos)
+            char
+
+          else
+            Vedeu::Char.new(char, nil, interface.colour, nil, pos)
+
+          end
+        end
+        out << row
+      end
+      out
+    end
+
   end # Output
 
 end # Vedeu

data/lib/vedeu/output/position_index.rb

@@ -0,0 +1,24 @@
+module Vedeu
+
+  class PositionIndex
+
+    attr_reader :y, :x
+    alias_method :first, :y
+    alias_method :last, :x
+
+    def self.[](y, x)
+      new(y, x).[]
+    end
+
+    def initialize(y, x)
+      @y = [(y - 1), 1].max
+      @x = [(x - 1), 1].max
+    end
+
+    def []
+      [y, x]
+    end
+
+  end # PositionIndex
+
+end # Vedeu

data/lib/vedeu/output/virtual_terminal.rb

@@ -0,0 +1,87 @@
+module Vedeu
+
+  # class Cell < Struct.new(:value)
+  #   def initialize(value = [])
+  #     super
+  #   end
+  # end
+
+  # class Cells
+  #   attr_reader :size, :value
+
+  #   def initialize(size = 0, &block)
+  #     @size  = size
+  #     @value = if block_given?
+  #       [instance_eval(&block)] * size
+
+  #     else
+  #       [Cell.new] * size
+
+  #     end
+  #   end
+
+  #   def [](index)
+  #     value[index] || self
+  #   end
+
+  #   private
+
+  #   attr_reader :size, :value
+  # end
+
+  class VirtualTerminal
+
+    attr_reader :cell_height, :cell_width, :height, :width
+
+    # @param height [Fixnum]
+    # @param width [Fixnum]
+    # @return [Vedeu::VirtualTerminal]
+    def initialize(height, width)
+      @cell_height, @cell_width = Vedeu::PositionIndex[height, width]
+      @height = height
+      @width  = width
+    end
+
+    # @return [Array<Vedeu::Char>]
+    def cells
+      Array.new(cell_height) { Array.new(cell_width) { Vedeu::Char.new } }
+    end
+
+    # @param y [Fixnum]
+    # @param x [Fixnum]
+    # @return [Vedeu::Char]
+    def read(y, x)
+      cy, cx = Vedeu::PositionIndex[y, x]
+
+      row  = fetch(cells, cy)
+      cell = fetch(row, cx)
+
+      cell
+    end
+
+    # @param y [Fixnum]
+    # @param x [Fixnum]
+    # @param data [Vedeu::Char]
+    # @return [Vedeu::Char]
+    def write(y, x, data)
+      cy, cx = Vedeu::PositionIndex[y, x]
+
+      return false unless read(y, x).is_a?(Vedeu::Char)
+
+      cells[cy][cx] = data
+      true
+    end
+
+    private
+
+    # @param from [Array]
+    # @param which [Array]
+    # @return [Array<Vedeu::Char>|Array]
+    def fetch(from, which)
+      from[which] || []
+    end
+
+  end # VirtualTerminal
+
+end # Vedeu
+

data/lib/vedeu/support/all.rb

@@ -6,6 +6,7 @@ require 'vedeu/support/content_geometry'
 require 'vedeu/support/coordinate'
 require 'vedeu/support/esc'
 require 'vedeu/support/grid'
+require 'vedeu/support/limit'
 require 'vedeu/support/log'
 require 'vedeu/support/position'
 require 'vedeu/support/position_validator'

data/lib/vedeu/support/limit.rb

@@ -0,0 +1,33 @@
+module Vedeu
+
+  class Limit
+
+    def self.apply(v, vn, max, min = 1)
+      new(v, vn, max, min).apply
+    end
+
+    def initialize(v, vn, max, min = 1)
+      @v   = v
+      @vn  = vn
+      @max = max
+      @min = min || 1
+    end
+
+    def apply
+      if (v + vn) > max
+        applied = vn - ((v + vn) - max)
+        return applied < min ? min : applied
+
+      else
+        vn
+
+      end
+    end
+
+    private
+
+    attr_reader :v, :vn, :min, :max
+
+  end # Limit
+
+end # Vedeu

data/lib/vedeu/support/position.rb

@@ -11,6 +11,19 @@ module Vedeu
     alias_method :first, :y
     alias_method :last, :x
 
+    def self.coerce(value)
+      if value.is_a?(self)
+        value
+
+      elsif value.is_a?(Array)
+        new(*value)
+
+      else
+        # not sure how to proceed
+
+      end
+    end
+
     # Initializes a new instance of Position.
     #
     # @param y [Fixnum]
@@ -21,6 +34,22 @@ module Vedeu
       @x = x
     end
 
+    def inspect
+      "<#{self.class.name} (y:#{@y} x:#{@x})>"
+    end
+
+    # @param other []
+    # @return [Boolean]
+    def ==(other)
+      eql?(other)
+    end
+
+    # @param other []
+    # @return [Boolean]
+    def eql?(other)
+      self.class == other.class && (x == other.x && y == other.y)
+    end
+
     # Returns an escape sequence to position the cursor. When passed a block,
     # will position the cursor, yield and return the original position.
     #

data/lib/vedeu/support/terminal.rb

@@ -215,7 +215,13 @@ module Vedeu
     #
     # @return [Fixnum]
     def width
-      size.last
+      if Configuration.drb?
+        Configuration.drb_width
+
+      else
+        size.last
+
+      end
     end
     alias_method :xn, :width
     alias_method :txn, :width
@@ -227,7 +233,13 @@ module Vedeu
     #
     # @return [Fixnum]
     def height
-      size.first
+      if Configuration.drb?
+        Configuration.drb_height
+
+      else
+        size.first
+
+      end
     end
     alias_method :yn, :height
     alias_method :tyn, :height

data/test/integration/distributed_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+describe 'Running a distributed app' do
+
+  # it 'runs a simple app and exits' do
+  #   app    = Vedeu::TestApplication.build
+  #   client = Vedeu::Distributed::Client.new("druby://localhost:21420")
+  #   server = Vedeu::Subprocess.execute!(app)
+  #   client.input('q')
+  #   client.output.must_equal('')
+  #   client.stop
+  # end
+
+end