vedeu 0.1.9 → 0.1.10

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

@@ -1,8 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/collection'
-require 'vedeu/models/line'
-
 module Vedeu
   class LineCollection < Virtus::Attribute
     include Collection

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

@@ -1,8 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/collection'
-require 'vedeu/models/stream'
-
 module Vedeu
   class StreamCollection < Virtus::Attribute
     include Collection

data/lib/vedeu/models/colour.rb

@@ -1,8 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/background'
-require 'vedeu/models/attributes/foreground'
-
 module Vedeu
   class Colour
     include Virtus.model

data/lib/vedeu/models/composition.rb

@@ -1,24 +1,9 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/interface_collection'
-require 'vedeu/output/buffers'
-
 module Vedeu
   class Composition
     include Virtus.model
 
     attribute :interfaces, InterfaceCollection
 
-    def self.enqueue(attributes)
-      new(attributes).enqueue
-    end
-
-    def enqueue
-      interfaces.map do |interface|
-        Buffers.enqueue(interface.name, interface.to_s)
-      end
-    end
-
     def to_s
       interfaces.map(&:to_s).join
     end

data/lib/vedeu/models/geometry.rb

@@ -1,8 +1,3 @@
-require 'virtus'
-
-require 'vedeu/support/esc'
-require 'vedeu/support/terminal'
-
 module Vedeu
   class Geometry
     include Virtus.model

data/lib/vedeu/models/interface.rb

@@ -1,13 +1,3 @@
-require 'forwardable'
-require 'virtus'
-
-require 'vedeu/models/attributes/line_collection'
-require 'vedeu/models/colour'
-require 'vedeu/models/style'
-require 'vedeu/output/clear'
-require 'vedeu/output/render'
-require 'vedeu/models/geometry'
-
 module Vedeu
   class Interface
     extend Forwardable
@@ -26,10 +16,6 @@ module Vedeu
                                :top, :right, :bottom, :left,
                                :width, :height, :origin
 
-    def clear
-      @_clear ||= Clear.call(self)
-    end
-
     def to_s
       Render.call(self)
     end

data/lib/vedeu/models/line.rb

@@ -1,9 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/attributes/stream_collection'
-require 'vedeu/models/colour'
-require 'vedeu/models/style'
-
 module Vedeu
   class Line
     include Virtus.model

data/lib/vedeu/models/stream.rb

@@ -1,8 +1,3 @@
-require 'virtus'
-
-require 'vedeu/models/colour'
-require 'vedeu/models/style'
-
 module Vedeu
   class Stream
     include Virtus.model

data/lib/vedeu/models/style.rb

@@ -1,7 +1,3 @@
-require 'virtus'
-
-require 'vedeu/support/esc'
-
 module Vedeu
   class Style < Virtus::Attribute
     def coerce(value_or_values)

data/lib/vedeu/output/buffers.rb

@@ -1,13 +1,22 @@
-require 'vedeu/support/terminal'
-
 module Vedeu
   RefreshFailed = Class.new(StandardError)
 
   module Buffers
     extend self
 
-    def create(name, sequence)
-      buffers[name][:clear] = sequence
+    def create(interface)
+      buffers[interface.name][:clear] = Clear.call(interface)
+
+      Vedeu.events.on("_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
+      #     refresh_group(interface.group)
+      #   end
+      # end
     end
 
     def enqueue(name, sequence)

data/lib/vedeu/output/render.rb

@@ -1,6 +1,3 @@
-require 'vedeu/models/line'
-require 'vedeu/models/stream'
-
 module Vedeu
   class Render
     def self.call(interface)
@@ -12,7 +9,7 @@ module Vedeu
     end
 
     def render
-      out = [interface.clear]
+      out = [ Clear.call(interface) ]
       processed_lines.each_with_index do |line, index|
         if index + 1 <= height
           out << interface.origin(index)

data/lib/vedeu/output/view.rb

@@ -1,5 +1,3 @@
-require 'vedeu/models/composition'
-
 module Vedeu
   NotImplemented = Class.new(StandardError)
 
@@ -15,7 +13,9 @@ module Vedeu
     end
 
     def render
-      Composition.enqueue(interfaces)
+      composition.interfaces.map do |interface|
+        Buffers.enqueue(interface.name, interface.to_s)
+      end
     end
 
     def output
@@ -26,6 +26,10 @@ module Vedeu
 
     attr_reader :object
 
+    def composition
+      @_composition ||= Composition.new(interfaces)
+    end
+
     def interfaces
       {
         interfaces: [ output ]

data/lib/vedeu/support/input.rb

@@ -1,6 +1,3 @@
-require 'vedeu/support/terminal'
-require 'vedeu'
-
 module Vedeu
   class Input
     def self.capture

data/lib/vedeu/support/menu.rb

@@ -1,8 +1,3 @@
-require 'vedeu'
-require 'vedeu/api/events'
-
-# Todo: mutation (events, menu)
-
 module Vedeu
   class Menu
     def initialize(collection)

data/lib/vedeu/support/terminal.rb

@@ -1,7 +1,3 @@
-require 'io/console'
-
-require 'vedeu/support/esc'
-
 module Vedeu
   module Terminal
     extend self

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'vedeu/api/events'
 
 module Vedeu
   module API

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

@@ -1,7 +1,5 @@
 require 'test_helper'
 
-require 'vedeu/api/grid'
-
 describe Fixnum do
   describe '#columns' do
     it 'returns the width if the value is in range' do

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'vedeu/api/interface'
 
 module Vedeu
   module API

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'vedeu/api/store'
 
 module Vedeu
   module API

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

@@ -1,8 +1,5 @@
 require 'test_helper'
 
-require 'vedeu/api/view'
-require 'vedeu'
-
 module Vedeu
   module API
     describe View do
@@ -64,7 +61,7 @@ module Vedeu
       it 'handles coloured lines' do
         Vedeu.view 'testing_view' do
           line do
-            colour '#ff0000', '#ffff00'
+            colour background: '#ff0000', foreground: '#ffff00'
             text   '2. Line with colours.'
           end
         end.must_equal(

data/test/lib/vedeu/configuration_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'vedeu/configuration'
 
 module Vedeu
   describe Configuration do

data/test/lib/vedeu/models/attributes/collection_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'vedeu/models/attributes/collection'
 
 module Vedeu
   class TestClass

data/test/lib/vedeu/models/attributes/interface_collection_test.rb

@@ -1,10 +1,5 @@
 require 'test_helper'
 
-require 'vedeu'
-require 'vedeu/models/composition'
-require 'vedeu/models/attributes/interface_collection'
-require 'vedeu/api/store'
-
 module Vedeu
   describe InterfaceCollection do
     describe '#coerce' do

data/test/lib/vedeu/models/attributes/line_collection_test.rb

@@ -1,6 +1,4 @@
 require 'test_helper'
-require 'vedeu/models/attributes/line_collection'
-require 'vedeu/models/interface'
 
 module Vedeu
   describe LineCollection do

data/test/lib/vedeu/models/attributes/stream_collection_test.rb

@@ -1,6 +1,4 @@
 require 'test_helper'
-require 'vedeu/models/attributes/stream_collection'
-require 'vedeu/models/line'
 
 module Vedeu
   describe StreamCollection do

data/test/lib/vedeu/models/colour_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'vedeu/models/colour'
 
 module Vedeu
   describe Colour do

data/test/lib/vedeu/models/composition_test.rb

@@ -2,12 +2,11 @@ require 'test_helper'
 
 require 'json'
 
-require 'vedeu/models/composition'
-require 'vedeu/api/store'
-require 'vedeu'
-
 module Vedeu
   describe Composition do
+    let(:json)       { File.read('test/support/model_test_data.json') }
+    let(:attributes) { JSON.load(json, nil, symbolize_names: true) }
+
     before { API::Store.reset }
 
     describe '#interfaces' do
@@ -37,10 +36,8 @@ module Vedeu
           width  15
           height 3
         end
-        json = File.read('test/support/json/int1_lin1_str1.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0001]).to_s.must_equal(
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
@@ -55,10 +52,8 @@ module Vedeu
           width  30
           height 3
         end
-        json = File.read('test/support/json/int1_lin1_str3.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0002]).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
@@ -73,10 +68,8 @@ module Vedeu
           width  15
           height 3
         end
-        json = File.read('test/support/json/int1_lin2_str1.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0003]).to_s.must_equal(
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
@@ -92,10 +85,8 @@ module Vedeu
           width  30
           height 3
         end
-        json = File.read('test/support/json/int1_lin2_str3.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0004]).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
@@ -111,9 +102,8 @@ module Vedeu
           width  30
           height 3
         end
-        json = File.read('test/support/json/int1_lin2_str3_styles.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
-        Composition.new(attributes).to_s.must_equal(
+
+        Composition.new(attributes[:test_0005]).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
@@ -134,10 +124,8 @@ module Vedeu
           width  15
           height 3
         end
-        json = File.read('test/support/json/int2_lin1_str1.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0006]).to_s.must_equal(
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
@@ -162,10 +150,8 @@ module Vedeu
           width  30
           height 3
         end
-        json = File.read('test/support/json/int2_lin1_str3.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0007]).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
@@ -190,10 +176,8 @@ module Vedeu
           width  15
           height 3
         end
-        json = File.read('test/support/json/int2_lin2_str1.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0008]).to_s.must_equal(
           "\e[3;3H               \e[3;3H" \
           "\e[4;3H               \e[4;3H" \
           "\e[5;3H               \e[5;3H" \
@@ -220,10 +204,8 @@ module Vedeu
           width  30
           height 3
         end
-        json = File.read('test/support/json/int2_lin2_str3.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0009]).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \
@@ -250,10 +232,8 @@ module Vedeu
           width  30
           height 3
         end
-        json = File.read('test/support/json/int2_lin2_str3_styles.json')
-        attributes = JSON.load(json, nil, symbolize_names: true)
 
-        Composition.new(attributes).to_s.must_equal(
+        Composition.new(attributes[:test_0010]).to_s.must_equal(
           "\e[3;3H                              \e[3;3H" \
           "\e[4;3H                              \e[4;3H" \
           "\e[5;3H                              \e[5;3H" \