vedeu 0.1.6 → 0.1.7

data/lib/vedeu/models/interface.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'virtus'
 
 require 'vedeu'
@@ -14,10 +15,12 @@ require 'vedeu/support/terminal'
 
 module Vedeu
   class Interface
+    extend Forwardable
     include Vedeu::Queue
     include Virtus.model
 
     attribute :name,     String
+    attribute :group,    String
     attribute :lines,    LineCollection
     attribute :colour,   Colour,   default: Colour.new
     attribute :style,    Style,    default: ''
@@ -26,10 +29,15 @@ module Vedeu
     attribute :cursor,   Boolean,  default: true
     attribute :delay,    Float,    default: 0
 
+    def_delegators :@geometry, :north, :east, :south, :west,
+                               :top, :right, :bottom, :left
+
     def initialize(attributes = {})
       super
 
-      Vedeu.events.on(:refresh, self.delay) { refresh }
+      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 }
 
       self
     end

data/lib/vedeu/output/render_interface.rb

@@ -1,3 +1,6 @@
+require 'vedeu/models/line'
+require 'vedeu/models/stream'
+
 module Vedeu
   class RenderInterface
     def self.call(interface)

data/lib/vedeu/output/text_adaptor.rb

@@ -21,8 +21,10 @@ module Vedeu
     def lines
       if text.is_a?(::Array)
         text
+
       else
         text.split(/\n/)
+
       end
     end
 

data/lib/vedeu/output/view.rb

@@ -1,42 +1,35 @@
 require 'vedeu/models/composition'
-require 'vedeu/output/dsl_parser'
-require 'vedeu/output/erb_parser'
-require 'vedeu/output/raw_parser'
-require 'vedeu/output/json_parser'
-require 'vedeu/output/menu_parser'
-require 'vedeu/output/raw_parser'
 
 module Vedeu
+  NotImplemented = Class.new(StandardError)
+
   class View
-    def self.render(type, output)
-      new(type, output).render
+    include Vedeu::API
+
+    def self.render(object = nil)
+      new(object).render
     end
 
-    def initialize(type, output)
-      @type, @output = type, output
+    def initialize(object = nil)
+      @object = object
     end
 
     def render
-      Composition.enqueue(parsed_output)
+      Composition.enqueue(interfaces)
     end
 
-    private
+    def output
+      fail NotImplemented, 'Implement #output on your subclass of Vedeu::View.'
+    end
 
-    attr_reader :type, :output
+    private
 
-    def parsed_output
-      @parsed ||= parser.parse(output)
-    end
+    attr_reader :object
 
-    def parser
+    def interfaces
       {
-        dsl:     DSLParser,
-        erb:     ERBParser,
-        json:    JSONParser,
-        hash:    RawParser,
-        menu:    MenuParser,
-        raw:     RawParser,
-      }.fetch(type)
+        interfaces: [ output ]
+      }
     end
   end
 end

data/lib/vedeu/support/esc.rb

@@ -1,21 +1,7 @@
-require 'vedeu/output/colour_translator'
-
 module Vedeu
   module Esc
     extend self
 
-    def background_colour(value = '')
-      return '' if value.nil? || value.empty?
-
-      ["\e[48;5;", colour_translator(value), 'm'].join
-    end
-
-    def foreground_colour(value = '')
-      return '' if value.nil? || value.empty?
-
-      ["\e[38;5;", colour_translator(value), 'm'].join
-    end
-
     def set_position(y = 1, x = 1)
       row    = (y == 0 || y == nil) ? 1 : y
       column = (x == 0 || x == nil) ? 1 : x
@@ -30,7 +16,7 @@ module Vedeu
       when 'blink_off'     then "\e[25m"
       when 'bold'          then "\e[1m"
       when 'bold_off'      then "\e[21m"
-      when 'clear'         then "\e[2J"
+      when 'clear'         then "\e[38;2;39m\e[48;2;49m\e[2J"
       when 'colour_reset'  then "\e[38;2;39m\e[48;2;49m"
       when 'fg_reset'      then "\e[38;2;39m"
       when 'hide_cursor'   then "\e[?25l"
@@ -46,11 +32,5 @@ module Vedeu
         ''
       end
     end
-
-    private
-
-    def colour_translator(value)
-      ColourTranslator.translate(value)
-    end
   end
 end

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

@@ -7,17 +7,6 @@ require 'vedeu/support/interface_store'
 module Vedeu
   module API
     describe Base do
-      before do
-        InterfaceStore.reset
-        Interface.save('testing_view') do
-          width  80
-          height 25
-          x      1
-          y      1
-          colour  foreground: '#ffffff', background: '#000000'
-          centred false
-        end
-      end
     end
   end
 end

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

@@ -2,6 +2,16 @@ require 'test_helper'
 
 require 'vedeu/api/grid'
 
+describe Fixnum do
+  describe '#columns' do
+    it 'returns the width if the value is in range' do
+      IO.console.stub :winsize, [25, 60] do
+        1.columns.must_equal(5)
+      end
+    end
+  end
+end
+
 module Vedeu
   module API
     describe Grid do

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

@@ -7,17 +7,6 @@ require 'vedeu/support/interface_store'
 module Vedeu
   module API
     describe Line do
-      before do
-        InterfaceStore.reset
-        Interface.save('testing_view') do
-          width  80
-          height 25
-          x      1
-          y      1
-          colour  foreground: '#ffffff', background: '#000000'
-          centred false
-        end
-      end
     end
   end
 end

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

@@ -7,17 +7,6 @@ require 'vedeu/support/interface_store'
 module Vedeu
   module API
     describe Stream do
-      before do
-        InterfaceStore.reset
-        Interface.save('testing_view') do
-          width  80
-          height 25
-          x      1
-          y      1
-          colour  foreground: '#ffffff', background: '#000000'
-          centred false
-        end
-      end
     end
   end
 end

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

@@ -410,7 +410,6 @@ module Vedeu
       end
 
       it 'handles alignment' do
-        skip
         Vedeu.view 'testing_view' do
           line do
             stream do
@@ -438,7 +437,6 @@ module Vedeu
       end
 
       it 'handles alignment' do
-        skip
         Vedeu.view 'testing_view' do
           line do
             stream do
@@ -458,7 +456,7 @@ module Vedeu
                 style:  [],
                 width:  80,
                 align:  :centre,
-                text:   'This is aligned right, and padded with spaces.'
+                text:   'This is aligned centrally, and padded with spaces.'
               }]
             }]
           }
@@ -466,7 +464,6 @@ module Vedeu
       end
 
       it 'handles alignment' do
-        skip
         Vedeu.view 'testing_view' do
           line do
             stream do

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

@@ -1,4 +1,7 @@
 require 'test_helper'
+
+require 'json'
+
 require 'vedeu/models/composition'
 require 'vedeu/support/interface_store'
 

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

@@ -4,33 +4,6 @@ require 'vedeu/output/view'
 module Vedeu
   describe View do
     describe '.render' do
-      it 'returns when the type is :erb' do
-        skip
-        View.render(:erb, '').must_equal('')
-      end
-
-      it 'returns when the type is :json' do
-        skip
-        View.render(:json, '').must_equal('')
-      end
-
-      it 'returns when the type is :raw' do
-        skip
-        View.render(:raw, '').must_equal('')
-      end
-
-      it 'returns when the type is :menu' do
-        skip
-        View.render(:menu, '').must_equal('')
-      end
-
-      it 'returns when the type is not set' do
-        proc { View.render(nil, '') }.must_raise(KeyError)
-      end
-
-      it 'returns when the type is not recognised' do
-        proc { View.render(:unknown, '') }.must_raise(KeyError)
-      end
     end
   end
 end

data/test/lib/vedeu/support/esc_test.rb

@@ -3,26 +3,6 @@ require 'vedeu/support/esc'
 
 module Vedeu
   describe Esc do
-    describe '.background_colour' do
-      it 'returns an escape sequence' do
-        Esc.background_colour('#000000').must_equal("\e[48;5;16m")
-      end
-
-      it 'returns an empty string when the value is empty' do
-        Esc.background_colour('').must_equal('')
-      end
-    end
-
-    describe '.foreground_colour' do
-      it 'returns an escape sequence' do
-        Esc.foreground_colour('#ffffff').must_equal("\e[38;5;231m")
-      end
-
-      it 'returns an empty string when the value is empty' do
-        Esc.foreground_colour('').must_equal('')
-      end
-    end
-
     describe '.set_position' do
       it 'returns a position escape sequence when no coordinates are provided' do
         Esc.set_position.must_equal("\e[1;1H")
@@ -59,7 +39,7 @@ module Vedeu
       end
 
       it 'returns an escape sequence when the style is clear' do
-        Esc.string('clear').must_equal("\e[2J")
+        Esc.string('clear').must_equal("\e[38;2;39m\e[48;2;49m\e[2J")
       end
 
       it 'returns an escape sequence when the style is colour_reset' do

data/vedeu.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'vedeu'
-  spec.version       = '0.1.6'
+  spec.version       = '0.1.7'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,17 +208,11 @@ files:
 - lib/vedeu/models/style.rb
 - lib/vedeu/output/clear_interface.rb
 - lib/vedeu/output/colour_translator.rb
-- lib/vedeu/output/dsl_parser.rb
-- lib/vedeu/output/erb_parser.rb
-- lib/vedeu/output/json_parser.rb
-- lib/vedeu/output/menu_parser.rb
-- lib/vedeu/output/raw_parser.rb
 - lib/vedeu/output/render_interface.rb
 - lib/vedeu/output/text_adaptor.rb
 - lib/vedeu/output/view.rb
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/events.rb
-- lib/vedeu/support/helpers.rb
 - lib/vedeu/support/input.rb
 - lib/vedeu/support/interface_store.rb
 - lib/vedeu/support/menu.rb
@@ -248,17 +242,11 @@ files:
 - test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/clear_interface_test.rb
 - test/lib/vedeu/output/colour_translator_test.rb
-- test/lib/vedeu/output/dsl_parser_test.rb
-- test/lib/vedeu/output/erb_parser_test.rb
-- test/lib/vedeu/output/json_parser_test.rb
-- test/lib/vedeu/output/menu_parser_test.rb
-- test/lib/vedeu/output/raw_parser_test.rb
 - test/lib/vedeu/output/render_interface_test.rb
 - test/lib/vedeu/output/text_adaptor_test.rb
 - test/lib/vedeu/output/view_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
-- test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
 - test/lib/vedeu/support/interface_store_test.rb
 - test/lib/vedeu/support/menu_test.rb
@@ -337,17 +325,11 @@ test_files:
 - test/lib/vedeu/models/style_test.rb
 - test/lib/vedeu/output/clear_interface_test.rb
 - test/lib/vedeu/output/colour_translator_test.rb
-- test/lib/vedeu/output/dsl_parser_test.rb
-- test/lib/vedeu/output/erb_parser_test.rb
-- test/lib/vedeu/output/json_parser_test.rb
-- test/lib/vedeu/output/menu_parser_test.rb
-- test/lib/vedeu/output/raw_parser_test.rb
 - test/lib/vedeu/output/render_interface_test.rb
 - test/lib/vedeu/output/text_adaptor_test.rb
 - test/lib/vedeu/output/view_test.rb
 - test/lib/vedeu/support/esc_test.rb
 - test/lib/vedeu/support/events_test.rb
-- test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
 - test/lib/vedeu/support/interface_store_test.rb
 - test/lib/vedeu/support/menu_test.rb

data/lib/vedeu/output/dsl_parser.rb

@@ -1,19 +0,0 @@
-module Vedeu
-  class DSLParser
-    def self.parse(data)
-      new(data).parse
-    end
-
-    def initialize(data)
-      @data = data
-    end
-
-    def parse
-      { interfaces: [ data ] }
-    end
-
-    private
-
-    attr_reader :data
-  end
-end