vedeu 0.1.10 → 0.1.12

data/lib/vedeu/models/geometry.rb

@@ -1,15 +1,35 @@
 module Vedeu
   class Geometry
-    include Virtus.model
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    def attributes
+      defaults.merge!(@attributes)
+    end
+
+    def y
+      @y ||= attributes[:y]
+    end
+
+    def x
+      @x ||= attributes[:x]
+    end
+
+    def width
+      @width ||= attributes[:width]
+    end
+
+    def height
+      @height ||= attributes[:height]
+    end
 
-    attribute :y,       Integer, default: 1
-    attribute :x,       Integer, default: 1
-    attribute :width,   Integer, default: Terminal.width
-    attribute :height,  Integer, default: Terminal.height
-    attribute :centred, Boolean, default: false
+    def centred
+      @centred ||= attributes[:centred]
+    end
 
-    def origin(index = 0)
-      Esc.set_position(virtual_y[index], left)
+    def origin(index = 0, &block)
+      Esc.set_position(virtual_y[index], left, &block)
     end
 
     def top
@@ -52,20 +72,6 @@ module Vedeu
       right + value
     end
 
-    def position
-      {
-        y:       top,
-        x:       left,
-        height:  height,
-        width:   width,
-        centred: centred,
-        top:     top,
-        bottom:  bottom,
-        left:    left,
-        right:   right,
-      }
-    end
-
     private
 
     def centre
@@ -83,5 +89,15 @@ module Vedeu
     def virtual_y
       @_virtual_y ||= (top..bottom).to_a
     end
+
+    def defaults
+      {
+        y:       1,
+        x:       1,
+        width:   Terminal.width,
+        height:  Terminal.height,
+        centred: false,
+      }
+    end
   end
 end

data/lib/vedeu/models/interface.rb

@@ -1,23 +1,68 @@
 module Vedeu
   class Interface
     extend Forwardable
-    include Virtus.model
 
-    attribute :name,     String
-    attribute :group,    String
-    attribute :lines,    LineCollection
-    attribute :colour,   Colour,   default: Colour.new
-    attribute :style,    Style,    default: ''
-    attribute :geometry, Geometry, default: Geometry.new
-    attribute :cursor,   Boolean,  default: true
-    attribute :delay,    Float,    default: 0
+    def_delegators :geometry, :north, :east, :south, :west,
+                              :top, :right, :bottom, :left,
+                              :width, :height, :origin
 
-    def_delegators :@geometry, :north, :east, :south, :west,
-                               :top, :right, :bottom, :left,
-                               :width, :height, :origin
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    def attributes
+      defaults.merge!(@attributes)
+    end
+
+    def name
+      @name ||= attributes[:name]
+    end
+
+    def group
+      @group ||= attributes[:group]
+    end
+
+    def lines
+      @lines ||= Attributes.coercer(attributes[:lines], Line, :streams)
+    end
+
+    def colour
+      @colour ||= Colour.new(attributes[:colour])
+    end
+
+    def style
+      @style ||= Attributes.coerce_styles(attributes[:style])
+    end
+
+    def geometry
+      @geometry ||= Geometry.new(attributes[:geometry])
+    end
+
+    def cursor
+      @cursor ||= attributes[:cursor]
+    end
+
+    def delay
+      @delay || attributes[:delay]
+    end
 
     def to_s
       Render.call(self)
     end
+
+    private
+
+    def defaults
+      {
+        name:     '',
+        group:    '',
+        lines:    [],
+        colour:   {},
+        style:    '',
+        geometry: {},
+        cursor:   true,
+        delay:    0.0
+      }
+    end
   end
 end

data/lib/vedeu/models/line.rb

@@ -1,13 +1,37 @@
 module Vedeu
   class Line
-    include Virtus.model
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    def attributes
+      defaults.merge!(@attributes)
+    end
 
-    attribute :colour,  Colour, default: Colour.new
-    attribute :streams, StreamCollection
-    attribute :style,   Style,  default: ''
+    def colour
+      @colour ||= Colour.new(attributes[:colour])
+    end
+
+    def streams
+      @streams ||= Attributes.coercer(attributes[:streams], Stream, :text)
+    end
+
+    def style
+      @style ||= Attributes.coerce_styles(attributes[:style])
+    end
 
     def to_s
       [ colour, style, streams ].join
     end
+
+    private
+
+    def defaults
+      {
+        colour:  {},
+        streams: [],
+        style:   ''
+      }
+    end
   end
 end

data/lib/vedeu/models/stream.rb

@@ -1,12 +1,32 @@
 module Vedeu
   class Stream
-    include Virtus.model
+    def initialize(attributes = {})
+      @attributes = attributes
+    end
+
+    def attributes
+      defaults.merge!(@attributes)
+    end
+
+    def colour
+      @colour ||= Colour.new(attributes[:colour])
+    end
+
+    def style
+      @style ||= Attributes.coerce_styles(attributes[:style])
+    end
 
-    attribute :colour, Colour,  default: Colour.new
-    attribute :style,  Style,   default: ''
-    attribute :text,   String,  default: ''
-    attribute :width,  Integer
-    attribute :align,  Symbol,  default: :left
+    def text
+      @text ||= attributes[:text]
+    end
+
+    def width
+      @width ||= attributes[:width]
+    end
+
+    def align
+      @align ||= attributes[:align]
+    end
 
     def to_s
       [ colour, style, data ].join
@@ -29,5 +49,15 @@ module Vedeu
     def width?
       !!width
     end
+
+    def defaults
+      {
+        colour: {},
+        style:  '',
+        text:   '',
+        width:  nil,
+        align:  :left
+      }
+    end
   end
 end

data/lib/vedeu/output/buffers.rb

@@ -7,13 +7,13 @@ module Vedeu
     def create(interface)
       buffers[interface.name][:clear] = Clear.call(interface)
 
-      Vedeu.events.on("_refresh_#{interface.name}_".to_sym, interface.delay) do
+      Vedeu.events.event("_refresh_#{interface.name}_".to_sym, interface.delay) do
         refresh(interface.name)
       end
 
       # TODO: cannot refresh group since no logic to fetch group from buffer
       # unless interface.group.nil? || interface.group.empty?
-      #   Vedeu.events.on("_refresh_#{interface.group}_".to_sym, interface.delay) do
+      #   Vedeu.events.event("_refresh_#{interface.group}_".to_sym, interface.delay) do
       #     refresh_group(interface.group)
       #   end
       # end
@@ -23,10 +23,14 @@ module Vedeu
       buffers[name][:next].unshift(sequence)
     end
 
-    def refresh(name)
-      data = buffers.fetch(name) do
+    def query(name)
+      buffers.fetch(name) do
         fail RefreshFailed, 'Cannot refresh non-existent interface.'
       end
+    end
+
+    def refresh(name)
+      data = query(name)
 
       sequence = if data[:next].any?
         data[:current] = data[:next].pop

data/lib/vedeu/output/clear.rb

@@ -10,9 +10,7 @@ module Vedeu
 
     def clear
       interface_lines.inject([colours]) do |line, index|
-        line << interface.origin(index)
-        line << ' ' * interface.width
-        line << interface.origin(index)
+        line << interface.origin(index) { ' ' * interface.width }
       end.join
     end
 

data/lib/vedeu/output/render.rb

@@ -39,9 +39,11 @@ module Vedeu
             if (line_length += stream.text.size) >= width
               remainder = width - line_length
 
-              processed << Stream.new(text:   truncate(stream.text, remainder),
-                                      style:  stream.style,
-                                      colour: stream.colour)
+              processed << Stream.new({
+                             colour: stream.colour.attributes,
+                             style:  stream.style,
+                             text:   truncate(stream.text, remainder),
+                           })
 
             else
               processed << stream
@@ -49,9 +51,15 @@ module Vedeu
             end
           end
 
-          Line.new(streams: processed, style: line.style, colour: line.colour)
+          Line.new({
+            colour:  line.colour.attributes,
+            streams: processed,
+            style:   line.style,
+          })
+
         else
           line
+
         end
       end
     end

data/lib/vedeu/support/esc.rb

@@ -2,11 +2,21 @@ module Vedeu
   module Esc
     extend self
 
-    def set_position(y = 1, x = 1)
+    def set_position(y = 1, x = 1, &block)
       row    = (y == 0 || y == nil) ? 1 : y
       column = (x == 0 || x == nil) ? 1 : x
 
-      ["\e[", row, ';', column, 'H'].join
+      if block_given?
+        out = []
+        out << ["\e[", row, ';', column, 'H'].join
+        out << yield
+        out << ["\e[", row, ';', column, 'H'].join
+        out
+
+      else
+        ["\e[", row, ';', column, 'H'].join
+
+      end
     end
 
     def string(value = '')

data/lib/vedeu/support/menu.rb

@@ -9,16 +9,16 @@ module Vedeu
 
     def events
       @_events ||= Vedeu.events.add(self) do
-        on(:menu_next)     { next_item     }
-        on(:menu_prev)     { prev_item     }
-        on(:menu_top)      { top_item      }
-        on(:menu_bottom)   { bottom_item   }
-        on(:menu_select)   { select_item   }
-        on(:menu_deselect) { deselect_item }
-
-        on(:menu_selected) { selected_item }
-        on(:menu_current)  { current_item  }
-        on(:menu_items)    { items         }
+        event(:menu_next)     { next_item     }
+        event(:menu_prev)     { prev_item     }
+        event(:menu_top)      { top_item      }
+        event(:menu_bottom)   { bottom_item   }
+        event(:menu_select)   { select_item   }
+        event(:menu_deselect) { deselect_item }
+
+        event(:menu_selected) { selected_item }
+        event(:menu_current)  { current_item  }
+        event(:menu_items)    { items         }
       end
     end
 

data/test/lib/vedeu/api/events_test.rb

@@ -3,17 +3,17 @@ require 'test_helper'
 module Vedeu
   module API
     describe Events do
-      describe '#on' do
+      describe '#event' do
         it 'adds the event block to the handlers' do
           skip
           events = Events.new
-          events.on(:some_event) { proc { |x| x } }
+          events.event(:some_event) { proc { |x| x } }
         end
 
         it 'adds the specified throttle to the throttles' do
           skip
           events = Events.new
-          events.on(:some_event, 250) { proc { |x| x } }
+          events.event(:some_event, 250) { proc { |x| x } }
         end
       end
 
@@ -21,7 +21,7 @@ module Vedeu
         it 'returns a collection containing the event when the event is ' \
            'pre-registered' do
           events = Events.new do
-            on(:_exit_) { fail StopIteration }
+            event(:_exit_) { fail StopIteration }
           end
           proc { events.trigger(:_exit_) }.must_raise(StopIteration)
         end

data/test/lib/vedeu/api/interface_test.rb

@@ -8,7 +8,7 @@ module Vedeu
       interface = Interface.new('widget')
 
       it 'creates and stores a new interface' do
-        interface.save.must_be_instance_of(Vedeu::Interface)
+        interface.create.must_be_instance_of(Vedeu::Interface)
       end
 
       it 'allows interfaces to share behaviour' do
@@ -38,35 +38,35 @@ module Vedeu
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { x 0 } }.must_raise(XOutOfBounds)
+        proc { interface.create { x 0 } }.must_raise(XOutOfBounds)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { x 999 } }.must_raise(XOutOfBounds)
+        proc { interface.create { x 999 } }.must_raise(XOutOfBounds)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { y 0 } }.must_raise(YOutOfBounds)
+        proc { interface.create { y 0 } }.must_raise(YOutOfBounds)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { y 999 } }.must_raise(YOutOfBounds)
+        proc { interface.create { y 999 } }.must_raise(YOutOfBounds)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { width 0 } }.must_raise(InvalidWidth)
+        proc { interface.create { width 0 } }.must_raise(InvalidWidth)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { width 999 } }.must_raise(InvalidWidth)
+        proc { interface.create { width 999 } }.must_raise(InvalidWidth)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { height 0 } }.must_raise(InvalidHeight)
+        proc { interface.create { height 0 } }.must_raise(InvalidHeight)
       end
 
       it 'raises an exception when the value is out of bounds' do
-        proc { interface.save { height 999 } }.must_raise(InvalidHeight)
+        proc { interface.create { height 999 } }.must_raise(InvalidHeight)
       end
     end
   end