vedeu 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bc23985fc8270da6cebe20612c4aaa02967a07f
-  data.tar.gz: bf6587149152e3111183fe10abe958376a024872
+  metadata.gz: 79cbcf71bd0a9c214cd3764d10cfc21e8b6aeffa
+  data.tar.gz: 570893355905af7e58d89e64cc419ee361133dd3
 SHA512:
-  metadata.gz: dd0458ce9a0b1e2b93788a4adef0439e7946db8a5e4e508ce68a662d885dd726b900692af0b8dfd385f24ddb78be19a0ddf5ce628c165243de0672a499a82cc8
-  data.tar.gz: 6a56e31aba151c295f6989e43947a1e0e6b7571cd5c65d8b17077abf3c15eee7d3fa558559f9e72db63421e1afedb5aeba46eb7b5052b937a49efe5191cb78c0
+  metadata.gz: 0d143574721a8b5a0e07eb6fb081c3768fa3c994c28a72303b07f9c1abc3a384262fa8c7abe493dceb5c3069f060b0521c804d1c7cff6bf5864fb2cd9922ba22
+  data.tar.gz: 502eb3bba9db28fc1ca44b1f6cd7dd017c18fc3d1f0ce6783d23b56459d758d3dd9cd0d1fb6dc54448fc13342b001304123b4914b206e43617f437cfa5980967

data/lib/vedeu.rb

@@ -25,6 +25,7 @@ require 'vedeu/models/store'
 require 'vedeu/models/stream'
 
 require 'vedeu/api/api'
+require 'vedeu/api/composition'
 require 'vedeu/api/events'
 require 'vedeu/api/grid'
 require 'vedeu/api/helpers'
@@ -42,6 +43,7 @@ require 'vedeu/output/clear'
 require 'vedeu/output/render'
 require 'vedeu/output/view'
 
+require 'vedeu/support/buffer'
 require 'vedeu/support/position'
 require 'vedeu/support/esc'
 require 'vedeu/support/input'

data/lib/vedeu/api/api.rb

@@ -42,7 +42,15 @@ module Vedeu
     end
 
     def view(name, &block)
-      API::Interface.build({ name: name }, &block)
+      {
+        interfaces: [
+          API::Interface.build({ name: name }, &block)
+        ]
+      }
+    end
+
+    def views(&block)
+      API::Composition.build(&block)
     end
 
     def width

data/lib/vedeu/api/composition.rb

@@ -0,0 +1,29 @@
+module Vedeu
+  module API
+    class Composition < Vedeu::Composition
+      def self.build(&block)
+        new(&block).attributes
+      end
+
+      def initialize(&block)
+        super
+
+        if block_given?
+          @self_before_instance_eval = eval('self', block.binding)
+
+          instance_eval(&block)
+        end
+      end
+
+      def view(name, &block)
+        attributes[:interfaces] << Interface.build({ name: name }, &block)
+      end
+
+      private
+
+      def method_missing(method, *args, &block)
+        @self_before_instance_eval.send(method, *args, &block)
+      end
+    end
+  end
+end

data/lib/vedeu/api/interface.rb

@@ -26,10 +26,8 @@ module Vedeu
 
       def define(&block)
         instance_eval(&block) if block_given?
-        stored_attributes = Vedeu::Store.create(attributes)
-        interface = Vedeu::Interface.new(stored_attributes)
-        Vedeu::Buffers.create(interface)
-        interface
+
+        Vedeu::Store.create(attributes)
       end
 
       def line(&block)
@@ -88,6 +86,8 @@ module Vedeu
         attributes[:style] = value
       end
 
+      private
+
       def y_out_of_bounds?(value)
         value < 1 || value > Terminal.height
       end

data/lib/vedeu/launcher.rb

@@ -18,10 +18,6 @@ module Vedeu
       Application.start(configuration)
 
       @exit_code = 0
-    # rescue Vedeu::API::InvalidHeight, Vedeu::API::InvalidWidth
-    #   Vedeu.error("Cannot run this application.\n " \
-    #               "Your terminal window is too small.")
-
     rescue StandardError => uncaught_exception
       puts uncaught_exception.message
       puts uncaught_exception.backtrace.join("\n")

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

@@ -1,34 +1,19 @@
 module Vedeu
   class ColourTranslator
-    def initialize(html_colour = '', options = {})
+    def initialize(html_colour = '')
       @html_colour = html_colour
-      @options     = options
     end
 
     def background
       return '' unless valid?
 
-      if truecolor?
-        r, g, b = translate
-        ["\e[48;2;", r, ';', g, ';', b, 'm'].join
-
-      else
-        ["\e[48;5;", translate, 'm'].join
-
-      end
+      sprintf("\e[48;2;%s;%s;%sm", *translate)
     end
 
     def foreground
       return '' unless valid?
 
-      if truecolor?
-        r, g, b = translate
-        ["\e[38;2;", r, ';', g, ';', b, 'm'].join
-
-      else
-        ["\e[38;5;", translate, 'm'].join
-
-      end
+      sprintf("\e[38;2;%s;%s;%sm", *translate)
     end
 
     private
@@ -36,60 +21,15 @@ module Vedeu
     attr_reader :html_colour
 
     def translate
-      if truecolor?
-        [red, green, blue]
-      else
-        [
-          16,
-          ((red / 51) * 36),
-          ((green / 51) * 6),
-          ((blue / 51) * 1)
-        ].inject(:+)
-      end
-    end
-
-    def red
-      html_colour[1..2].to_i(16)
-    end
-
-    def green
-      html_colour[3..4].to_i(16)
-    end
-
-    def blue
-      html_colour[5..6].to_i(16)
+      [
+        html_colour[1..2].to_i(16),
+        html_colour[3..4].to_i(16),
+        html_colour[5..6].to_i(16)
+      ]
     end
 
     def valid?
-      present? && valid_type? && valid_format?
-    end
-
-    def present?
-      return true unless html_colour.nil? || html_colour.empty?
-
-      false
-    end
-
-    def valid_type?
-      html_colour.is_a?(String)
-    end
-
-    def valid_format?
-      html_colour =~ /^#([A-Fa-f0-9]{6})$/
-    end
-
-    def truecolor?
-      options.fetch(:truecolor)
-    end
-
-    def options
-      defaults.merge!(@options)
-    end
-
-    def defaults
-      {
-        truecolor: false
-      }
+      html_colour.is_a?(String) && html_colour =~ /^#([A-Fa-f0-9]{6})$/
     end
   end
 end

data/lib/vedeu/models/colour.rb

@@ -9,13 +9,11 @@ module Vedeu
     end
 
     def foreground
-      @foreground ||= ColourTranslator
-        .new(attributes[:foreground], { truecolor: false }).foreground
+      @foreground ||= ColourTranslator.new(attributes[:foreground]).foreground
     end
 
     def background
-      @background ||= ColourTranslator
-        .new(attributes[:background], { truecolor: false }).background
+      @background ||= ColourTranslator.new(attributes[:background]).background
     end
 
     def to_s

data/lib/vedeu/models/interface.rb

@@ -39,7 +39,13 @@ module Vedeu
     end
 
     def cursor
-      @cursor ||= attributes[:cursor]
+      @cursor ||= if cursor?
+        Esc.string('show_cursor')
+
+      else
+        Esc.string('hide_cursor')
+
+      end
     end
 
     def delay
@@ -52,6 +58,10 @@ module Vedeu
 
     private
 
+    def cursor?
+      attributes[:cursor] == true
+    end
+
     def defaults
       {
         name:     '',

data/lib/vedeu/models/store.rb

@@ -1,25 +1,29 @@
 module Vedeu
   EntityNotFound = Class.new(StandardError)
 
-    module Store
-      extend self
+  module Store
+    extend self
 
-      def create(attributes)
-        storage.store(attributes[:name], attributes)
-      end
+    def create(attributes)
+      storage.store(attributes[:name], attributes)
 
-      def query(name)
-        storage.fetch(name) { fail EntityNotFound, 'Interface was not found.' }
-      end
+      Buffers.create(Interface.new(attributes))
 
-      def reset
-        @storage = {}
-      end
+      storage
+    end
+
+    def query(name)
+      storage.fetch(name) { fail EntityNotFound, 'Interface was not found.' }
+    end
+
+    def reset
+      @storage = {}
+    end
 
-      private
+    private
 
-      def storage
-        @storage ||= {}
-      end
+    def storage
+      @storage ||= {}
     end
+  end
 end

data/lib/vedeu/output/buffers.rb

@@ -5,66 +5,61 @@ module Vedeu
     extend self
 
     def create(interface)
-      buffers[interface.name][:clear] = Clear.call(interface)
-      buffers[interface.name][:group] = interface.group
-
-      Vedeu.event("_refresh_#{interface.name}_".to_sym, interface.delay) do
-        refresh(interface.name)
-      end
-
-      unless interface.group.nil? || interface.group.empty?
-        Vedeu.event("_refresh_group_#{interface.group}_".to_sym, interface.delay) do
-          refresh_group(interface.group)
-        end
-      end
+      store(interface.name, Buffer.new({
+                              name:    interface.name,
+                              clear:   Clear.call(interface),
+                              current: '',
+                              group:   interface.group,
+                              next:    ''
+                            }))
+
+      create_events(interface.name, interface.group, interface.delay)
     end
 
     def enqueue(name, sequence)
-      buffers[name][:next].unshift(sequence)
+      store(name, query(name).enqueue(sequence))
     end
 
-    def query(name)
-      buffers.fetch(name) do
-        fail RefreshFailed, 'Cannot refresh non-existent interface.'
-      end
+    def refresh_all
+      buffers.keys.map { |name| refresh(name) }
     end
 
-    def refresh_group(group)
-      buffers.select.map do |name, buffer|
-        name if buffer[:group] == group
-      end.compact.map { |name| refresh(name) }
+    def reset
+      @buffers = {}
     end
 
-    def refresh(name)
-      data = query(name)
-
-      sequence = if data[:next].any?
-        data[:current] = data[:next].pop
+    private
 
-      elsif data[:current].empty?
-        data[:clear]
+    def create_events(name, group, delay)
+      Vedeu.event("_refresh_#{name}_".to_sym, delay) { refresh(name) }
 
-      else
-        data[:current]
+      Vedeu.event("_refresh_group_#{group}_".to_sym, delay) do
+        refresh_group(group)
+      end unless group.nil? || group.empty?
+    end
 
-      end
-      Terminal.output(sequence)
+    def query(name)
+      buffers.fetch(name) {
+        fail RefreshFailed, 'Cannot refresh non-existent interface.'
+      }
     end
 
-    def refresh_all
-      buffers.keys.map { |name| refresh(name) }
+    def refresh(name)
+      store(name, query(name).refresh)
     end
 
-    def reset
-      @buffers = {}
+    def refresh_group(group)
+      buffers.select.map do |name, buffer|
+        name if buffer.group == group
+      end.compact.map { |name| refresh(name) }
     end
 
-    private
+    def store(name, buffer)
+      buffers.store(name, buffer)
+    end
 
     def buffers
-      @buffers ||= Hash.new do |hash, key|
-        hash[key] = { current: '', next: [], clear: '', group: '' }
-      end
+      @buffers ||= {}
     end
   end
 end

data/lib/vedeu/output/clear.rb

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

data/lib/vedeu/output/render.rb

@@ -16,6 +16,7 @@ module Vedeu
           out << line.to_s
         end
       end
+      out << interface.cursor
       out.join
     end
 

data/lib/vedeu/output/view.rb

@@ -35,9 +35,7 @@ module Vedeu
     end
 
     def attributes
-      {
-        interfaces: [ output ]
-      }
+      output
     end
   end
 end

data/lib/vedeu/support/buffer.rb

@@ -0,0 +1,41 @@
+module Vedeu
+  class Buffer
+    attr_reader :clear, :current, :group, :name, :_next
+
+    def initialize(vars)
+      @vars    = vars
+      @name    = vars.fetch(:name)
+      @clear   = vars.fetch(:clear)
+      @current = vars.fetch(:current)
+      @group   = vars.fetch(:group)
+      @_next   = vars.fetch(:next)
+    end
+
+    def enqueue(sequence)
+      merge({ next: sequence })
+    end
+
+    def refresh
+      sequence = if !_next.empty?
+        merge({ current: _next, next: '' }).current
+
+      elsif current.empty?
+        clear
+
+      else
+        current
+
+      end
+
+      Terminal.output(sequence)
+
+      self
+    end
+
+    private
+
+    def merge(vars)
+      Buffer.new(@vars.merge(vars))
+    end
+  end
+end