vedeu 0.6.60 → 0.6.61

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

@@ -52,13 +52,13 @@ module Vedeu
       end
 
       describe '#position' do
-        it { instance.position.must_be_instance_of(Vedeu::Geometry::Position) }
+        it { instance.position.must_be_instance_of(Vedeu::Geometries::Position) }
       end
 
       describe '#position' do
         subject { instance.position }
 
-        it { subject.must_be_instance_of(Vedeu::Geometry::Position) }
+        it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
       end
 
       describe '#value' do

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

@@ -112,8 +112,16 @@ module Vedeu
                   Vedeu::Models::Row.new([:hydrogen, :helium]),
                   nil,
                   [:lithium],
-                  Vedeu::Models::Row.new([:beryllium, :boron]),
+                  Vedeu::Models::Row.new([:beryllium]),
+                  [
+                    Vedeu::Views::Char.new(value: 'b'),
+                    Vedeu::Views::Char.new(value: 'o'),
+                    Vedeu::Views::Char.new(value: 'r'),
+                    Vedeu::Views::Char.new(value: 'o'),
+                    Vedeu::Views::Char.new(value: 'n'),
+                  ],
                   [nil, :carbon],
+                  :nitrogen,
                 ]
               }
               let(:expected) {
@@ -121,8 +129,16 @@ module Vedeu
                   Vedeu::Models::Row.new([:hydrogen, :helium]),
                   Vedeu::Models::Row.new([]),
                   Vedeu::Models::Row.new([:lithium]),
-                  Vedeu::Models::Row.new([:beryllium, :boron]),
+                  Vedeu::Models::Row.new([:beryllium]),
+                  Vedeu::Models::Row.new([
+                    Vedeu::Views::Char.new(value: 'b'),
+                    Vedeu::Views::Char.new(value: 'o'),
+                    Vedeu::Views::Char.new(value: 'r'),
+                    Vedeu::Views::Char.new(value: 'o'),
+                    Vedeu::Views::Char.new(value: 'n'),
+                  ]),
                   Vedeu::Models::Row.new([:carbon]),
+                  Vedeu::Models::Row.new([:nitrogen]),
                 ])
               }
 

data/test/lib/vedeu/models/views/char_test.rb

@@ -155,7 +155,7 @@ module Vedeu
         it { subject.must_be_instance_of(String) }
 
         context 'when a position is specified' do
-          let(:position) { Vedeu::Geometry::Position[17, 2] }
+          let(:position) { Vedeu::Geometries::Position[17, 2] }
 
           it { subject.must_equal("\e[17;2Ha") }
         end
@@ -241,7 +241,7 @@ module Vedeu
       end
 
       describe '#x' do
-        let(:position) { Vedeu::Geometry::Position[17, 2] }
+        let(:position) { Vedeu::Geometries::Position[17, 2] }
 
         subject { instance.x }
 
@@ -257,7 +257,7 @@ module Vedeu
       end
 
       describe '#y' do
-        let(:position) { Vedeu::Geometry::Position[17, 2] }
+        let(:position) { Vedeu::Geometries::Position[17, 2] }
 
         subject { instance.y }
 

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

@@ -43,10 +43,14 @@ module Vedeu
                                        position: [1, 3])
               ])
             }
+            let(:expected) {
+              "\e[1;1H\e[38;2;255;0;0mY\e[0m" \
+              "\e[1;2H\e[38;2;255;0;0me\e[0m" \
+              "\e[1;3H\e[38;2;255;0;0ms\e[0m"
+            }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
-              # subject.must_equal("\e[1;1H\e[38;2;255;0;0mYes")
-              subject.must_equal("\e[1;1H\e[38;2;255;0;0mY\e[1;2He\e[1;3Hs")
+              subject.must_equal(expected)
             end
           end
 
@@ -71,9 +75,14 @@ module Vedeu
                                        position: [1, 4]),
               ])
             }
+            let(:expected) {
+              "\e[1;1H\e[38;2;255;0;0ma\e[0m" \
+              "\e[1;2H\e[38;2;255;0;0mb\e[0m" \
+              "\e[1;3H\e[38;2;0;0;255mc\e[0m" \
+              "\e[1;4H\e[38;2;0;0;255md\e[0m"
+            }
             it 'compresses multiple colours and styles where possible' do
-              # subject.must_equal("\e[1;1H\e[38;2;255;0;0mab\e[38;2;0;0;255mcd")
-              subject.must_equal("\e[1;1H\e[38;2;255;0;0ma\e[1;2Hb\e[1;3H\e[38;2;0;0;255mc\e[1;4Hd")
+              subject.must_equal(expected)
             end
           end
 
@@ -86,10 +95,11 @@ module Vedeu
                 Vedeu::Views::Char.new(name: _name, value: 't', position: [1, 3]),
               ])
             }
+            let(:expected) { "\e[1;1HN\e[0m\e[1;1H\e[?25l\e[0m\e[1;3Ht\e[0m" }
+
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
-              # subject.must_equal("\e[1;1HN\e[?25lt")
-              subject.must_equal("\e[1;1HN\e[1;1H\e[?25l\e[1;3Ht")
+              subject.must_equal(expected)
             end
           end
         end
@@ -111,11 +121,14 @@ module Vedeu
                                        colour: { foreground: '#ff0000' }),
               ])
             }
+            let(:expected) {
+              "\e[38;2;255;0;0mY\e[0m" \
+              "\e[38;2;255;0;0me\e[0m" \
+              "\e[38;2;255;0;0ms\e[0m"
+            }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
-              subject.must_equal(
-                "\e[38;2;255;0;0mY\e[38;2;255;0;0me\e[38;2;255;0;0ms"
-              )
+              subject.must_equal(expected)
             end
           end
 
@@ -136,13 +149,14 @@ module Vedeu
                                        colour: { foreground: '#0000ff' }),
               ])
             }
+            let(:expected) {
+              "\e[38;2;255;0;0ma\e[0m" \
+              "\e[38;2;255;0;0mb\e[0m" \
+              "\e[38;2;0;0;255mc\e[0m" \
+              "\e[38;2;0;0;255md\e[0m"
+            }
             it 'compresses multiple colours and styles where possible' do
-              subject.must_equal(
-                "\e[38;2;255;0;0ma" \
-                "\e[38;2;255;0;0mb" \
-                "\e[38;2;0;0;255mc" \
-                "\e[38;2;0;0;255md"
-              )
+              subject.must_equal(expected)
             end
           end
 
@@ -156,7 +170,7 @@ module Vedeu
             }
             it 'converts the non-Vedeu::Views::Char elements into String ' \
                'elements' do
-              subject.must_equal("N\e[1;1H\e[?25lt")
+              subject.must_equal("N\e[0m\e[1;1H\e[?25l\e[0mt\e[0m")
             end
           end
         end

data/test/lib/vedeu/output/renderers/html_test.rb

@@ -38,7 +38,7 @@ module Vedeu
         ::File.stubs(:write)
         Vedeu.stubs(:height).returns(2)
         Vedeu.stubs(:width).returns(4)
-        Vedeu::Terminal::Buffer.reset
+        Vedeu::Terminal::Buffer.reset!
       end
 
       describe '#initialize' do

data/test/lib/vedeu/output/renderers/json_test.rb

@@ -16,7 +16,7 @@ module Vedeu
         ::File.stubs(:write)
         Vedeu.stubs(:height).returns(1)
         Vedeu.stubs(:width).returns(1)
-        Vedeu::Terminal::Buffer.reset
+        Vedeu::Terminal::Buffer.reset!
       end
 
       describe '#initialize' do
@@ -58,6 +58,22 @@ module Vedeu
           "    },\n" \
           "    \"style\": \"\",\n" \
           "    \"value\": \"a\"\n" \
+          "  },\n" \
+          "  {\n" \
+          "    \"border\": \"\",\n" \
+          "    \"colour\": {\n" \
+          "      \"background\": \"\",\n" \
+          "      \"foreground\": \"\"\n" \
+          "    },\n" \
+          "    \"name\": \"\",\n" \
+          "    \"parent\": {\n" \
+          "    },\n" \
+          "    \"position\": {\n" \
+          "      \"y\": null,\n" \
+          "      \"x\": null\n" \
+          "    },\n" \
+          "    \"style\": \"\",\n" \
+          "    \"value\": \"\\u001b[0m\"\n" \
           "  }\n" \
           "]"
         }

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

@@ -27,7 +27,7 @@ module Vedeu
                                          visible: visible)
       }
       let(:geometry)  {
-        Vedeu::Geometry::Geometry.new(name:   'lithium',
+        Vedeu::Geometries::Geometry.new(name:   'lithium',
                                       height: 3,
                                       width:  3)
       }

data/test/lib/vedeu/terminal/buffer_test.rb

@@ -20,15 +20,7 @@ module Vedeu
         Vedeu.stubs(:ready?).returns(true)
         Vedeu.stubs(:height).returns(height)
         Vedeu.stubs(:width).returns(width)
-        Vedeu::Terminal::Buffer.reset
-      end
-
-      describe '#buffer' do
-        subject { described.buffer }
-
-        it { subject.must_be_instance_of(Array) }
-
-        # @todo Add more tests.
+        Vedeu::Terminal::Buffer.reset!
       end
 
       describe '#clear' do
@@ -59,11 +51,7 @@ module Vedeu
         # @todo Add more tests.
       end
 
-      describe '#read' do
-        # @todo Add more tests.
-      end
-
-      describe '#render' do
+      describe '#refresh' do
         let(:ready)  { false }
 
         before do
@@ -71,7 +59,7 @@ module Vedeu
           Vedeu.renderers.stubs(:render)
         end
 
-        subject { described.render }
+        subject { described.refresh }
 
         context 'when Vedeu is not ready' do
           it { subject.must_equal(nil) }
@@ -87,10 +75,10 @@ module Vedeu
         end
       end
 
-      describe '#reset' do
-        subject { described.reset }
+      describe '#reset!' do
+        subject { described.reset! }
 
-        it { subject.must_be_instance_of(Array) }
+        it { subject.must_be_instance_of(Vedeu::Buffers::View) }
       end
 
       describe '#write' do

data/test/lib/vedeu/terminal/terminal_test.rb

@@ -111,7 +111,7 @@ module Vedeu
       subject { described.cursor }
 
       #it { subject.must_be_instance_of(Array) }
-      #it { subject.must_be_instance_of(Vedeu::Geometry::Position) }
+      #it { subject.must_be_instance_of(Vedeu::Geometries::Position) }
     end
 
     describe '.centre' do

data/test/support/examples/material_colours_app.rb

@@ -25,6 +25,8 @@ class VedeuMaterialColoursApp
     log '/tmp/vedeu_material_colours_app.log'
     # height 11
     # width  20
+    # renderers(Vedeu::Renderers::File
+    #             .new(filename: '/tmp/material_colours.out'))
   end
 
   # Borders can be defined as standalone declarations.

data/test/test_helper.rb

@@ -17,7 +17,7 @@ if ENV['SIMPLECOV'].to_i == 1 || ENV['CONSOLE_COVERAGE'].to_i == 1
     add_group  'editor',        'vedeu/editor'
     add_group  'esc',           'vedeu/esc'
     add_group  'events',        'vedeu/events'
-    add_group  'geometry',      'vedeu/geometry'
+    add_group  'geometries',    'vedeu/geometries'
     add_group  'groups',        'vedeu/groups'
     add_group  'input',         'vedeu/input'
     add_group  'interfaces',    'vedeu/interfaces'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.60
+  version: 0.6.61
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -409,22 +409,22 @@ files:
 - lib/vedeu/events/event.rb
 - lib/vedeu/events/repository.rb
 - lib/vedeu/events/trigger.rb
-- lib/vedeu/geometry/alignment.rb
-- lib/vedeu/geometry/all.rb
-- lib/vedeu/geometry/area.rb
-- lib/vedeu/geometry/coordinate.rb
-- lib/vedeu/geometry/dimension.rb
-- lib/vedeu/geometry/dsl.rb
-- lib/vedeu/geometry/geometry.rb
-- lib/vedeu/geometry/grid.rb
-- lib/vedeu/geometry/horizontal_alignment.rb
-- lib/vedeu/geometry/move.rb
-- lib/vedeu/geometry/position.rb
-- lib/vedeu/geometry/repository.rb
-- lib/vedeu/geometry/validator.rb
-- lib/vedeu/geometry/vertical_alignment.rb
-- lib/vedeu/geometry/x_dimension.rb
-- lib/vedeu/geometry/y_dimension.rb
+- lib/vedeu/geometries/alignment.rb
+- lib/vedeu/geometries/all.rb
+- lib/vedeu/geometries/area.rb
+- lib/vedeu/geometries/coordinate.rb
+- lib/vedeu/geometries/dimension.rb
+- lib/vedeu/geometries/dsl.rb
+- lib/vedeu/geometries/geometry.rb
+- lib/vedeu/geometries/grid.rb
+- lib/vedeu/geometries/horizontal_alignment.rb
+- lib/vedeu/geometries/move.rb
+- lib/vedeu/geometries/position.rb
+- lib/vedeu/geometries/repository.rb
+- lib/vedeu/geometries/validator.rb
+- lib/vedeu/geometries/vertical_alignment.rb
+- lib/vedeu/geometries/x_dimension.rb
+- lib/vedeu/geometries/y_dimension.rb
 - lib/vedeu/groups/all.rb
 - lib/vedeu/groups/clear.rb
 - lib/vedeu/groups/dsl.rb
@@ -594,21 +594,21 @@ files:
 - test/lib/vedeu/events/event_test.rb
 - test/lib/vedeu/events/repository_test.rb
 - test/lib/vedeu/events/trigger_test.rb
-- test/lib/vedeu/geometry/alignment_test.rb
-- test/lib/vedeu/geometry/area_test.rb
-- test/lib/vedeu/geometry/coordinate.rb
-- test/lib/vedeu/geometry/dimension_test.rb
-- test/lib/vedeu/geometry/dsl_test.rb
-- test/lib/vedeu/geometry/geometry_test.rb
-- test/lib/vedeu/geometry/grid_test.rb
-- test/lib/vedeu/geometry/horizontal_alignment_test.rb
-- test/lib/vedeu/geometry/move_test.rb
-- test/lib/vedeu/geometry/position_test.rb
-- test/lib/vedeu/geometry/repository_test.rb
-- test/lib/vedeu/geometry/validator_test.rb
-- test/lib/vedeu/geometry/vertical_alignment_test.rb
-- test/lib/vedeu/geometry/x_dimension_test.rb
-- test/lib/vedeu/geometry/y_dimension_test.rb
+- test/lib/vedeu/geometries/alignment_test.rb
+- test/lib/vedeu/geometries/area_test.rb
+- test/lib/vedeu/geometries/coordinate.rb
+- test/lib/vedeu/geometries/dimension_test.rb
+- test/lib/vedeu/geometries/dsl_test.rb
+- test/lib/vedeu/geometries/geometry_test.rb
+- test/lib/vedeu/geometries/grid_test.rb
+- test/lib/vedeu/geometries/horizontal_alignment_test.rb
+- test/lib/vedeu/geometries/move_test.rb
+- test/lib/vedeu/geometries/position_test.rb
+- test/lib/vedeu/geometries/repository_test.rb
+- test/lib/vedeu/geometries/validator_test.rb
+- test/lib/vedeu/geometries/vertical_alignment_test.rb
+- test/lib/vedeu/geometries/x_dimension_test.rb
+- test/lib/vedeu/geometries/y_dimension_test.rb
 - test/lib/vedeu/groups/clear_test.rb
 - test/lib/vedeu/groups/dsl_test.rb
 - test/lib/vedeu/groups/group_test.rb
@@ -805,21 +805,21 @@ test_files:
 - test/lib/vedeu/events/event_test.rb
 - test/lib/vedeu/events/repository_test.rb
 - test/lib/vedeu/events/trigger_test.rb
-- test/lib/vedeu/geometry/alignment_test.rb
-- test/lib/vedeu/geometry/area_test.rb
-- test/lib/vedeu/geometry/coordinate.rb
-- test/lib/vedeu/geometry/dimension_test.rb
-- test/lib/vedeu/geometry/dsl_test.rb
-- test/lib/vedeu/geometry/geometry_test.rb
-- test/lib/vedeu/geometry/grid_test.rb
-- test/lib/vedeu/geometry/horizontal_alignment_test.rb
-- test/lib/vedeu/geometry/move_test.rb
-- test/lib/vedeu/geometry/position_test.rb
-- test/lib/vedeu/geometry/repository_test.rb
-- test/lib/vedeu/geometry/validator_test.rb
-- test/lib/vedeu/geometry/vertical_alignment_test.rb
-- test/lib/vedeu/geometry/x_dimension_test.rb
-- test/lib/vedeu/geometry/y_dimension_test.rb
+- test/lib/vedeu/geometries/alignment_test.rb
+- test/lib/vedeu/geometries/area_test.rb
+- test/lib/vedeu/geometries/coordinate.rb
+- test/lib/vedeu/geometries/dimension_test.rb
+- test/lib/vedeu/geometries/dsl_test.rb
+- test/lib/vedeu/geometries/geometry_test.rb
+- test/lib/vedeu/geometries/grid_test.rb
+- test/lib/vedeu/geometries/horizontal_alignment_test.rb
+- test/lib/vedeu/geometries/move_test.rb
+- test/lib/vedeu/geometries/position_test.rb
+- test/lib/vedeu/geometries/repository_test.rb
+- test/lib/vedeu/geometries/validator_test.rb
+- test/lib/vedeu/geometries/vertical_alignment_test.rb
+- test/lib/vedeu/geometries/x_dimension_test.rb
+- test/lib/vedeu/geometries/y_dimension_test.rb
 - test/lib/vedeu/groups/clear_test.rb
 - test/lib/vedeu/groups/dsl_test.rb
 - test/lib/vedeu/groups/group_test.rb

data/lib/vedeu/geometry/all.rb

@@ -1,31 +0,0 @@
-module Vedeu
-
-  # The Geometry group of classes all handle the size of interfaces in
-  # relation to the current size of the terminal. This helps Vedeu to
-  # draw content in a consistent way.
-  #
-  # You can define the geometry of your interfaces using the
-  # {Vedeu::Geometry::DSL}.
-  #
-  module Geometry
-
-  end # Geometry
-
-end # Vedeu
-
-require 'vedeu/geometry/alignment'
-require 'vedeu/geometry/horizontal_alignment'
-require 'vedeu/geometry/vertical_alignment'
-require 'vedeu/geometry/area'
-require 'vedeu/geometry/coordinate'
-require 'vedeu/geometry/dimension'
-require 'vedeu/geometry/x_dimension'
-require 'vedeu/geometry/y_dimension'
-require 'vedeu/geometry/validator'
-require 'vedeu/geometry/dsl'
-require 'vedeu/geometry/coordinate'
-require 'vedeu/geometry/geometry'
-require 'vedeu/geometry/grid'
-require 'vedeu/geometry/move'
-require 'vedeu/geometry/position'
-require 'vedeu/geometry/repository'