vedeu 0.5.5 → 0.5.6

data/test/lib/vedeu/output/presentation/style_test.rb

@@ -2,32 +2,31 @@ require 'test_helper'
 
 module Vedeu
 
-  class ParentPresentationTestClass
+  class ParentPresentationStyleTestClass
+
     include Vedeu::Presentation
 
-    def parent
-      nil
-    end
+    attr_reader :attributes
+    attr_reader :parent
 
     def attributes
       {
-        colour: { background: '#330000', foreground: '#00aadd' },
-        style:  ['bold']
+        style: ['underline']
       }
     end
+
   end
 
-  class PresentationTestClass
+  class PresentationStyleTestClass
+
     include Vedeu::Presentation
 
     attr_reader :attributes
+    attr_reader :parent
 
     def initialize(attributes = {})
       @attributes = attributes
-    end
-
-    def parent
-      Vedeu::ParentPresentationTestClass.new
+      @parent     = @attributes[:parent]
     end
 
   end # PresentationTestClass
@@ -36,36 +35,38 @@ module Vedeu
 
     describe Style do
 
-      let(:includer) { Vedeu::PresentationTestClass.new(attributes) }
+      let(:includer) { Vedeu::PresentationStyleTestClass.new(attributes) }
       let(:attributes) {
         {
-          colour: { background: background, foreground: foreground },
-          style:  ['bold']
+          parent: parent,
+          style:  style,
         }
       }
-      let(:background) { '#000033' }
-      let(:foreground) { '#aadd00' }
+      let(:parent) { Vedeu::ParentPresentationStyleTestClass.new }
+      let(:style)  { ['bold'] }
 
-      describe '#parent_style' do
-        subject { includer.parent_style }
+      describe '#style' do
+        subject { includer.style }
 
         it { subject.must_be_instance_of(Vedeu::Style) }
 
-        context 'when a parent is available' do
-          it { subject.value.must_equal(['bold']) }
-        end
+        context 'when the attribute is not set' do
+          let(:style) {}
 
-        context 'when a parent is not available' do
-          before { includer.stubs(:parent).returns(nil) }
+          context 'when a parent is available' do
+            it { subject.value.must_equal(['underline']) }
+          end
 
-          it { subject.value.must_equal(nil) }
-        end
-      end
+          context 'when a parent is not available' do
+            let(:parent) {}
 
-      describe '#style' do
-        subject { includer.style }
+            it { subject.value.must_equal(nil) }
+          end
+        end
 
-        it { subject.must_be_instance_of(Vedeu::Style) }
+        context 'when the attribute is set' do
+          it { subject.value.must_equal(['bold']) }
+        end
       end
 
       describe '#style=' do

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

@@ -46,7 +46,7 @@ module Vedeu
 
     describe '#to_s' do
       let(:line) {
-        Vedeu::Views::Line.new(streams: [],
+        Vedeu::Views::Line.new(value:  [],
                                parent: Vedeu::Interface.new,
                                colour: Vedeu::Colour.new(foreground: '#00ff00',
                                                          background: '#000000'),

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

@@ -83,14 +83,10 @@ module Vedeu
         it do
           subject.must_equal(
             "<tr>\n" \
-            "<td style='background:#000;color:#222;border:1px #000 solid;'>"   \
-            "t</td>\n" \
-              "<td style='background:#000;color:#222;border:1px #000 solid;'>" \
-            "e</td>\n" \
-              "<td style='background:#000;color:#222;border:1px #000 solid;'>" \
-            "s</td>\n" \
-              "<td style='background:#000;color:#222;border:1px #000 solid;'>" \
-            "t</td>\n" \
+            "<td style=''>t</td>\n" \
+            "<td style=''>e</td>\n" \
+            "<td style=''>s</td>\n" \
+            "<td style=''>t</td>\n" \
             "</tr>\n"
           )
         end

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

@@ -36,10 +36,12 @@ module Vedeu
               [
                 Vedeu::Views::Char.new(value: 'a',
                                        colour: colour,
+                                       parent: parent,
                                        position: Vedeu::Position[5, 3])
               ]
             ]
           }
+          let(:parent)   {}
           let(:expected) {
             <<-eos
 [
@@ -50,9 +52,6 @@ module Vedeu
       \"foreground\": \"\\u001b[38;2;255;0;0m\"
     },
     \"parent\": {
-      \"background\": \"\",
-      \"foreground\": \"\",
-      \"style\": \"\"
     },
     \"position\": {
       \"y\": 5,
@@ -66,6 +65,41 @@ module Vedeu
           }
 
           it { subject.must_equal(expected.chomp) }
+
+          context 'when a parent is available' do
+            let(:parent) {
+              Vedeu::Views::Stream.new(
+                colour: Vedeu::Colour.coerce(background: '', foreground: '')
+              )
+            }
+
+            let(:expected) {
+              <<-eos
+[
+  {
+    \"border\": \"\",
+    \"colour\": {
+      \"background\": \"\\u001b[48;2;255;255;255m\",
+      \"foreground\": \"\\u001b[38;2;255;0;0m\"
+    },
+    \"parent\": {
+      \"background\": \"\",
+      \"foreground\": \"\",
+      \"style\": \"\"
+    },
+    \"position\": {
+      \"y\": 5,
+      \"x\": 3
+    },
+    \"style\": \"\",
+    \"value\": \"a\"
+  }
+]
+              eos
+            }
+
+            it { subject.must_equal(expected.chomp) }
+          end
         end
       end
 

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

@@ -39,19 +39,19 @@ module Vedeu
     }
     let(:text_line_objects) {
       [
-        Vedeu::Views::Line.new(streams: [
+        Vedeu::Views::Line.new(value: [
           Vedeu::Views::Stream.new(
             value: 'Krypton is a colorless, odorless, tasteless noble gas.'
           )]),
-        Vedeu::Views::Line.new(streams: [
+        Vedeu::Views::Line.new(value: [
           Vedeu::Views::Stream.new(
             value: 'It occurs in trace amounts in the atmosphere.'
           )]),
-        Vedeu::Views::Line.new(streams: [
+        Vedeu::Views::Line.new(value: [
           Vedeu::Views::Stream.new(
             value: 'It is isolated by fractionally distilling liquefied air.'
           )]),
-        Vedeu::Views::Line.new(streams: [
+        Vedeu::Views::Line.new(value: [
           Vedeu::Views::Stream.new(
             value: 'Krypton is often used with other rare gases in ' \
                    'fluorescent lamps.'

data/test/lib/vedeu/repositories/repository_test.rb

@@ -178,32 +178,6 @@ module Vedeu
       end
     end
 
-    describe '#inspect' do
-      before { Vedeu.interfaces.reset }
-
-      subject { instance.inspect }
-
-      it { subject.must_be_instance_of(String) }
-
-      context 'when there are no models stored in the repository' do
-        it { subject.must_equal("<Vedeu::Repository: []>") }
-      end
-
-      context 'when there are models stored in the repository' do
-        before {
-          Vedeu.interface('hydrogen') {}
-          Vedeu.interface('helium') {}
-        }
-        after { Vedeu.interfaces.reset }
-
-        subject { Vedeu.interfaces.inspect }
-
-        it { subject.must_equal(
-          "<Vedeu::Interfaces: [\"hydrogen\", \"helium\"]>"
-        ) }
-      end
-    end
-
     describe '#registered?' do
       it 'returns false with no name' do
         RepositoriesTestClass.new.registered?('').must_equal(false)

data/test/lib/vedeu/templating/view_template_test.rb

@@ -24,7 +24,7 @@ module Vedeu
           let(:content) { "This is a test.\n" }
           let(:expected) {
             Vedeu::Views::Lines.new([
-              Vedeu::Views::Line.new(streams:
+              Vedeu::Views::Line.new(value:
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },
@@ -40,13 +40,13 @@ module Vedeu
           let(:content) { "This is a test.\nAnd so is this.\n" }
           let(:expected) {
             Vedeu::Views::Lines.new([
-              Vedeu::Views::Line.new(streams:
+              Vedeu::Views::Line.new(value:
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },
                                          style: :normal,
                                          value: 'This is a test.')),
-              Vedeu::Views::Line.new(streams:
+              Vedeu::Views::Line.new(value:
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },
@@ -66,7 +66,7 @@ module Vedeu
 
           let(:expected) {
             Vedeu::Views::Lines.new([
-              Vedeu::Views::Line.new(streams: [
+              Vedeu::Views::Line.new(value: [
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },
@@ -96,7 +96,7 @@ module Vedeu
 
             let(:expected) {
               Vedeu::Views::Lines.new([
-                Vedeu::Views::Line.new(streams: [
+                Vedeu::Views::Line.new(value: [
                   Vedeu::Views::Stream.new(colour: {
                                              background: :default,
                                              foreground: :default },
@@ -130,7 +130,7 @@ module Vedeu
 
           let(:expected) {
             Vedeu::Views::Lines.new([
-              Vedeu::Views::Line.new(streams: [
+              Vedeu::Views::Line.new(value: [
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },
@@ -157,7 +157,7 @@ module Vedeu
 
           let(:expected) {
             Vedeu::Views::Lines.new([
-              Vedeu::Views::Line.new(streams: [
+              Vedeu::Views::Line.new(value: [
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },
@@ -184,7 +184,7 @@ module Vedeu
 
           let(:expected) {
             Vedeu::Views::Lines.new([
-              Vedeu::Views::Line.new(streams: [
+              Vedeu::Views::Line.new(value: [
                 Vedeu::Views::Stream.new(colour: {
                                            background: :default,
                                            foreground: :default },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Gavin Laking
@@ -362,7 +362,6 @@ files:
 - lib/vedeu/geometry/geometry.rb
 - lib/vedeu/geometry/grid.rb
 - lib/vedeu/geometry/position.rb
-- lib/vedeu/geometry/position_index.rb
 - lib/vedeu/input/input.rb
 - lib/vedeu/input/key.rb
 - lib/vedeu/input/keymap.rb
@@ -379,21 +378,20 @@ files:
 - lib/vedeu/models/group.rb
 - lib/vedeu/models/groups.rb
 - lib/vedeu/models/interface.rb
-- lib/vedeu/models/interface_collection.rb
 - lib/vedeu/models/interfaces.rb
 - lib/vedeu/models/menu.rb
 - lib/vedeu/models/menus.rb
 - lib/vedeu/models/toggleable.rb
 - lib/vedeu/models/views/all.rb
 - lib/vedeu/models/views/char.rb
-- lib/vedeu/models/views/chars.rb
+- lib/vedeu/models/views/collections/chars.rb
+- lib/vedeu/models/views/collections/lines.rb
+- lib/vedeu/models/views/collections/streams.rb
+- lib/vedeu/models/views/collections/view_collection.rb
 - lib/vedeu/models/views/composition.rb
 - lib/vedeu/models/views/line.rb
-- lib/vedeu/models/views/lines.rb
 - lib/vedeu/models/views/stream.rb
-- lib/vedeu/models/views/streams.rb
 - lib/vedeu/models/views/view.rb
-- lib/vedeu/models/views/view_collection.rb
 - lib/vedeu/null.rb
 - lib/vedeu/null/border.rb
 - lib/vedeu/null/buffer.rb
@@ -523,7 +521,6 @@ files:
 - test/lib/vedeu/geometry/geometries_test.rb
 - test/lib/vedeu/geometry/geometry_test.rb
 - test/lib/vedeu/geometry/grid_test.rb
-- test/lib/vedeu/geometry/position_index_test.rb
 - test/lib/vedeu/geometry/position_test.rb
 - test/lib/vedeu/input/input_test.rb
 - test/lib/vedeu/input/key_test.rb
@@ -540,19 +537,19 @@ files:
 - test/lib/vedeu/models/focus_test.rb
 - test/lib/vedeu/models/group_test.rb
 - test/lib/vedeu/models/groups_test.rb
-- test/lib/vedeu/models/interface_collection_test.rb
 - test/lib/vedeu/models/interface_test.rb
 - test/lib/vedeu/models/interfaces_test.rb
 - test/lib/vedeu/models/menu_test.rb
 - test/lib/vedeu/models/menus_test.rb
 - test/lib/vedeu/models/toggleable_test.rb
 - test/lib/vedeu/models/views/char_test.rb
-- test/lib/vedeu/models/views/chars_test.rb
+- test/lib/vedeu/models/views/collections/chars_test.rb
+- test/lib/vedeu/models/views/collections/lines_test.rb
+- test/lib/vedeu/models/views/collections/streams_test.rb
+- test/lib/vedeu/models/views/collections/view_collection_test.rb
 - test/lib/vedeu/models/views/composition_test.rb
 - test/lib/vedeu/models/views/line_test.rb
-- test/lib/vedeu/models/views/lines_test.rb
 - test/lib/vedeu/models/views/stream_test.rb
-- test/lib/vedeu/models/views/streams_test.rb
 - test/lib/vedeu/models/views/view_test.rb
 - test/lib/vedeu/null/border_test.rb
 - test/lib/vedeu/null/buffer_test.rb
@@ -711,7 +708,6 @@ test_files:
 - test/lib/vedeu/geometry/geometries_test.rb
 - test/lib/vedeu/geometry/geometry_test.rb
 - test/lib/vedeu/geometry/grid_test.rb
-- test/lib/vedeu/geometry/position_index_test.rb
 - test/lib/vedeu/geometry/position_test.rb
 - test/lib/vedeu/input/input_test.rb
 - test/lib/vedeu/input/key_test.rb
@@ -728,19 +724,19 @@ test_files:
 - test/lib/vedeu/models/focus_test.rb
 - test/lib/vedeu/models/group_test.rb
 - test/lib/vedeu/models/groups_test.rb
-- test/lib/vedeu/models/interface_collection_test.rb
 - test/lib/vedeu/models/interface_test.rb
 - test/lib/vedeu/models/interfaces_test.rb
 - test/lib/vedeu/models/menu_test.rb
 - test/lib/vedeu/models/menus_test.rb
 - test/lib/vedeu/models/toggleable_test.rb
 - test/lib/vedeu/models/views/char_test.rb
-- test/lib/vedeu/models/views/chars_test.rb
+- test/lib/vedeu/models/views/collections/chars_test.rb
+- test/lib/vedeu/models/views/collections/lines_test.rb
+- test/lib/vedeu/models/views/collections/streams_test.rb
+- test/lib/vedeu/models/views/collections/view_collection_test.rb
 - test/lib/vedeu/models/views/composition_test.rb
 - test/lib/vedeu/models/views/line_test.rb
-- test/lib/vedeu/models/views/lines_test.rb
 - test/lib/vedeu/models/views/stream_test.rb
-- test/lib/vedeu/models/views/streams_test.rb
 - test/lib/vedeu/models/views/view_test.rb
 - test/lib/vedeu/null/border_test.rb
 - test/lib/vedeu/null/buffer_test.rb

data/lib/vedeu/geometry/position_index.rb

@@ -1,68 +0,0 @@
-module Vedeu
-
-  # Converts a position into an index for the terminal. An index is the position
-  # minus 1.
-  #
-  class PositionIndex
-
-    # Convenience constructor for Vedeu::Position.
-    #
-    # @param (see #initialize)
-    def self.[](y, x)
-      new(y, x).[]
-    end
-
-    # Returns a new instance of Vedeu::PositionIndex.
-    #
-    # @param y [Fixnum] The row/line coordinate.
-    # @param x [Fixnum] The column/character coordinate.
-    # @return [Vedeu::PositionIndex]
-    def initialize(y, x)
-      @y = y
-      @x = x
-    end
-
-    # Returns a tuple containing the y and x coordinates.
-    #
-    # @return [Array<Fixnum>]
-    def []
-      [y, x]
-    end
-
-    # An object is equal when its values are the same.
-    #
-    # @param other [Vedeu::PositionIndex]
-    # @return [Boolean]
-    def eql?(other)
-      self.class == other.class && (x == other.x && y == other.y)
-    end
-    alias_method :==, :eql?
-
-    # Converts the index values into a Vedeu::Position.
-    #
-    # @return [Vedeu::Position]
-    def to_position
-      Vedeu::Position[y, x]
-    end
-
-    # Returns the x index.
-    # If the position for x is less than 1, then the index is 0.
-    #
-    # @return [Fixnum]
-    def x
-      @_x ||= ((@x - 1) <= 1) ? 0 : (@x - 1)
-    end
-    alias_method :last, :x
-
-    # Returns the y index.
-    # If the position for y is less than 1, then the index is 0.
-    #
-    # @return [Fixnum]
-    def y
-      @_y ||= ((@y - 1) <= 1) ? 0 : (@y - 1)
-    end
-    alias_method :first, :y
-
-  end # PositionIndex
-
-end # Vedeu