vedeu 0.1.7 → 0.1.8

data/lib/vedeu/api/view.rb

@@ -1,10 +1,18 @@
 require 'vedeu/api/line'
-require 'vedeu/support/interface_store'
+require 'vedeu/api/store'
 
 module Vedeu
   module API
     InterfaceNotSpecified = Class.new(StandardError)
 
+    def render(object = nil)
+      Vedeu::View.render(object)
+    end
+
+    def view(name = '', &block)
+      Vedeu::API::View.build(name, &block)
+    end
+
     class View
       def self.build(name = '', &block)
         new(name).build(&block)
@@ -33,14 +41,14 @@ module Vedeu
       end
 
       def name
-        return @name if InterfaceStore.query(@name)
+        return @name if Store.query(@name)
       end
 
-      # :nocov:
+      private
+
       def method_missing(method, *args, &block)
         @self_before_instance_eval.send method, *args, &block
       end
-      # :nocov
     end
   end
 end

data/lib/vedeu/application.rb

@@ -1,3 +1,4 @@
+require 'vedeu/instrumentation'
 require 'vedeu/support/input'
 require 'vedeu/support/terminal'
 
@@ -5,7 +6,6 @@ module Vedeu
   ModeSwitch = Class.new(StandardError)
 
   class Application
-    # :nocov:
     def self.start(options = {})
       new(options).start
     end
@@ -18,7 +18,7 @@ module Vedeu
       Terminal.open(mode) do
         Terminal.set_cursor_mode
 
-        Vedeu.events.trigger(:_clear_)
+        Vedeu.events.trigger(:_initialize_)
 
         runner { main_sequence }
       end
@@ -67,16 +67,20 @@ module Vedeu
       options.fetch(:mode)
     end
 
+    def debug
+      Vedeu::Instrumentation::Trace.call if options.fetch(:debug)
+    end
+
     def options
       defaults.merge!(@options)
     end
 
     def defaults
       {
+        debug:       false,
         interactive: true,
         mode:        :raw
       }
     end
-    # :nocov:
   end
 end

data/lib/vedeu/configuration.rb

@@ -26,6 +26,10 @@ module Vedeu
         opts.on('-r', '--raw', 'Run application in raw mode (default).') do
           options[:mode] = :raw
         end
+
+        opts.on('-d', '--debug', 'Run application with debugging on.') do
+          options[:debug] = true
+        end
       end
       parser.parse!(args)
 

data/lib/vedeu/instrumentation.rb

@@ -1,11 +1,8 @@
 require 'date'
 require 'logger'
 
-require 'vedeu'
-
 module Vedeu
   module Instrumentation
-    # :nocov:
     class Log
       def self.logger
         @logger ||= Logger.new(filename).tap do |log|
@@ -25,7 +22,7 @@ module Vedeu
       private
 
       def self.filename
-        File.expand_path('../../..', __FILE__) + '/logs/vedeu.log'
+        Dir.home + '/.vedeu/vedeu.log'
       end
     end
 
@@ -51,10 +48,6 @@ module Vedeu
 
       private
 
-      def pretty!(&block)
-        ["\e[38;5;#{rand(22..231)}m", yield, "\e[38;2;39m"].join
-      end
-
       def watched
         options[:event]
       end
@@ -77,6 +70,5 @@ module Vedeu
       # everything except Interface, Geometry and Terminal
       # klass: /^Vedeu::(?!.*Interface|Geometry|Terminal).*/
     end
-    # :nocov:
   end
 end

data/lib/vedeu/launcher.rb

@@ -3,7 +3,6 @@ require 'vedeu/configuration'
 
 module Vedeu
   class Launcher
-    # :nocov:
     def initialize(argv, stdin  = STDIN,
                          stdout = STDOUT,
                          stderr = STDERR,
@@ -22,9 +21,13 @@ 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
-      Vedeu.error(uncaught_exception)
+      puts uncaught_exception.message
+      puts uncaught_exception.backtrace.join("\n")
 
     ensure
       $stdin, $stdout, $stderr = STDIN, STDOUT, STDERR
@@ -39,6 +42,5 @@ module Vedeu
     def configuration
       Configuration.configure(argv)
     end
-    # :nocov:
   end
 end

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

@@ -0,0 +1,11 @@
+require 'virtus'
+
+require 'vedeu/models/attributes/colour_translator'
+
+module Vedeu
+  class Background < Virtus::Attribute
+    def coerce(value)
+      ColourTranslator.new(value).background
+    end
+  end
+end

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

@@ -5,13 +5,7 @@ module Vedeu
     def coercer(value, model, key)
       return [] if value.nil? || value.empty?
 
-      if value.is_a?(::String)
-        [model.new({ key => value })]
-
-      else
-        [value].flatten.map { |v| model.new(v) }
-
-      end
+      [value].flatten.map { |v| model.new(v) }
     end
   end
 end

data/lib/vedeu/{output → models/attributes}/colour_translator.rb

@@ -1,23 +1,39 @@
 module Vedeu
   class ColourTranslator
     def self.translate(html_colour = '')
-      new(html_colour).translate
+      new(html_colour).value
     end
 
     def initialize(html_colour = '')
       @html_colour = html_colour
     end
 
-    def translate
+    def background
       return '' unless valid?
 
-      [16, red, green, blue].inject(:+)
+      ["\e[48;5;", translate, 'm'].join
+    end
+
+    def foreground
+      return '' unless valid?
+
+      ["\e[38;5;", translate, 'm'].join
+    end
+
+    def value
+      return '' unless valid?
+
+      translate
     end
 
     private
 
     attr_reader :html_colour
 
+    def translate
+      [16, red, green, blue].inject(:+)
+    end
+
     def red
       (html_colour[1..2].to_i(16) / 51) * 36
     end

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

@@ -0,0 +1,11 @@
+require 'virtus'
+
+require 'vedeu/models/attributes/colour_translator'
+
+module Vedeu
+  class Foreground < Virtus::Attribute
+    def coerce(value)
+      ColourTranslator.new(value).foreground
+    end
+  end
+end

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

@@ -1,16 +1,16 @@
 require 'virtus'
 
-require 'vedeu/support/interface_store'
-
-# Todo: mutation (persistence)
+require 'vedeu/api/store'
 
 module Vedeu
   class InterfaceCollection < Virtus::Attribute
     def coerce(values)
       return [] if values.nil? || values.empty?
 
-      [values].flatten.map do |value|
-        InterfaceStore.update(value.fetch(:name, nil), value)
+      [values].flatten.map do |buffer_attributes|
+        interface_attributes = API::Store.query(buffer_attributes[:name])
+
+        Interface.new(buffer_attributes.merge!(interface_attributes))
       end
     end
   end

data/lib/vedeu/models/colour.rb

@@ -1,25 +1,9 @@
 require 'virtus'
 
-require 'vedeu/output/colour_translator'
-require 'vedeu/support/esc'
+require 'vedeu/models/attributes/background'
+require 'vedeu/models/attributes/foreground'
 
 module Vedeu
-  class Background < Virtus::Attribute
-    def coerce(value)
-      return '' if value.nil? || value.empty?
-
-      ["\e[48;5;", ColourTranslator.translate(value), 'm'].join
-    end
-  end
-
-  class Foreground < Virtus::Attribute
-    def coerce(value)
-      return '' if value.nil? || value.empty?
-
-      ["\e[38;5;", ColourTranslator.translate(value), 'm'].join
-    end
-  end
-
   class Colour
     include Virtus.model
 

data/lib/vedeu/models/interface.rb

@@ -5,10 +5,9 @@ require 'vedeu'
 require 'vedeu/models/attributes/line_collection'
 require 'vedeu/models/colour'
 require 'vedeu/models/style'
-require 'vedeu/output/clear_interface'
-require 'vedeu/output/render_interface'
+require 'vedeu/output/clear'
+require 'vedeu/output/render'
 require 'vedeu/models/geometry'
-require 'vedeu/support/queue'
 require 'vedeu/support/terminal'
 
 # Todo: mutation (events, current)
@@ -16,7 +15,6 @@ require 'vedeu/support/terminal'
 module Vedeu
   class Interface
     extend Forwardable
-    include Vedeu::Queue
     include Virtus.model
 
     attribute :name,     String
@@ -28,31 +26,42 @@ module Vedeu
     attribute :current,  String,   default: ''
     attribute :cursor,   Boolean,  default: true
     attribute :delay,    Float,    default: 0
+    attribute :buffer,   Array,    default: []
 
     def_delegators :@geometry, :north, :east, :south, :west,
-                               :top, :right, :bottom, :left
+                               :top, :right, :bottom, :left,
+                               :width, :height, :origin
 
     def initialize(attributes = {})
       super
 
-      Vedeu.events.on(:_refresh_, self.delay)                        { refresh }
-      Vedeu.events.on("_refresh_group_#{group}_".to_sym, self.delay) { refresh } unless group.nil? || group.empty?
-      Vedeu.events.on("_refresh_#{name}_".to_sym, self.delay)        { refresh }
+      Vedeu.events.on(:_refresh_, self.delay)                 { refresh }
+      Vedeu.events.on("_refresh_#{name}_".to_sym, self.delay) { refresh }
+
+      unless group.nil? || group.empty?
+        Vedeu.events.on("_refresh_group_#{group}_".to_sym, self.delay) do
+          refresh
+        end
+      end
 
       self
     end
 
     def clear
-      @_clear ||= ClearInterface.call(self)
+      @_clear ||= Clear.call(self)
+    end
+
+    def dequeue
+      buffer.pop
     end
 
     def enqueue
-      super(self.to_s)
+      buffer.unshift(self.to_s)
     end
 
     def refresh
-      if enqueued?
-        self.current = dequeue
+      if buffer.any?
+        self.current = buffer.pop
 
       elsif no_content?
         self.current = clear
@@ -67,7 +76,7 @@ module Vedeu
     end
 
     def to_s
-      RenderInterface.call(self)
+      Render.call(self)
     end
 
     private

data/lib/vedeu/models/line.rb

@@ -9,12 +9,11 @@ module Vedeu
     include Virtus.model
 
     attribute :colour,  Colour, default: Colour.new
-    attribute :model,   Hash
     attribute :streams, StreamCollection
     attribute :style,   Style,  default: ''
 
     def to_s
-      [colour, style, streams].join
+      [ colour, style, streams ].join
     end
   end
 end

data/lib/vedeu/models/stream.rb

@@ -11,20 +11,28 @@ module Vedeu
     attribute :style,  Style,   default: ''
     attribute :text,   String,  default: ''
     attribute :width,  Integer
-    attribute :align,  Symbol,  default: :left # :centre, :right
-
-    def to_s(options = {})
-      if width
-        aligned = case align
-        when :left   then text.ljust(width,  ' ')
-        when :right  then text.rjust(width,  ' ')
-        when :centre then text.center(width, ' ')
-        end
-
-        [colour, style, aligned].join
-      else
-        [colour, style, text].join
+    attribute :align,  Symbol,  default: :left
+
+    def to_s
+      [ colour, style, data ].join
+    end
+
+    private
+
+    def data
+      width? ? aligned : text
+    end
+
+    def aligned
+      case align
+      when :right  then text.rjust(width,  ' ')
+      when :centre then text.center(width, ' ')
+      else text.ljust(width, ' ')
       end
     end
+
+    def width?
+      !!width
+    end
   end
 end

data/lib/vedeu/output/{clear_interface.rb → clear.rb}

@@ -1,5 +1,5 @@
 module Vedeu
-  class ClearInterface
+  class Clear
     def self.call(interface)
       new(interface).clear
     end
@@ -10,9 +10,9 @@ module Vedeu
 
     def clear
       interface_lines.inject([colours]) do |line, index|
-        line << interface.geometry.origin(index)
-        line << ' ' * interface.geometry.width
-        line << interface.geometry.origin(index)
+        line << interface.origin(index)
+        line << ' ' * interface.width
+        line << interface.origin(index)
       end.join
     end
 
@@ -25,7 +25,7 @@ module Vedeu
     end
 
     def interface_lines
-      interface.geometry.height.times
+      interface.height.times
     end
   end
 end