vedeu 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f9669e1076e596ff5730f44aa1e4563fc24fb6
-  data.tar.gz: 7316c60bdbf2067b1ee27726bd94524f8554af47
+  metadata.gz: 73c1296c50c2e542fe744337b953c07e2a14ee03
+  data.tar.gz: 55e5fa60d09ce7c65382a2ff664b79e717cb0228
 SHA512:
-  metadata.gz: 7233c00d83179e6d1374fca99bea3d477f83e5991e09a8a85211d83c590d47de83ab67adca91c39628f0050240e01921cc932c2cda64826f619fea618b8e0abc
-  data.tar.gz: 758b39394201c72a704d0fce2188272474f4c62ee73ec5589c3938f87fea664c8576b0fb69b67dc0c808a6298e7a7bb3676838694447326d31202182fbf7d33c
+  metadata.gz: 8816692395970fdb8a2b9003a625348cef3255c23c9340b56bfdb0297efbedbdc63d53f903caba320f7d94eb0f9f7f1834f4a4a721785a7b0e7142b377124952
+  data.tar.gz: 7f321725fa3838de38dfcfd1091dbbd66ee5bc6439d47322fc3075ebd249c6ca52218f21c83fa7edb091ad5562783083998df9b1d05d6e6ec45c8b64deec0183

data/lib/vedeu/application.rb

@@ -5,6 +5,7 @@ require_relative 'support/terminal'
 
 module Vedeu
   class Application
+    # :nocov:
     def self.start(options = {})
       new(options).start
     end
@@ -65,5 +66,6 @@ module Vedeu
         interactive: true
       }
     end
+    # :nocov:
   end
 end

data/lib/vedeu/launcher.rb

@@ -3,6 +3,7 @@ require_relative 'configuration'
 
 module Vedeu
   class Launcher
+    # :nocov:
     def initialize(argv, stdin  = STDIN,
                          stdout = STDOUT,
                          stderr = STDERR,
@@ -15,7 +16,6 @@ module Vedeu
       @exit_code = 1
     end
 
-    # :nocov:
     def execute!
       $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
 

data/lib/vedeu/models/colour.rb

@@ -1,4 +1,4 @@
-require 'oj'
+require 'json'
 require 'virtus'
 
 require_relative '../support/esc'
@@ -7,8 +7,8 @@ module Vedeu
   class Colour
     include Virtus.model
 
-    attribute :foreground, String
-    attribute :background, String
+    attribute :foreground, String, default: ''
+    attribute :background, String, default: ''
 
     def foreground
       @fg ||= Esc.foreground_colour(css_foreground)
@@ -19,15 +19,15 @@ module Vedeu
     end
 
     def css_foreground
-      @foreground || ''
+      @foreground
     end
 
     def css_background
-      @background || ''
+      @background
     end
 
-    def to_json
-      Oj.dump(as_hash, mode: :compat)
+    def to_json(*args)
+      as_hash.to_json
     end
 
     def to_s

data/lib/vedeu/models/command.rb

@@ -14,8 +14,10 @@ module Vedeu
       executable.call(*args)
     end
 
+    # :nocov:
     def executable
       proc { |*args| entity.dispatch(*args) }
     end
+    # :nocov:
   end
 end

data/lib/vedeu/models/composition.rb

@@ -1,4 +1,4 @@
-require 'oj'
+require 'json'
 require 'virtus'
 
 require_relative 'interface_collection'
@@ -23,7 +23,7 @@ module Vedeu
     end
 
     def to_json
-      Oj.dump(json_attributes, mode: :compat)
+      json_attributes.to_json
     end
 
     def to_s

data/lib/vedeu/models/interface.rb

@@ -1,8 +1,11 @@
+require 'json'
 require 'virtus'
 
 require_relative 'presentation'
 require_relative 'line_collection'
+require_relative 'style'
 require_relative '../output/interface_renderer'
+require_relative '../support/coordinate'
 require_relative '../support/esc'
 require_relative '../support/queue'
 require_relative '../support/terminal'
@@ -11,6 +14,7 @@ module Vedeu
   class Interface
     include Virtus.model
     include Presentation
+    include Style
     include Vedeu::Queue
 
     attribute :name,    String
@@ -22,9 +26,10 @@ module Vedeu
     attribute :height,  Integer, default: Terminal.height
     attribute :current, String,  default: ''
     attribute :cursor,  Boolean, default: true
+    attribute :centred, Boolean, default: false
 
-    def geometry
-      @geometry ||= Geometry.new(self)
+    def origin(index = 0)
+      geometry.origin(index)
     end
 
     def refresh
@@ -40,8 +45,8 @@ module Vedeu
       end
     end
 
-    def to_json
-      Oj.dump(json_attributes, mode: :compat)
+    def to_json(*args)
+      json_attributes.to_json
     end
 
     def to_s
@@ -64,8 +69,8 @@ module Vedeu
 
     def json_attributes
       {
-        colour: colour, # TODO: translate back?
-        style:  style,
+        colour: colour,
+        style:  style_original,
         name:   name,
         lines:  lines,
         y:      y,
@@ -76,5 +81,9 @@ module Vedeu
         cursor: cursor
       }
     end
+
+    def geometry
+      @_geometry ||= Coordinate.new(attributes)
+    end
   end
 end

data/lib/vedeu/models/line.rb

@@ -1,19 +1,21 @@
-require 'oj'
+require 'json'
 require 'virtus'
 
 require_relative 'presentation'
 require_relative 'stream_collection'
+require_relative 'style'
 
 module Vedeu
   class Line
     include Virtus.model
     include Presentation
+    include Style
 
     attribute :model,   Hash
     attribute :streams, StreamCollection
 
     def to_json
-      Oj.dump(json_attributes, mode: :compat)
+      json_attributes.to_json
     end
 
     def to_s
@@ -25,7 +27,7 @@ module Vedeu
     def json_attributes
       {
         colour:  colour,
-        style:   style,
+        style:   style_original,
         streams: streams
       }
     end

data/lib/vedeu/models/presentation.rb

@@ -1,13 +1,13 @@
 require 'virtus'
 
 require_relative 'colour'
-require_relative 'style_collection'
+require_relative '../support/esc'
 
 module Vedeu
   module Presentation
     include Virtus.module
 
-    attribute :colour, Colour
-    attribute :style,  StyleCollection
+    attribute :colour, Colour,       default: Colour.new
+    attribute :style,  Array[String]
   end
 end

data/lib/vedeu/models/stream.rb

@@ -1,17 +1,20 @@
+require 'json'
 require 'virtus'
 
 require_relative 'presentation'
 require_relative '../support/terminal'
+require_relative 'style'
 
 module Vedeu
   class Stream
     include Virtus.model
     include Presentation
+    include Style
 
     attribute :text, String, default: ''
 
     def to_json
-      Oj.dump(json_attributes, mode: :compat)
+      json_attributes.to_json
     end
 
     def to_s(options = {})
@@ -22,8 +25,8 @@ module Vedeu
 
     def json_attributes
       {
-        colour: colour.as_hash,
-        style:  style,
+        colour: colour,
+        style:  style_original,
         text:   text
       }
     end

data/lib/vedeu/models/style.rb

@@ -0,0 +1,31 @@
+require_relative '../support/esc'
+
+module Vedeu
+  module Style
+    def style
+      @_style ||= if no_style?
+        ''
+
+      else
+        @style.map { |s| Esc.string(s) }.join
+
+      end
+    end
+
+    def style_original
+      @_original ||= if no_style?
+        ''
+
+      else
+        @style
+
+      end
+    end
+
+    private
+
+    def no_style?
+      @style.nil? || @style.empty?
+    end
+  end
+end

data/lib/vedeu/output/interface_renderer.rb

@@ -1,5 +1,3 @@
-require_relative '../support/geometry'
-
 module Vedeu
   class InterfaceRenderer
     def self.clear(interface)
@@ -48,7 +46,7 @@ module Vedeu
     end
 
     def origin(index)
-      interface.geometry.origin(index)
+      interface.origin(index)
     end
 
     def height

data/lib/vedeu/support/coordinate.rb

@@ -1,3 +1,4 @@
+require_relative 'esc'
 require_relative 'terminal'
 
 module Vedeu
@@ -15,6 +16,10 @@ module Vedeu
       @centred         = attrs.fetch(:centred, true)
     end
 
+    def origin(index = 0)
+      Esc.set_position(virtual_y(index), virtual_x)
+    end
+
     def terminal_height
       fail OutOfBoundsError,
         'Value must be greater than or equal to 1.' if @terminal_height < 1
@@ -45,10 +50,10 @@ module Vedeu
       fail OutOfBoundsError,
         'Value must be greater than or equal to 1.' if @y < 1
 
-      if @y > height
+      if @y > terminal_height
         fail OutOfBoundsError, 'Cannot set y position to be greater' \
-                               ' that the specified height or' \
-                               ' actual terminal height.'
+                               ' that the specified terminal height' \
+                               ' or actual terminal height.'
       else
         @y
       end
@@ -57,7 +62,6 @@ module Vedeu
     def terminal_width
       fail OutOfBoundsError,
         'Value must be greater than or equal to 1.' if @terminal_width < 1
-
       if @terminal_width > Terminal.width
         fail OutOfBoundsError, 'Cannot set terminal_width to be '  \
                                'greater than the actual terminal ' \
@@ -84,10 +88,10 @@ module Vedeu
       fail OutOfBoundsError,
         'Value must be greater than or equal to 1.' if @x < 1
 
-      if @x > width
+      if @x > terminal_width
         fail OutOfBoundsError, 'Cannot set x position to be greater' \
-                               ' that the specified width or' \
-                               ' actual terminal width.'
+                               ' that the specified terminal width' \
+                               ' or actual terminal width.'
       else
         @x
       end
@@ -145,5 +149,15 @@ module Vedeu
       }
     end
 
+    private
+
+    def virtual_x
+      left
+    end
+
+    def virtual_y(index = 0)
+      ((top..bottom).to_a)[index]
+    end
+
   end
 end

data/lib/vedeu/support/parsing/json_parser.rb

@@ -1,12 +1,12 @@
-require 'oj'
+require 'json'
 
 module Vedeu
   module JSONParser
     extend self
 
     def parse(output)
-      Oj.load(output, symbol_keys: true)
-    rescue Oj::ParseError
+      JSON.load(output, nil, symbolize_names: true)
+    rescue JSON::ParserError
       {}
     end
   end

data/test/lib/vedeu/application_test.rb

@@ -3,16 +3,5 @@ require_relative '../../../lib/vedeu/application'
 
 module Vedeu
   describe Application do
-    describe '.start' do
-      it 'returns a NilClass when the application should run interactively' do
-        skip
-        # Application.start({ interactive: true }).must_be_instance_of(NilClass)
-      end
-
-      it 'returns a NilClass when the application should run once' do
-        skip
-        # Application.start({ interactive: false }).must_be_instance_of(NilClass)
-      end
-    end
   end
 end

data/test/lib/vedeu/launcher_test.rb

@@ -3,13 +3,5 @@ require_relative '../../../lib/vedeu/launcher'
 
 module Vedeu
   describe Launcher do
-    describe '#execute!' do
-      it 'needs a spec, please write one.' do
-        skip
-        Application.stub :start, nil do
-          Launcher.new([]).execute!
-        end
-      end
-    end
   end
 end

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

@@ -15,15 +15,15 @@ module Vedeu
       end
 
       it 'returns an empty collection when nil or empty' do
-        Collection.coercer('',  TestClass, :key).must_equal([])
+        Collection.coercer('', TestClass, :key).must_equal([])
       end
 
       it 'returns an empty collection when nil or empty' do
-        Collection.coercer([],  TestClass, :key).must_equal([])
+        Collection.coercer([], TestClass, :key).must_equal([])
       end
 
       it 'returns an empty collection when nil or empty' do
-        Collection.coercer({},  TestClass, :key).must_equal([])
+        Collection.coercer({}, TestClass, :key).must_equal([])
       end
 
       it 'returns a single model in a collection when a String' do

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

@@ -56,7 +56,9 @@ module Vedeu
         Colour.new({
           foreground: '#ff0000',
           background: '#000000'
-        }).to_json.must_equal("{\"foreground\":\"#ff0000\",\"background\":\"#000000\"}")
+        }).to_json.must_equal(
+          "{\"foreground\":\"#ff0000\",\"background\":\"#000000\"}"
+        )
       end
     end
 
@@ -90,7 +92,10 @@ module Vedeu
         Colour.new({
           foreground: '#ff0000',
           background: '#000000'
-        }).as_hash.must_equal({ foreground: '#ff0000', background: '#000000' })
+        }).as_hash.must_equal({
+          foreground: '#ff0000',
+          background: '#000000'
+        })
       end
     end
   end