vedeu 0.1.3 → 0.1.4

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

@@ -11,9 +11,10 @@ module Vedeu
       it 'returns the content for the interface' do
         interface = Interface.new({
           name:   '.call',
-          width:  32,
-          height: 3,
-          lines:  'RenderInterface.call',
+          geometry: {
+            width:  32,
+            height: 3,
+          },
           lines:  [
             {
               streams: [{ text: 'this is the first' }]

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

@@ -5,7 +5,7 @@ module Vedeu
   describe Esc do
     describe '.background_colour' do
       it 'returns an escape sequence' do
-        Esc.background_colour.must_equal("\e[48;5;16m")
+        Esc.background_colour('#000000').must_equal("\e[48;5;16m")
       end
 
       it 'returns an empty string when the value is empty' do
@@ -15,7 +15,7 @@ module Vedeu
 
     describe '.foreground_colour' do
       it 'returns an escape sequence' do
-        Esc.foreground_colour.must_equal("\e[38;5;231m")
+        Esc.foreground_colour('#ffffff').must_equal("\e[38;5;231m")
       end
 
       it 'returns an empty string when the value is empty' do
@@ -38,6 +38,10 @@ module Vedeu
         Esc.string.must_equal('')
       end
 
+      it 'returns an escape sequence when the style is bg_reset' do
+        Esc.string('bg_reset').must_equal("\e[48;2;49m")
+      end
+
       it 'returns an escape sequence when the style is blink' do
         Esc.string('blink').must_equal("\e[5m")
       end
@@ -62,6 +66,10 @@ module Vedeu
         Esc.string('colour_reset').must_equal("\e[38;2;39m\e[48;2;49m")
       end
 
+      it 'returns an escape sequence when the style is fg_reset' do
+        Esc.string('fg_reset').must_equal("\e[38;2;39m")
+      end
+
       it 'returns an escape sequence when the style is hide_cursor' do
         Esc.string('hide_cursor').must_equal("\e[?25l")
       end

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

@@ -7,6 +7,12 @@ module Vedeu
   end
 
   describe Helpers do
+    describe '.line' do
+      it 'returns the block with line returns removed' do
+        skip
+      end
+    end
+
     describe '.foreground' do
       it 'returns an escape sequence for the specified CSS foreground' do
         TestHelpers.new.foreground('#a5f500').must_equal("\e[38;5;148m")
@@ -16,7 +22,7 @@ module Vedeu
 
       it 'returns an escape sequence plus interpolation when a block is given' do
         TestHelpers.new.foreground('#a5f500') { 'Some text' }
-          .must_equal("\e[38;5;148mSome text")
+          .must_equal("\e[38;5;148mSome text\e[38;2;39m")
       end
     end
 
@@ -29,7 +35,7 @@ module Vedeu
 
       it 'returns an escape sequence plus interpolation when a block is given' do
         TestHelpers.new.background('#2f2f2f') { 'Some text' }
-          .must_equal("\e[48;5;16mSome text")
+          .must_equal("\e[48;5;16mSome text\e[48;2;49m")
       end
     end
 
@@ -40,7 +46,8 @@ module Vedeu
       end
 
       it 'returns an escape sequence plus interpolation when a block is given' do
-        TestHelpers.new.colour({ background: '#2f2f2f', foreground: '#a5ff00' }) { 'Some text' }.must_equal("\e[38;5;154m\e[48;5;16mSome text")
+        TestHelpers.new.colour({ background: '#2f2f2f', foreground: '#a5ff00' }) { 'Some text' }
+          .must_equal("\e[38;5;154m\e[48;5;16mSome text\e[38;2;39m\e[48;2;49m")
       end
     end
 
@@ -61,7 +68,7 @@ module Vedeu
 
       it 'returns an escape sequence plus interpolation when a block is given' do
         TestHelpers.new.style('bold', 'underline') { 'Some text' }
-          .must_equal("\e[1m\e[4mSome text")
+          .must_equal("\e[1m\e[4mSome text\e[0m")
       end
     end
   end

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

@@ -14,36 +14,6 @@ module Vedeu
       interface.must_be_instance_of(Interface)
     end
 
-    it 'overrides x and y when centred is true' do
-      IO.console.stub :winsize, [10, 40] do
-        interface = InterfaceTemplate.save('widget') do
-                      colour  foreground: '#ff0000', background: '#5f0000'
-                      cursor  false
-                      centred true
-                      width   10
-                      height  2
-                      x       5
-                      y       5
-                    end
-        interface.x.must_equal(15)
-        interface.y.must_equal(4)
-      end
-    end
-
-    it 'uses x and y when centred is false' do
-      interface = InterfaceTemplate.save('widget') do
-                    colour  foreground: '#ff0000', background: '#5f0000'
-                    cursor  false
-                    centred false
-                    width   10
-                    height  2
-                    x       5
-                    y       5
-                  end
-      interface.x.must_equal(5)
-      interface.y.must_equal(5)
-    end
-
     it 'allows interfaces to share behaviour' do
       IO.console.stub :winsize, [10, 40] do
         main =    InterfaceTemplate.save('main') do
@@ -63,10 +33,64 @@ module Vedeu
                     x       main.geometry.left
                   end
 
-        main.x.must_equal(15)
-        main.y.must_equal(4)
-        status.x.must_equal(15)
-        status.y.must_equal(5)
+        main.geometry.left.must_equal(15)
+        main.geometry.top.must_equal(4)
+        status.geometry.left.must_equal(15)
+        status.geometry.top.must_equal(5)
+      end
+    end
+
+    describe '#x' do
+      interface = InterfaceTemplate.new('widget')
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.x(0) }.must_raise(XOutOfBounds)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.x(999) }.must_raise(XOutOfBounds)
+      end
+    end
+
+    describe '#y' do
+      interface = InterfaceTemplate.new('widget')
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.y(0) }.must_raise(YOutOfBounds)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.y(999) }.must_raise(YOutOfBounds)
+      end
+    end
+
+    describe '#width' do
+      interface = InterfaceTemplate.new('widget')
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.width(0) }.must_raise(InvalidWidth)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.width(999) }.must_raise(InvalidWidth)
+      end
+    end
+
+    describe '#height' do
+      interface = InterfaceTemplate.new('widget')
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.height(0) }.must_raise(InvalidHeight)
+      end
+
+      it 'raises an exception when the value is out of bounds' do
+        proc { interface.height(999) }.must_raise(InvalidHeight)
+      end
+    end
+
+    describe '#centred' do
+      it 'should hav a valid spec, please write one.' do
+        skip
       end
     end
   end

data/test/support/colours.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require_relative '../../lib/vedeu/support/translator'
+require_relative '../../lib/vedeu/output/colour_translator'
 
 values = ["00", "5f", "87", "af", "d7", "ff"]
 codes  = {}
@@ -8,7 +8,7 @@ values.each do |r|
   values.each do |g|
     values.each do |b|
       value = ["#", r, g, b].join
-      trans = Vedeu::Translator.translate(value)
+      trans = Vedeu::ColourTranslator.translate(value)
       codes[trans] = value
     end
   end

data/test/support/erb/line.erb

@@ -0,0 +1,4 @@
+<%- line do -%>
+  This is line one.
+  This is line two.
+<%- end -%>

data/test/support/erb/line_2x.erb

@@ -0,0 +1,10 @@
+<%- lines do -%>
+  <%- line do -%>
+    This is line one.
+    This is line two.
+  <%- end -%>
+  <%- line do -%>
+    This is line three.
+    This is line four.
+  <%- end -%>
+<%- end -%>

data/test/support/erb/line_foreground.erb

@@ -0,0 +1,4 @@
+<%- line do -%>
+  <%= foreground('#ffff00') { "This is line one." } -%>
+  This is line two.
+<%- end -%>

data/test/support/erb/line_foreground_2x.erb

@@ -0,0 +1,5 @@
+<%- line do -%>
+  <%= foreground('#ffff00') { "This is line one." } -%>
+  <%= foreground('#ff0000') { "This is line two." } -%>
+  This is line three.
+<%- end -%>

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.3'
+  spec.version       = '0.1.4'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}
@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler',            '~> 1.6'
   spec.add_development_dependency 'guard',              '2.6.1'
+  spec.add_development_dependency 'guard-bundler',      '2.0.0'
   spec.add_development_dependency 'guard-minitest',     '2.3.1'
   spec.add_development_dependency 'minitest',           '5.4.0'
   spec.add_development_dependency 'minitest-reporters', '1.0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.6.1
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
@@ -181,11 +195,13 @@ files:
 - lib/vedeu/models/attributes/stream_collection.rb
 - lib/vedeu/models/colour.rb
 - lib/vedeu/models/composition.rb
+- lib/vedeu/models/geometry.rb
 - lib/vedeu/models/interface.rb
 - lib/vedeu/models/line.rb
 - lib/vedeu/models/stream.rb
 - lib/vedeu/models/style.rb
 - lib/vedeu/output/clear_interface.rb
+- lib/vedeu/output/colour_translator.rb
 - lib/vedeu/output/erb_parser.rb
 - lib/vedeu/output/json_parser.rb
 - lib/vedeu/output/menu_parser.rb
@@ -195,7 +211,6 @@ files:
 - lib/vedeu/output/view.rb
 - lib/vedeu/support/esc.rb
 - lib/vedeu/support/events.rb
-- lib/vedeu/support/geometry.rb
 - lib/vedeu/support/helpers.rb
 - lib/vedeu/support/input.rb
 - lib/vedeu/support/interface_store.rb
@@ -203,7 +218,6 @@ files:
 - lib/vedeu/support/menu.rb
 - lib/vedeu/support/queue.rb
 - lib/vedeu/support/terminal.rb
-- lib/vedeu/support/translator.rb
 - lib/vedeu/support/wordwrap.rb
 - logs/.gitkeep
 - test/lib/vedeu/application_test.rb
@@ -215,11 +229,13 @@ files:
 - test/lib/vedeu/models/attributes/stream_collection_test.rb
 - test/lib/vedeu/models/colour_test.rb
 - test/lib/vedeu/models/composition_test.rb
+- test/lib/vedeu/models/geometry_test.rb
 - test/lib/vedeu/models/interface_test.rb
 - test/lib/vedeu/models/line_test.rb
 - test/lib/vedeu/models/stream_test.rb
 - 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/erb_parser_test.rb
 - test/lib/vedeu/output/json_parser_test.rb
 - test/lib/vedeu/output/menu_parser_test.rb
@@ -229,7 +245,6 @@ files:
 - 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/geometry_test.rb
 - test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
 - test/lib/vedeu/support/interface_store_test.rb
@@ -237,7 +252,6 @@ files:
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
-- test/lib/vedeu/support/translator_test.rb
 - test/lib/vedeu/support/wordwrap_test.rb
 - test/lib/vedeu_test.rb
 - test/stats.sh
@@ -246,6 +260,10 @@ files:
 - test/support/dummy_interface.rb
 - test/support/erb/colour.erb
 - test/support/erb/colour_style.erb
+- test/support/erb/line.erb
+- test/support/erb/line_2x.erb
+- test/support/erb/line_foreground.erb
+- test/support/erb/line_foreground_2x.erb
 - test/support/erb/style.erb
 - test/support/json/int1_lin1_str1.json
 - test/support/json/int1_lin1_str3.json
@@ -294,11 +312,13 @@ test_files:
 - test/lib/vedeu/models/attributes/stream_collection_test.rb
 - test/lib/vedeu/models/colour_test.rb
 - test/lib/vedeu/models/composition_test.rb
+- test/lib/vedeu/models/geometry_test.rb
 - test/lib/vedeu/models/interface_test.rb
 - test/lib/vedeu/models/line_test.rb
 - test/lib/vedeu/models/stream_test.rb
 - 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/erb_parser_test.rb
 - test/lib/vedeu/output/json_parser_test.rb
 - test/lib/vedeu/output/menu_parser_test.rb
@@ -308,7 +328,6 @@ test_files:
 - 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/geometry_test.rb
 - test/lib/vedeu/support/helpers_test.rb
 - test/lib/vedeu/support/input_test.rb
 - test/lib/vedeu/support/interface_store_test.rb
@@ -316,7 +335,6 @@ test_files:
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/queue_test.rb
 - test/lib/vedeu/support/terminal_test.rb
-- test/lib/vedeu/support/translator_test.rb
 - test/lib/vedeu/support/wordwrap_test.rb
 - test/lib/vedeu_test.rb
 - test/stats.sh
@@ -325,6 +343,10 @@ test_files:
 - test/support/dummy_interface.rb
 - test/support/erb/colour.erb
 - test/support/erb/colour_style.erb
+- test/support/erb/line.erb
+- test/support/erb/line_2x.erb
+- test/support/erb/line_foreground.erb
+- test/support/erb/line_foreground_2x.erb
 - test/support/erb/style.erb
 - test/support/json/int1_lin1_str1.json
 - test/support/json/int1_lin1_str3.json

data/lib/vedeu/support/geometry.rb

@@ -1,172 +0,0 @@
-require 'vedeu/support/esc'
-require 'vedeu/support/terminal'
-
-module Vedeu
-  InvalidHeight    = Class.new(StandardError)
-  InvalidWidth     = Class.new(StandardError)
-  OutOfBoundsError = Class.new(StandardError)
-
-  class Geometry
-    def initialize(attrs = {})
-      @attrs = attrs
-    end
-
-    def origin(index = 0)
-      Esc.set_position(virtual_y(index), virtual_x)
-    end
-
-    def terminal_height
-      @terminal_height ||= attrs_terminal_height
-    end
-
-    def height
-      @height ||= attrs_height
-    end
-
-    def y
-      @y ||= attrs_y
-    end
-
-    def x
-      @x ||= attrs_x
-    end
-
-    def terminal_width
-      @terminal_width ||= attrs_terminal_width
-    end
-
-    def width
-      @width ||= attrs_width
-    end
-
-    def centred
-      @centred ||= attrs_centred
-    end
-
-    def centre
-      [(terminal_height / 2), (terminal_width / 2)]
-    end
-
-    def centre_y
-      centre.first
-    end
-
-    def centre_x
-      centre.last
-    end
-
-    def top
-      if centred
-        centre_y - (height / 2)
-      else
-        y
-      end
-    end
-
-    def left
-      if centred
-        centre_x - (width / 2)
-      else
-        x
-      end
-    end
-
-    def bottom
-      top + height
-    end
-
-    def right
-      left + width
-    end
-
-    def position
-      {
-        y:       top,
-        x:       left,
-        height:  height,
-        width:   width,
-        centred: centred,
-        top:     top,
-        bottom:  bottom,
-        left:    left,
-        right:   right,
-      }
-    end
-
-    private
-
-    attr_reader :attrs
-
-    def attrs_height
-      height = attrs.fetch(:height)
-      fail_if_less_than_one(height)
-      fail_if_out_of_bounds('height', height, terminal_height)
-      height
-    rescue KeyError
-      fail InvalidHeight, 'An Interface must have a height attribute.'
-    end
-
-    def attrs_terminal_height
-      terminal_height = attrs.fetch(:terminal_height, Terminal.height)
-      fail_if_less_than_one(terminal_height)
-      fail_if_out_of_bounds('terminal_height', terminal_height, Terminal.height)
-      terminal_height
-    end
-
-    def attrs_y
-      y = attrs.fetch(:y, 1)
-      fail_if_less_than_one(y)
-      fail_if_out_of_bounds('y', y, terminal_height)
-      y
-    end
-
-    def attrs_x
-      x = attrs.fetch(:x, 1)
-      fail_if_less_than_one(x)
-      fail_if_out_of_bounds('x', x, terminal_width)
-      x
-    end
-
-    def attrs_terminal_width
-      terminal_width = attrs.fetch(:terminal_width, Terminal.width)
-      fail_if_less_than_one(terminal_width)
-      fail_if_out_of_bounds('terminal_width',
-                            terminal_width,
-                            Terminal.width)
-      terminal_width
-    end
-
-    def attrs_width
-      width = attrs.fetch(:width)
-      fail_if_less_than_one(width)
-      fail_if_out_of_bounds('width', width, terminal_width)
-      width
-    rescue KeyError
-      fail InvalidWidth, 'An Interface must have a width attribute.'
-    end
-
-    def attrs_centred
-      !!(attrs.fetch(:centred, true))
-    end
-
-    def fail_if_less_than_one(value)
-      fail OutOfBoundsError,
-        'Value must be greater than or equal to 1.' if value < 1
-    end
-
-    def fail_if_out_of_bounds(name, attribute, boundary)
-      if attribute > boundary
-        fail OutOfBoundsError,
-          "Cannot set #{name} to be outside the terminal visible area."
-      end
-    end
-
-    def virtual_x
-      left
-    end
-
-    def virtual_y(index = 0)
-      ((top..bottom).to_a)[index]
-    end
-  end
-end