vedeu 0.0.25 → 0.0.26

data/lib/vedeu/models/interface_collection.rb

@@ -0,0 +1,24 @@
+require 'virtus'
+
+require_relative '../repository/interface_repository'
+require_relative 'coercions'
+
+module Vedeu
+  class InterfaceCollection < Virtus::Attribute
+    include Coercions
+
+    def coerce(values)
+      return [] if empty?(values)
+
+      if multiple?(values)
+        values.map do |value|
+          InterfaceRepository.update(value[:name], value)
+        end
+
+      elsif single?(values)
+        [InterfaceRepository.update(values[:name], values)]
+
+      end
+    end
+  end
+end

data/lib/vedeu/models/line.rb

@@ -0,0 +1,22 @@
+require 'oj'
+require 'virtus'
+
+require_relative 'presentation'
+require_relative 'stream_collection'
+
+module Vedeu
+  class Line
+    include Virtus.model
+    include Presentation
+
+    attribute :streams, StreamCollection
+
+    def to_json
+      Oj.dump(attributes, mode: :compat)
+    end
+
+    def to_s
+      [colour, style, streams].join
+    end
+  end
+end

data/lib/vedeu/models/line_collection.rb

@@ -0,0 +1,27 @@
+require 'virtus'
+
+require_relative 'line'
+require_relative 'coercions'
+
+module Vedeu
+  class InvalidLine < StandardError; end
+
+  class LineCollection < Virtus::Attribute
+    include Coercions
+
+    def coerce(values)
+      return [] if empty?(values)
+
+      if multiple?(values)
+        values.map { |v| Line.new(v) }
+
+      elsif single?(values)
+        [Line.new(values)]
+
+      elsif just_text?(values)
+        [Line.new({ streams: values })]
+
+      end
+    end
+  end
+end

data/lib/vedeu/models/presentation.rb

@@ -0,0 +1,13 @@
+require 'virtus'
+
+require_relative 'colour'
+require_relative 'style_collection'
+
+module Vedeu
+  module Presentation
+    include Virtus.module
+
+    attribute :colour, Colour
+    attribute :style,  StyleCollection
+  end
+end

data/lib/vedeu/models/stream.rb

@@ -0,0 +1,21 @@
+require 'virtus'
+
+require_relative 'presentation'
+require_relative '../support/terminal'
+
+module Vedeu
+  class Stream
+    include Virtus.model
+    include Presentation
+
+    attribute :text, String, default: ''
+
+    def to_json
+      Oj.dump(attributes, mode: :compat)
+    end
+
+    def to_s(options = {})
+      [colour, style, text].join
+    end
+  end
+end

data/lib/vedeu/models/stream_collection.rb

@@ -0,0 +1,27 @@
+require 'virtus'
+
+require_relative 'stream'
+require_relative 'coercions'
+
+module Vedeu
+  class InvalidStream < StandardError; end
+
+  class StreamCollection < Virtus::Attribute
+    include Coercions
+
+    def coerce(values)
+      return [] if empty?(values)
+
+      if multiple?(values)
+        values.map { |v| Stream.new(v) }
+
+      elsif single?(values)
+        [Stream.new(values)]
+
+      elsif values.is_a?(String)
+        [Stream.new({ text: values })]
+
+      end
+    end
+  end
+end

data/lib/vedeu/models/style_collection.rb

@@ -0,0 +1,23 @@
+require 'virtus'
+
+require_relative '../support/cursor'
+require_relative '../support/esc'
+require_relative 'coercions'
+
+module Vedeu
+  class StyleCollection < Virtus::Attribute
+    include Coercions
+
+    def coerce(values)
+      return '' if empty?(values)
+
+      if multiple?(values)
+        values.map { |value| Esc.stylize(value) }.join
+
+      elsif just_text?(values)
+        Esc.stylize(values)
+
+      end
+    end
+  end
+end

data/lib/vedeu/output/interface_renderer.rb

@@ -0,0 +1,62 @@
+require_relative '../support/geometry'
+
+module Vedeu
+  class InterfaceRenderer
+    def self.clear(interface)
+      new(interface).clear
+    end
+
+    def self.render(interface)
+      new(interface).render
+    end
+
+    def initialize(interface)
+      @interface = interface
+    end
+
+    def clear
+      set_colour + clear_lines
+    end
+
+    def render
+      out = []
+      content_lines.each_with_index do |line, index|
+        out << origin(index)
+        out << line.to_s
+      end
+      out.join
+    end
+
+    private
+
+    attr_reader :interface
+
+    def content_lines
+      interface.lines
+    end
+
+    def set_colour
+      interface.colour.to_s
+    end
+
+    def clear_lines
+      height.times.inject([]) { |line, index| line << clear_line(index) }.join
+    end
+
+    def clear_line(index)
+      origin(index) + (' ' * width) + origin(index)
+    end
+
+    def origin(index)
+      Geometry.origin(interface, index)
+    end
+
+    def height
+      interface.height
+    end
+
+    def width
+      interface.width
+    end
+  end
+end

data/lib/vedeu/output/output.rb

@@ -1,16 +1,17 @@
+require_relative '../repository/interface_repository'
+require_relative '../support/terminal'
+
 module Vedeu
   class Output
-    class << self
-      def render
-        new.render
-      end
+    def self.render
+      new.render
     end
 
     def initialize; end
 
     def render
       InterfaceRepository.refresh.each do |interface|
-        interface.each { |stream| Terminal.output(stream) if stream }
+        Terminal.output(interface)
       end
     end
   end

data/lib/vedeu/process/process.rb

@@ -1,51 +1,35 @@
+require_relative '../repository/command_repository'
+require_relative '../support/queue'
+require_relative '../support/parser'
+
 module Vedeu
   class Process
-    class << self
-      def evaluate
-        new.evaluate
-      end
+    def self.evaluate
+      new.evaluate
     end
 
     def initialize; end
 
     def evaluate
-      fail StopIteration if result == :stop
+      fail StopIteration if no_result?
+
+      json = Parser.parse(result)
 
-      Compositor.arrange(result) unless no_result?
+      Composition.enqueue(json)
     end
 
     private
 
-    def result
-      @result ||= command.execute(*args) if command
-    end
-
     def no_result?
-      result.nil? || result.empty?
-    end
-
-    def command
-      @command ||= find_by_keypress || find_by_keyword
+      result.nil? || result.empty? || result == :stop
     end
 
-    def find_by_keypress
-      CommandRepository.by_keypress(input) if keypress?
-    end
-
-    def find_by_keyword
-      CommandRepository.by_keyword(input) if keyword?
-    end
-
-    def keypress?
-      input? && input.size == 1
-    end
-
-    def keyword?
-      input? && input.size > 1
+    def result
+      @result ||= command.execute(*args) if command
     end
 
-    def input?
-      !!(input)
+    def command
+      @command ||= CommandRepository.by_input(input)
     end
 
     def input

data/lib/vedeu/repository/command_repository.rb

@@ -1,14 +1,15 @@
+require_relative '../models/command'
+require_relative 'repository'
+
 module Vedeu
   module CommandRepository
     extend Repository
     extend self
 
-    def by_keypress(input)
-      query(entity, :keypress, input)
-    end
+    def by_input(input)
+      return nil unless input
 
-    def by_keyword(input)
-      query(entity, :keyword, input)
+      by_keypress(input) || by_keyword(input)
     end
 
     def create(attributes)
@@ -18,17 +19,15 @@ module Vedeu
     def entity
       Command
     end
-  end
 
-  # :nocov:
-  module ClassMethods
-    def command(name, options = {})
-      command_name = name.is_a?(Symbol) ? name.to_s : name
+    private
 
-      CommandRepository.create({
-        name: command_name
-      }.merge!(options))
+    def by_keypress(input)
+      query(entity, :keypress, input)
+    end
+
+    def by_keyword(input)
+      query(entity, :keyword, input)
     end
   end
-  # :nocov:
 end

data/lib/vedeu/repository/interface_repository.rb

@@ -1,3 +1,6 @@
+require_relative '../models/interface'
+require_relative 'repository'
+
 module Vedeu
   class UndefinedInterface < StandardError; end
 
@@ -15,28 +18,24 @@ module Vedeu
       result
     end
 
+    def update(name, attributes = {})
+      interface = find(name)
+      interface.attributes = attributes
+      interface
+    rescue UndefinedInterface
+      create(attributes)
+    end
+
     def refresh
       by_layer.map { |interface| interface.refresh }.compact
     end
 
     def by_layer
-      all.sort_by { |interface| interface.layer }
+      all.sort_by { |interface| interface.z }
     end
 
     def entity
       Interface
     end
   end
-
-  # :nocov:
-  module ClassMethods
-    def interface(name, options = {})
-      interface_name = name.is_a?(Symbol) ? name.to_s : name
-
-      InterfaceRepository.create({
-        name: interface_name
-      }.merge!(options))
-    end
-  end
-  # :nocov:
 end

data/lib/vedeu/repository/repository.rb

@@ -1,3 +1,5 @@
+require_relative 'storage'
+
 module Vedeu
   module Repository
     def adaptor

data/lib/vedeu/{output → support}/cursor.rb

@@ -1,3 +1,5 @@
+require_relative 'esc'
+
 module Vedeu
   module Cursor
     extend self

data/lib/vedeu/support/esc.rb

@@ -0,0 +1,112 @@
+require_relative 'cursor'
+require_relative 'terminal'
+require_relative 'translator'
+
+module Vedeu
+  module Esc
+    extend self
+
+    def background_colour(value = '#000000')
+      [esc, '48;5;', colour_translator(value), 'm'].join
+    end
+
+    def blink
+      [esc, '5m'].join
+    end
+
+    def blink_off
+      [esc, '25m'].join
+    end
+
+    def bold
+      [esc, '1m'].join
+    end
+
+    def bold_off
+      [esc, '21m'].join
+    end
+
+    def clear
+      [esc, '2J'].join
+    end
+
+    def clear_line
+      [esc, '2K'].join
+    end
+
+    def clear_last_line()
+      set_position((Terminal.height - 1), 1) + clear_line
+    end
+
+    # def cursor(value)
+    #   Cursor.
+    # end
+
+    def esc
+      [27.chr, '['].join
+    end
+
+    def foreground_colour(value = '#ffffff')
+      [esc, '38;5;', colour_translator(value), 'm'].join
+    end
+#
+    def negative
+      [esc, '7m'].join
+    end
+
+    def positive
+      [esc, '27m'].join
+    end
+
+    def normal
+      [underline_off, bold_off, positive].join
+    end
+
+    def dim
+      [esc, '2m'].join
+    end
+
+    def reset
+      [esc, '0m'].join
+    end
+
+    def set_position(y = 1, x = 1)
+      [esc, ((y == 0 || y == nil) ? 1 : y), ';', ((x == 0 || x == nil) ? 1 : x), 'H'].join
+    end
+
+    def stylize(value = 'normal')
+      case value
+      when 'blink'         then blink
+      when 'blink_off'     then blink_off
+      when 'bold'          then bold
+      when 'bold_off'      then bold_off
+      when 'clear'         then clear
+      when 'hide_cursor'   then Cursor.hide
+      when 'negative'      then negative
+      when 'positive'      then positive
+      when 'reset'         then reset
+      when 'normal'        then normal
+      when 'dim'           then dim
+      when 'show_cursor'   then Cursor.show
+      when 'underline'     then underline
+      when 'underline_off' then underline_off
+      else
+        ''
+      end
+    end
+
+    def underline
+      [esc, '4m'].join
+    end
+
+    def underline_off
+      [esc, '24m'].join
+    end
+
+    private
+
+    def colour_translator(value)
+      Translator.translate(value)
+    end
+  end
+end