vedeu 0.0.39 → 0.0.40

data/lib/vedeu/launcher.rb

@@ -1,5 +1,5 @@
-require_relative 'application'
-require_relative 'configuration'
+require 'vedeu/application'
+require 'vedeu/configuration'
 
 module Vedeu
   class Launcher

data/lib/vedeu/models/attributes/interface_collection.rb

@@ -1,6 +1,6 @@
 require 'virtus'
 
-require_relative '../../repository/interface_repository'
+require 'vedeu/support/persistence'
 
 module Vedeu
   class InterfaceCollection < Virtus::Attribute
@@ -8,7 +8,7 @@ module Vedeu
       return [] if values.nil? || values.empty?
 
       [values].flatten.map do |value|
-        InterfaceRepository.update(value.fetch(:name, nil), value)
+        Persistence.update(value.fetch(:name, nil), value)
       end
     end
   end

data/lib/vedeu/models/attributes/line_collection.rb

@@ -1,7 +1,7 @@
 require 'virtus'
 
-require_relative 'collection'
-require_relative '../line'
+require 'vedeu/models/attributes/collection'
+require 'vedeu/models/line'
 
 module Vedeu
   class LineCollection < Virtus::Attribute

data/lib/vedeu/models/attributes/stream_collection.rb

@@ -1,7 +1,7 @@
 require 'virtus'
 
-require_relative 'collection'
-require_relative '../stream'
+require 'vedeu/models/attributes/collection'
+require 'vedeu/models/stream'
 
 module Vedeu
   class StreamCollection < Virtus::Attribute

data/lib/vedeu/models/colour.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'virtus'
 
-require_relative '../support/esc'
+require 'vedeu/support/esc'
 
 module Vedeu
   class Colour

data/lib/vedeu/models/composition.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'virtus'
 
-require_relative 'attributes/interface_collection'
+require 'vedeu/models/attributes/interface_collection'
 
 module Vedeu
   class Composition

data/lib/vedeu/models/interface.rb

@@ -1,14 +1,15 @@
 require 'json'
 require 'virtus'
 
-require_relative 'attributes/line_collection'
-require_relative 'presentation'
-require_relative 'style'
-require_relative '../output/clear_interface'
-require_relative '../output/render_interface'
-require_relative '../support/geometry'
-require_relative '../support/queue'
-require_relative '../support/terminal'
+require 'vedeu'
+require 'vedeu/models/attributes/line_collection'
+require 'vedeu/models/presentation'
+require 'vedeu/models/style'
+require 'vedeu/output/clear_interface'
+require 'vedeu/output/render_interface'
+require 'vedeu/support/geometry'
+require 'vedeu/support/queue'
+require 'vedeu/support/terminal'
 
 module Vedeu
   class Interface
@@ -21,13 +22,18 @@ module Vedeu
     attribute :lines,   LineCollection
     attribute :y,       Integer, default: 1
     attribute :x,       Integer, default: 1
-    attribute :z,       Integer, default: 1
     attribute :width,   Integer, default: Terminal.width
     attribute :height,  Integer, default: Terminal.height
     attribute :current, String,  default: ''
     attribute :cursor,  Boolean, default: true
     attribute :centred, Boolean, default: false
 
+    def initialize(attributes = {})
+      Vedeu.events.on(:refresh) { refresh }
+
+      super
+    end
+
     def enqueue
       super(self.to_s)
     end
@@ -51,6 +57,9 @@ module Vedeu
         self.current
 
       end
+      Terminal.output(self.current)
+
+      self.current
     end
 
     def to_json(*args)
@@ -61,7 +70,6 @@ module Vedeu
         lines:  lines,
         y:      y,
         x:      x,
-        z:      z,
         width:  width,
         height: height,
         cursor: cursor

data/lib/vedeu/models/line.rb

@@ -1,9 +1,9 @@
 require 'json'
 require 'virtus'
 
-require_relative 'attributes/stream_collection'
-require_relative 'presentation'
-require_relative 'style'
+require 'vedeu/models/attributes/stream_collection'
+require 'vedeu/models/presentation'
+require 'vedeu/models/style'
 
 module Vedeu
   class Line

data/lib/vedeu/models/presentation.rb

@@ -1,6 +1,6 @@
 require 'virtus'
 
-require_relative 'colour'
+require 'vedeu/models/colour'
 
 module Vedeu
   module Presentation

data/lib/vedeu/models/stream.rb

@@ -1,8 +1,8 @@
 require 'json'
 require 'virtus'
 
-require_relative 'presentation'
-require_relative 'style'
+require 'vedeu/models/presentation'
+require 'vedeu/models/style'
 
 module Vedeu
   class Stream

data/lib/vedeu/models/style.rb

@@ -1,4 +1,4 @@
-require_relative '../support/esc'
+require 'vedeu/support/esc'
 
 module Vedeu
   module Style

data/lib/vedeu/output/render_interface.rb

@@ -1,4 +1,4 @@
-require_relative 'clear_interface'
+require 'vedeu/output/clear_interface'
 
 module Vedeu
   class RenderInterface

data/lib/vedeu/{support → parsing}/compositor.rb

@@ -1,4 +1,4 @@
-require_relative '../models/composition'
+require 'vedeu/models/composition'
 
 module Vedeu
   class Compositor

data/lib/vedeu/parsing/hash_parser.rb

@@ -1,4 +1,4 @@
-require_relative 'text_adaptor'
+require 'vedeu/parsing/text_adaptor'
 
 module Vedeu
   class HashParser

data/lib/vedeu/parsing/parser.rb

@@ -1,12 +1,14 @@
-require_relative '../support/compositor'
-require_relative 'hash_parser'
-require_relative 'json_parser'
+require 'vedeu/parsing/compositor'
+require 'vedeu/parsing/hash_parser'
+require 'vedeu/parsing/json_parser'
 
 module Vedeu
-  class ParseError < StandardError; end
+  ParseError = Class.new(StandardError)
 
   class Parser
     def self.parse(output = {})
+      return nil if output.nil? || output.empty?
+
       new(output).parse
     end
 
@@ -15,8 +17,6 @@ module Vedeu
     end
 
     def parse
-      return nil if empty?
-
       Compositor.enqueue(parsed_output)
     end
 
@@ -42,9 +42,5 @@ module Vedeu
     def json?
       output.is_a?(String)
     end
-
-    def empty?
-      output.nil? || output.empty?
-    end
   end
 end

data/lib/vedeu/{models/builders → support}/builder.rb

@@ -1,3 +1,6 @@
+require 'vedeu/support/geometry'
+require 'vedeu/support/persistence'
+
 module Vedeu
   class Builder
     def self.build(name, &block)
@@ -11,23 +14,30 @@ module Vedeu
     def build(&block)
       self.instance_eval(&block)
 
-      repository.create(attributes)
-    end
-
-    def repository
-      fail StandardError, 'Subclasses implement this.'
+      Persistence.create(attributes)
     end
 
     private
 
     attr_reader :name
 
-    def attributes
-      user_attributes.merge!(overrides)
+    def overrides
+      @overrides = if user_attributes[:centred] == true
+        { x: geometry.left, y: geometry.top }
+      else
+        {}
+      end
     end
 
-    def overrides
-      {}
+    def geometry
+      @_geometry ||= Geometry.new({
+        height: user_attributes[:height],
+        width:  user_attributes[:width],
+      })
+    end
+
+    def attributes
+      user_attributes.merge!(overrides)
     end
 
     def user_attributes

data/lib/vedeu/support/esc.rb

@@ -1,4 +1,4 @@
-require_relative 'translator'
+require 'vedeu/support/translator'
 
 module Vedeu
   module Esc

data/lib/vedeu/support/events.rb

@@ -3,8 +3,7 @@ module Vedeu
     def initialize(&block)
       @handlers = Hash.new { |h, k| h[k] = [] }
 
-      log("Events#initialize " \
-          "self: #{self.object_id}")
+      log("self: #{self.object_id}")
 
       self.instance_eval(&block) if block_given?
 
@@ -12,47 +11,44 @@ module Vedeu
     end
 
     def add(object, &block)
-      log("Events#add " \
-          "self: #{self.object_id}" \
-          "menu: #{object.object_id}")
+      log("self: #{self.object_id}")
+      log("object: #{object.object_id}")
 
-      @self_before_instance_eval = eval "self", block.binding
+      @self_before_instance_eval = eval 'self', block.binding
 
       self.instance_eval(&block)
     end
 
     def on(event, &block)
-      log("Events#on " \
-          "self:  #{self.object_id} " \
-          "block: #{block.object_id} " \
-          "event: #{event.inspect}")
+      log("self: #{self.object_id}")
+      log("block: #{block.object_id}")
+      log("storing: #{event.inspect}")
+
       handlers[event] << block
     end
 
     def trigger(event, *args)
       handlers[event].each do |handler|
-        log("Events#trigger " \
-            "self:    #{self.object_id} " \
-            "handler: #{handler.object_id} " \
-            "event:   #{event.inspect}")
+        log("self: #{self.object_id}")
+        log("handler: #{handler.object_id}")
+        log("running: #{event.inspect}")
+
         handler.call(*args)
       end
     end
 
+    # :nocov:
     def method_missing(method, *args, &block)
       @self_before_instance_eval.send method, *args, &block
     end
+    # :nocov:
 
     private
 
     attr_reader :handlers
 
     def log(message)
-      Vedeu.trigger(:_log_, message) if debug?
-    end
-
-    def debug?
-      false
+      Vedeu.log(sprintf("%42s%s", '', message))
     end
   end
 end

data/lib/vedeu/support/geometry.rb

@@ -1,8 +1,8 @@
-require_relative 'esc'
-require_relative 'terminal'
+require 'vedeu/support/esc'
+require 'vedeu/support/terminal'
 
 module Vedeu
-  class OutOfBoundsError < StandardError; end
+  OutOfBoundsError = Class.new(StandardError)
 
   class Geometry
     def initialize(attrs = {})

data/lib/vedeu/{input → support}/input.rb

@@ -1,6 +1,5 @@
-require_relative '../support/queue'
-require_relative '../support/terminal'
-require_relative '../../vedeu'
+require 'vedeu/support/terminal'
+require 'vedeu'
 
 module Vedeu
   class Input
@@ -10,12 +9,14 @@ module Vedeu
 
     def capture
       Vedeu.trigger(:_keypress_, keypress)
-
-      Queue.enqueue(keypress)
     end
 
     private
 
+    def input
+      @_input ||= Terminal.input
+    end
+
     def keypress
       key        = input
       translated = case key
@@ -53,9 +54,5 @@ module Vedeu
 
       translated
     end
-
-    def input
-      @_input ||= Terminal.input
-    end
   end
 end

data/lib/vedeu/support/menu.rb

@@ -1,5 +1,5 @@
-require_relative '../../vedeu'
-require_relative 'events'
+require 'vedeu'
+require 'vedeu/support/events'
 
 module Vedeu
   class Menu
@@ -47,7 +47,7 @@ module Vedeu
     def items
       items = []
       @collection.each_with_index do |item, index|
-        if index    == @current && index == @selected
+        if index == @current && index == @selected
           items << [true, true, item]
 
         elsif index == @current

data/lib/vedeu/support/persistence.rb

@@ -0,0 +1,41 @@
+require 'vedeu/models/interface'
+
+module Vedeu
+  EntityNotFound = Class.new(StandardError)
+
+  module Persistence
+    extend self
+
+    def update(name, attributes = {})
+      interface = query(name)
+      interface.attributes = attributes
+      interface
+    rescue EntityNotFound
+      create(attributes)
+    end
+
+    def create(attributes)
+      storage.store(attributes[:name], Interface.new(attributes))
+    end
+
+    def query(value)
+      return false if value.nil? || value.empty?
+
+      storage.select do |name, result|
+        return result if name == value
+      end
+
+      fail EntityNotFound, "Interface could not be found."
+    end
+
+    def reset
+      @storage = {}
+    end
+
+    private
+
+    def storage
+      @storage ||= {}
+    end
+  end
+end