vedeu 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2990a71171d7d18e057affb7e509d13267efbcfb
-  data.tar.gz: 65566020c8f8fa0a069bcf3d8ebff832e5ac378d
+  metadata.gz: 54bb0cd0826751a7fb718c0bd4a68aed54a12d1e
+  data.tar.gz: 06d71adf59c0300bd27812b07593bcfdfb71114a
 SHA512:
-  metadata.gz: c2a5b89fc277c8200f574717dd643c2c9b1b689f15f9a913a13ad67ac6f275fa4c7755493eb7452022a53e0941bb97574bdf2e692a1bbdabb93001a2d9a5e674
-  data.tar.gz: a1259cc57c8a5425171af9f16707ea73daa66e709e71dc5ea78ce3d9af756976d55aa8cb3b659cab92469edd1896174ce948984b1e4cda4fc529221d34a24f61
+  metadata.gz: 072569691f768aee22091160266ea4cb944865ecb186eb62eec47617f39a28d30d5629ff72b2c69919f82dbc3c41bb562dbef2afa00daaf91d466db358465a4b
+  data.tar.gz: 42074a95c54fedb6143ad082188185ca2e5bd6d60d0f092cb9e2d16bf9bfba2b49b40c0e1a7a23b0e218473415128cfe5d2d17bb7923fa3be8e9d5449542be2f

data/Guardfile

@@ -18,8 +18,3 @@ guard :bundler do
   watch('Gemfile')
   watch(/^.+\.gemspec/)
 end
-
-guard 'yard' do
-  watch(%r{docs/.+\.md})
-  watch(%r{lib/.+\.rb})
-end

data/lib/vedeu/input/all.rb

@@ -17,8 +17,11 @@ module Vedeu
 
   # Define a keymap called '_global_' which will respond no matter which
   # interface is in focus.
+  #
+  # @note
+  #   Initially, no keys are registered with the global keymap.
   Vedeu::DSL::Keymap.keymap('_global_') do
-
+    # ...
   end
 
 end # Vedeu

data/lib/vedeu/input/keymap.rb

@@ -4,6 +4,7 @@ require 'vedeu/dsl/components/keymap'
 
 module Vedeu
 
+  # A container class for keys associated with a particular interface.
   class Keymap
 
     include Vedeu::Model
@@ -79,6 +80,9 @@ module Vedeu
       keys.any? { |key| key.input == input }
     end
 
+    # Triggers the action associated with the key, if it is registered with this
+    # keymap.
+    #
     # @param input [String|Symbol]
     # @return [Array|FalseClass]
     def use(input)
@@ -93,6 +97,8 @@ module Vedeu
 
     private
 
+    # Checks that the provided key is not already registered with this keymap.
+    #
     # @param key [Vedeu::Key]
     # @return [Boolean]
     def valid?(key)

data/lib/vedeu/input/mapper.rb

@@ -1,7 +1,12 @@
 module Vedeu
 
+  # Maps keys to keymaps.
   class Mapper
 
+    # Takes a key as a keypress and sends it to registered keymaps. If found,
+    # the associated action is fired, if not, we move to the next keymap or
+    # return false.
+    #
     # @param key [NilClass|String|Symbol]
     # @param name [NilClass|String]
     # @return [Boolean]
@@ -11,6 +16,9 @@ module Vedeu
       new(key, name).keypress
     end
 
+    # Checks a key is valid; i.e. not already registered to a keymap. If the
+    # key is registered, then the key is invalid and cannot be used again.
+    #
     # @param key [NilClass|String|Symbol]
     # @param name [NilClass|String]
     # @return [Boolean]
@@ -93,11 +101,15 @@ module Vedeu
     end
     alias_method :interface, :name
 
+    # Return the name of the global keymap.
+    #
     # @return [String]
     def global
       '_global_'
     end
 
+    # Return the name of the system keymap.
+    #
     # @return [String]
     def system
       '_system_'

data/lib/vedeu/launcher.rb

@@ -66,7 +66,7 @@ module Vedeu
 
     # @return []
     def configuration
-      Configuration.configure(argv)
+      Vedeu::Configuration.configure(argv)
     end
 
   end # Launcher

data/lib/vedeu/models/geometry.rb

@@ -34,34 +34,6 @@ module Vedeu
     attr_reader   :attributes
     attr_writer   :x, :y
 
-    class << self
-
-      # Build models using a simple DSL when a block is given, otherwise returns
-      # a new instance of the class including this module.
-      #
-      # @see Vedeu::Geometry#initialize
-      def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
-
-        model = new(attributes)
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client: nil,
-          name:   '',
-        }
-      end
-
-    end
-
     # Returns a new instance of Geometry.
     #
     # @param attributes [Hash]
@@ -344,6 +316,7 @@ module Vedeu
     def defaults
       {
         centred: false,
+        client:  nil,
         height:  Terminal.height,
         name:    '',
         width:   Terminal.width,

data/lib/vedeu/models/menu.rb

@@ -26,22 +26,6 @@ module Vedeu
 
     class << self
 
-      # @option attributes collection []
-      # @option attributes client []
-      # @option attributes name []
-      # @option attributes current []
-      # @option attributes selected []
-      def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
-
-        model = new(attributes[:collection],
-                    attributes[:name],
-                    attributes[:current],
-                    attributes[:selected])
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
       # Register a menu by name which will display a collection of items for
       # your users to select; and provide interactivity within your application.
       #
@@ -68,36 +52,23 @@ module Vedeu
         build({ name: name }, &block).store
       end
 
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client:     nil,
-          collection: [],
-          current:    0,
-          name:       '',
-          selected:   nil,
-        }
-      end
-
     end
 
     # Returns a new instance of Menu.
     #
-    # @param collection [Array]
-    # @param name [String]
-    # @param current [Fixnum]
-    # @param selected [Fixnum|NilClass]
+    # @param attributes [Hash]
+    # @option attributes collection [Array]
+    # @option attributes name [String]
+    # @option attributes current [Fixnum]
+    # @option attributes selected [Fixnum|NilClass]
     # @return [Menu]
-    def initialize(collection = [], name = '', current = 0, selected = nil)
-      @collection = collection
-      @name       = name
-      @current    = current
-      @selected   = selected
+    def initialize(attributes = {})
+      @attributes = defaults.merge(attributes)
+      @collection = @attributes[:collection]
+      @current    = @attributes[:current]
+      @name       = @attributes[:name]
       @repository = Vedeu.menus
+      @selected   = @attributes[:selected]
     end
 
     # Returns the item from the collection which shares the same index as the
@@ -227,6 +198,19 @@ module Vedeu
 
     private
 
+    # The default values for a new instance of this class.
+    #
+    # @return [Hash]
+    def defaults
+      {
+        client:     nil,
+        collection: [],
+        current:    0,
+        name:       '',
+        selected:   nil,
+      }
+    end
+
   end # Menu
 
 end # Vedeu

data/lib/vedeu/models/model.rb

@@ -10,6 +10,21 @@ module Vedeu
 
     module ClassMethods
 
+      # Build models using a simple DSL when a block is given, otherwise returns
+      # a new instance of the class including this module.
+      #
+      # @param attributes [Hash] A collection of attributes specific to the
+      #   model.
+      # @param block [Proc] The block passed to the build method.
+      # @return [Object] An instance of the model.
+      def build(attributes = {}, &block)
+        attributes = defaults.merge(attributes)
+
+        model = new(attributes)
+        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
+        model
+      end
+
       # Provide a convenient way to define the child or children of a model.
       #
       # @param klass [Class] The member (singular) or collection (multiple)
@@ -21,6 +36,18 @@ module Vedeu
       alias_method :member,     :child
       alias_method :collection, :child
 
+      private
+
+      # The default values for a new instance of this class.
+      #
+      # @return [Hash]
+      def defaults
+        {
+          client:    nil,
+          name:      '',
+        }
+      end
+
     end # ClassMethods
 
     # When this module is included in a class, provide ClassMethods as class

data/lib/vedeu/models/view/composition.rb

@@ -22,50 +22,21 @@ module Vedeu
     attr_reader  :interfaces
     alias_method :value, :interfaces
 
-    class << self
-
-      # @param attributes [Hash]
-      # @option attributes client []
-      # @option attributes colour []
-      # @option attributes interfaces []
-      # @option attributes style []
-      # @param block [Proc]
-      # @return [Class]
-      def build(attributes = {}, &block)
-        attrs = defaults.merge(attributes)
-
-        model = new(attrs[:interfaces], attrs[:colour], attrs[:style])
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client:     nil,
-          colour:     nil,
-          interfaces: [],
-          style:      nil,
-        }
-      end
-
-    end
-
     # Returns a new instance of Composition.
     #
-    # @param interfaces [Interfaces]
+    # @param attributes [Hash]
+    # @option attributes colour []
+    # @option attributes interfaces []
+    # @option attributes style []
     # @return [Composition]
-    def initialize(interfaces = [], colour = nil, style = nil)
-      @interfaces = interfaces
-      @colour     = colour
-      @style      = style
+    def initialize(attributes = {})
+      @attributes = defaults.merge(attributes)
+      @interfaces = @attributes[:interfaces]
+      @colour     = Colour.coerce(@attributes[:colour])
+      @style      = Style.coerce(@attributes[:style])
     end
 
-    # @param child []
+    # @param child [Vedeu::Interface]
     # @return []
     def add(child)
       @interfaces = interfaces.add(child)
@@ -83,6 +54,20 @@ module Vedeu
       collection.coerce(@interfaces, self)
     end
 
+    private
+
+    # The default values for a new instance of this class.
+    #
+    # @return [Hash]
+    def defaults
+      {
+        client:     nil,
+        colour:     nil,
+        interfaces: [],
+        style:      nil,
+      }
+    end
+
   end # Composition
 
 end # Vedeu

data/lib/vedeu/models/view/interface.rb

@@ -47,69 +47,28 @@ module Vedeu
       :height,
       :origin
 
-    class << self
-
-      # Build interfaces using a simple DSL.
-      # If a name is provided as part of the attributes, we check the repository
-      # for an interface of the same name and update it from the new attributes
-      # provided, or if a block is given, new parameters set via the DSL.
-      #
-      # @param attributes [Hash]
-      # @option attributes client []
-      # @option attributes colour []
-      # @option attributes lines []
-      # @option attributes name []
-      # @option attributes parent []
-      # @option attributes style []
-      # @param block [Proc]
-      # @return [Class]
-      def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
-        model = new(attributes[:name],
-                    attributes[:lines],
-                    attributes[:parent],
-                    attributes[:colour],
-                    attributes[:style])
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client: nil,
-          colour: nil,
-          lines:  [],
-          name:   '',
-          parent: nil,
-          style:  nil,
-        }
-      end
-    end
-
     # Return a new instance of Interface.
     #
-    # @param name [String]
-    # @param lines [Vedeu::Lines]
-    # @param parent [Vedeu::Composition]
-    # @param colour [Vedeu::Colour]
-    # @param style [Vedeu::Style]
-    # @return [Interface]
-    def initialize(name = '', lines = [], parent = nil, colour = nil, style = nil)
-      @name   = name
-      @lines  = lines
-      @parent = parent
-      @colour = colour
-      @style  = style
-
-      @delay  = 0.0
-      @group  = ''
-
+    # @param attributes [Hash]
+    # @option attributes colour [Vedeu::Colour]
+    # @option attributes delay [Float]
+    # @option attributes group [String]
+    # @option attributes lines [Vedeu::Lines]
+    # @option attributes name [String]
+    # @option attributes parent [Vedeu::Composition]
+    # @option attributes style [Vedeu::Style]
+    # @return [Vedeu::Interface]
+    def initialize(attributes = {})
+      @attributes = defaults.merge(attributes)
+
+      @colour     = Colour.coerce(@attributes[:colour])
+      @delay      = @attributes[:delay]
+      @group      = @attributes[:group]
+      @lines      = @attributes[:lines]
+      @name       = @attributes[:name]
+      @parent     = @attributes[:parent]
       @repository = Vedeu.interfaces
+      @style      = Style.coerce(@attributes[:style])
     end
 
     # @param child []
@@ -188,6 +147,24 @@ module Vedeu
       store_group
     end
 
+    private
+
+    # The default values for a new instance of this class.
+    #
+    # @return [Hash]
+    def defaults
+      {
+        client: nil,
+        colour: nil,
+        delay:  0.0,
+        group:  '',
+        lines:  [],
+        name:   '',
+        parent: nil,
+        style:  nil,
+      }
+    end
+
   end # Interface
 
 end # Vedeu

data/lib/vedeu/models/view/line.rb

@@ -23,48 +23,19 @@ module Vedeu
 
     alias_method :value, :streams
 
-    class << self
-
-      # @option attributes streams []
-      # @option attributes parent []
-      # @option attributes colour []
-      # @option attributes style []
-      # @option attributes client []
-      def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
-
-        model = new(attributes[:streams],
-                    attributes[:parent],
-                    attributes[:colour],
-                    attributes[:style])
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client:  nil,
-          colour:  nil,
-          parent:  nil,
-          streams: [],
-          style:   nil,
-        }
-      end
-    end
-
     # Returns a new instance of Line.
     #
+    # @option attributes streams [Vedeu::Streams]
+    # @option attributes parent [Vedeu::Interface]
+    # @option attributes colour [Vedeu::Colour]
+    # @option attributes style [Vedeu::Style]
     # @return [Line]
-    def initialize(streams = [], parent = nil, colour = nil, style = nil)
-      @colour  = colour
-      @parent  = parent
-      @streams = streams
-      @style   = style
+    def initialize(attributes = {})
+      @attributes = defaults.merge(attributes)
+      @colour     = Colour.coerce(@attributes[:colour])
+      @parent     = @attributes[:parent]
+      @streams    = @attributes[:streams]
+      @style      = Style.coerce(@attributes[:style])
     end
 
     # @param child []
@@ -116,6 +87,21 @@ module Vedeu
       parent.width if parent
     end
 
+    private
+
+    # The default values for a new instance of this class.
+    #
+    # @return [Hash]
+    def defaults
+      {
+        client:  nil,
+        colour:  nil,
+        parent:  nil,
+        streams: [],
+        style:   nil,
+      }
+    end
+
   end # Line
 
 end # Vedeu

data/lib/vedeu/models/view/stream.rb

@@ -23,53 +23,21 @@ module Vedeu
     alias_method :data,    :value
     alias_method :text,    :value
 
-    class << self
-
-      # @option attributes value []
-      # @option attributes parent []
-      # @option attributes colour []
-      # @option attributes style []
-      # @option attributes client []
-      def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
-
-        model = new(attributes[:value],
-                    attributes[:parent],
-                    attributes[:colour],
-                    attributes[:style])
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client: nil,
-          colour: nil,
-          parent: nil,
-          style:  nil,
-          value:  '',
-        }
-      end
-
-    end
-
     # Returns a new instance of Stream.
     #
-    # @param value [String]
-    # @param parent [Vedeu::Line]
-    # @param colour [Vedeu::Colour]
-    # @param style [Vedeu::Style]
+    # @param attributes [Hash]
+    # @option attributes value [String]
+    # @option attributes parent [Vedeu::Line]
+    # @option attributes colour [Vedeu::Colour]
+    # @option attributes style [Vedeu::Style]
+    # @option attributes client [Object]
     # @return [Vedeu::Stream]
-    def initialize(value = '', parent = nil, colour = nil, style = nil)
-      @value  = value
-      @parent = parent
-      @colour = colour
-      @style  = style
+    def initialize(attributes = {})
+      @attributes = defaults.merge(attributes)
+      @colour     = Colour.coerce(@attributes[:colour])
+      @parent     = @attributes[:parent]
+      @style      = Style.coerce(@attributes[:style])
+      @value      = @attributes[:value]
     end
 
     # @param child [Vedeu::Stream]
@@ -126,6 +94,21 @@ module Vedeu
       parent.width if parent
     end
 
+    private
+
+    # The default values for a new instance of this class.
+    #
+    # @return [Hash]
+    def defaults
+      {
+        client: nil,
+        colour: nil,
+        parent: nil,
+        style:  nil,
+        value:  '',
+      }
+    end
+
   end # Stream
 
 end # Vedeu

data/lib/vedeu/output/border.rb

@@ -17,31 +17,6 @@ module Vedeu
     attr_accessor :attributes
     attr_reader   :name
 
-    class << self
-
-      # @see Vedeu::Border#initialize
-      def build(attributes = {}, &block)
-        attributes = defaults.merge(attributes)
-
-        model = new(attributes)
-        model.deputy(attributes[:client]).instance_eval(&block) if block_given?
-        model
-      end
-
-      private
-
-      # The default values for a new instance of this class.
-      #
-      # @return [Hash]
-      def defaults
-        {
-          client:    nil,
-          name:      '',
-        }
-      end
-
-    end
-
     # Returns a new instance of Border.
     #
     # @param attributes [Hash]
@@ -375,6 +350,7 @@ module Vedeu
       {
         bottom_left:  "\x6D", # └
         bottom_right: "\x6A", # ┘
+        client:       nil,
         colour:       {},
         enabled:      false,
         horizontal:   "\x71", # ─

data/lib/vedeu/output/wordwrap.rb

@@ -85,7 +85,7 @@ module Vedeu
     # @return [Vedeu::Lines]
     def to_line_objects(text_as_lines)
       line_objects = Array(text_as_lines).map do |text_line|
-        stream        = Vedeu::Stream.new(text_line)
+        stream        = Vedeu::Stream.new({ value: text_line })
         line          = Vedeu::Line.new
         stream.parent = line
         line.add(stream)

data/test/lib/vedeu/dsl/components/menu_test.rb

@@ -8,7 +8,13 @@ module Vedeu
 
       let(:described)  { Vedeu::DSL::Menu }
       let(:instance)   { described.new(model) }
-      let(:model)      { Vedeu::Menu.new(collection, menu_name) }
+      let(:model)      { Vedeu::Menu.new(attributes) }
+      let(:attributes) {
+        {
+          collection: collection,
+          name:       menu_name,
+        }
+      }
       let(:collection) { [:sodium, :magnesium, :aluminium, :silicon] }
       let(:menu_name)  { 'elements' }
 

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

@@ -8,7 +8,15 @@ module Vedeu
 
       let(:described) { Vedeu::DSL::Line }
       let(:instance)  { described.new(model) }
-      let(:model)     { Vedeu::Line.new(streams, parent, colour, style) }
+      let(:model)     { Vedeu::Line.new(attributes) }
+      let(:attributes){
+        {
+          streams: streams,
+          parent:  parent,
+          colour:  colour,
+          style:   style,
+        }
+      }
       let(:client)    {}
       let(:streams)   { [] }
       let(:parent)    { Vedeu::Interface.new }
@@ -18,7 +26,7 @@ module Vedeu
       describe '#initialize' do
         subject { instance }
 
-        it { subject.must_be_instance_of(Vedeu::DSL::Line) }
+        it { subject.must_be_instance_of(described) }
         it { subject.instance_variable_get('@model').must_equal(model) }
         it { subject.instance_variable_get('@client').must_equal(client) }
       end

data/test/lib/vedeu/launcher_test.rb

@@ -4,28 +4,33 @@ module Vedeu
 
   describe Launcher do
 
-    let(:described) { Launcher.new }
+    let(:described) { Vedeu::Launcher }
+    let(:instance)  { described.new }
 
     before do
-      Configuration.stubs(:configure)
+      Configuration.stubs(:configure)#.returns(test_configuration)
       Application.stubs(:start)
       Kernel.stubs(:exit)
       Kernel.stubs(:puts)
     end
 
     describe '#initialize' do
-      it { described.must_be_instance_of(Launcher) }
-      it { described.instance_variable_get('@argv').must_equal([]) }
-      it { described.instance_variable_get('@stdin').must_equal(STDIN) }
-      it { described.instance_variable_get('@stdout').must_equal(STDOUT) }
-      it { described.instance_variable_get('@stderr').must_equal(STDERR) }
-      it { described.instance_variable_get('@kernel').must_equal(Kernel) }
-      it { described.instance_variable_get('@exit_code').must_equal(1) }
+      subject { instance }
+
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@argv').must_equal([]) }
+      it { subject.instance_variable_get('@stdin').must_equal(STDIN) }
+      it { subject.instance_variable_get('@stdout').must_equal(STDOUT) }
+      it { subject.instance_variable_get('@stderr').must_equal(STDERR) }
+      it { subject.instance_variable_get('@kernel').must_equal(Kernel) }
+      it { subject.instance_variable_get('@exit_code').must_equal(1) }
     end
 
     describe '#execute!' do
+      subject { instance.execute! }
+
       it 'returns 0 for successful execution' do
-        Launcher.new.execute!.must_equal(0)
+        subject.must_equal(0)
       end
 
       # context 'when an exception is raised' do

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

@@ -20,6 +20,7 @@ module Vedeu
       context 'with default attributes' do
         it { subject.instance_variable_get('@attributes').must_equal({
             centred: false,
+            client:  nil,
             height:  25,
             name:    '',
             width:   80,

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

@@ -5,7 +5,15 @@ module Vedeu
   describe Menu do
 
     let(:described)  { Vedeu::Menu }
-    let(:instance)   { described.new(collection, menu_name, current, selected) }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        collection: collection,
+        name:       menu_name,
+        current:    current,
+        selected:   selected,
+      }
+    }
     let(:collection) { ['hydrogen', 'carbon', 'nitrogen', 'oxygen'] }
     let(:menu_name)  { 'elements' }
     let(:current)    { 0 }
@@ -13,12 +21,6 @@ module Vedeu
 
     before { Vedeu.menus.reset }
 
-    describe '.build' do
-      subject { described.build }
-
-      it { subject.must_be_instance_of(described) }
-    end
-
     describe '.menu' do
       subject {
         described.menu('elements') do

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

@@ -7,7 +7,15 @@ module Vedeu
     let(:described)     { Vedeu::Char }
     let(:instance)      { described.new(value, parent, colour, style, position) }
     let(:value)         { 'a' }
-    let(:parent)        { Line.new([], nil, parent_colour, parent_style) }
+    let(:parent)        { Line.new(parent_attributes) }
+    let(:parent_attributes) {
+      {
+        streams: [],
+        parent:  nil,
+        colour:  parent_colour,
+        style:   parent_style,
+      }
+    }
     let(:colour)        { nil }
     let(:style)         { nil }
     let(:position)      { nil }

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

@@ -4,9 +4,15 @@ module Vedeu
 
   describe Composition do
 
-    let(:described) { Vedeu::Composition }
-    let(:instance)  { described.new(interfaces) }
-
+    let(:described)  { Vedeu::Composition }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        interfaces: interfaces,
+        colour:     colour,
+        style:      style,
+      }
+    }
     let(:interfaces) { [] }
     let(:colour)     {}
     let(:style)      {}
@@ -18,7 +24,7 @@ module Vedeu
         end
       }
 
-      it { subject.must_be_instance_of(Composition) }
+      it { subject.must_be_instance_of(described) }
     end
 
     describe '#initialize' do
@@ -26,8 +32,8 @@ module Vedeu
 
       it { subject.must_be_instance_of(described) }
       it { subject.instance_variable_get('@interfaces').must_equal(interfaces) }
-      it { subject.instance_variable_get('@colour').must_equal(colour) }
-      it { subject.instance_variable_get('@style').must_equal(style) }
+      it { subject.instance_variable_get('@colour').must_be_instance_of(Vedeu::Colour) }
+      it { subject.instance_variable_get('@style').must_be_instance_of(Vedeu::Style) }
     end
 
     describe '#inspect' do

data/test/lib/vedeu/models/view/interface_test.rb

@@ -4,13 +4,22 @@ module Vedeu
 
   describe Interface do
 
-    let(:described) { Vedeu::Interface }
-    let(:instance)  { described.new(_name, lines, parent, colour, style) }
-    let(:_name)     { 'hydrogen' }
-    let(:lines)     { [] }
-    let(:parent)    {}
-    let(:colour)    {}
-    let(:style)     {}
+    let(:described)  { Vedeu::Interface }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        name:   _name,
+        lines:  lines,
+        parent: parent,
+        colour: colour,
+        style:  style,
+      }
+    }
+    let(:_name)      { 'hydrogen' }
+    let(:lines)      { [] }
+    let(:parent)     {}
+    let(:colour)     {}
+    let(:style)      {}
 
     describe '#initialize' do
       subject { instance }
@@ -18,8 +27,8 @@ module Vedeu
       it { subject.instance_variable_get('@name').must_equal(_name) }
       it { subject.instance_variable_get('@lines').must_equal(lines) }
       it { subject.instance_variable_get('@parent').must_equal(parent) }
-      it { subject.instance_variable_get('@colour').must_equal(colour) }
-      it { subject.instance_variable_get('@style').must_equal(style) }
+      it { subject.instance_variable_get('@colour').must_be_instance_of(Vedeu::Colour) }
+      it { subject.instance_variable_get('@style').must_be_instance_of(Vedeu::Style) }
       it { subject.instance_variable_get('@border').must_equal(nil) }
       it { subject.instance_variable_get('@delay').must_equal(0.0) }
       it { subject.instance_variable_get('@geometry').must_equal(nil) }

data/test/lib/vedeu/models/view/line_test.rb

@@ -4,26 +4,34 @@ module Vedeu
 
   describe Line do
 
-    let(:described) { Vedeu::Line }
-    let(:instance)  { described.new(streams, parent, colour, style) }
+    let(:described)  { Vedeu::Line }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        streams: streams,
+        parent:  parent,
+        colour:  colour,
+        style:   style,
+      }
+    }
     let(:streams)   {
       [
-        Stream.new('Something interesting ',
-          streams_parent,
-          Colour.new({ foreground: '#ffff00' }),
-          Style.new('normal')),
-        Stream.new('on this line ',
-          streams_parent,
-          Colour.new({ foreground: '#00ff00' }),
-          Style.new('normal')),
-        Stream.new('would be cool, eh?',
-          streams_parent,
-          Colour.new({ foreground: '#0000ff' }),
-          Style.new('normal'))
+        Stream.new({ value: 'Something interesting ',
+          parent: streams_parent,
+          colour: Colour.new({ foreground: '#ffff00' }),
+          style:  Style.new('normal') }),
+        Stream.new({ value: 'on this line ',
+          parent: streams_parent,
+          colour: Colour.new({ foreground: '#00ff00' }),
+          style:  Style.new('normal') }),
+        Stream.new({ value: 'would be cool, eh?',
+          parent: streams_parent,
+          colour: Colour.new({ foreground: '#0000ff' }),
+          style:  Style.new('normal') })
       ]
     }
 
-    let(:streams_parent) { Line.new(nil, parent, colour, style) }
+    let(:streams_parent) { Line.new({ streams: nil, parent: parent, colour: colour, style: style }) }
 
     let(:parent)    { mock('Interface') }
     let(:colour)    { Colour.new({ foreground: '#ff0000', background: '#000000' }) }
@@ -37,7 +45,7 @@ module Vedeu
     describe '#initialize' do
       subject { instance }
 
-      it { subject.must_be_instance_of(Line) }
+      it { subject.must_be_instance_of(described) }
       it { subject.instance_variable_get('@streams').must_equal(streams) }
       it { subject.instance_variable_get('@parent').must_equal(parent) }
       it { subject.instance_variable_get('@colour').must_equal(colour) }

data/test/lib/vedeu/models/view/stream_test.rb

@@ -4,16 +4,24 @@ module Vedeu
 
   describe Stream do
 
-    let(:described) { Vedeu::Stream }
-    let(:instance)  { described.new(value, parent, colour, style) }
-    let(:value)     { 'Some text' }
-    let(:parent)    {
-      Line.new(
-        [],
-        line_parent,
-        Colour.new({ background: '#0000ff', foreground: '#ffff00' }),
-        Style.new('normal')
-      )
+    let(:described)  { Vedeu::Stream }
+    let(:instance)   { described.new(attributes) }
+    let(:attributes) {
+      {
+        value:  value,
+        parent: parent,
+        colour: colour,
+        style:  style
+      }
+    }
+    let(:value)      { 'Some text' }
+    let(:parent)     {
+      Line.new({
+        streams: [],
+        parent:  line_parent,
+        colour:  Colour.new({ background: '#0000ff', foreground: '#ffff00' }),
+        style:   Style.new('normal')
+      })
     }
     let(:colour)      { Colour.new({ background: '#ff0000', foreground: '#000000' }) }
     let(:style)       { Style.new('normal') }
@@ -22,7 +30,8 @@ module Vedeu
     describe '#initialize' do
       subject { instance }
 
-      it { subject.must_be_instance_of(Stream) }
+      it { subject.must_be_instance_of(described) }
+      # it { subject.instance_variable_get('@attributes').must_equal(attributes) }
       it { subject.instance_variable_get('@value').must_equal(value) }
       it { subject.instance_variable_get('@parent').must_equal(parent) }
       it { subject.instance_variable_get('@colour').must_equal(colour) }

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

@@ -48,6 +48,7 @@ module Vedeu
         {
           bottom_left:  'm',
           bottom_right: 'j',
+          client:       nil,
           colour:       {},
           enabled:      false,
           horizontal:   'q',

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

@@ -15,10 +15,10 @@ module Vedeu
     }
     let(:lines) {
       [
-        Line.new([Stream.new('this is the first')]),
-        Line.new([Stream.new('this is the second and it is long')]),
-        Line.new([Stream.new('this is the third, it is even longer and still truncated')]),
-        Line.new([Stream.new('this should not render')]),
+        Line.new({ streams: [Stream.new({ value: 'this is the first' })] }),
+        Line.new({ streams: [Stream.new({ value: 'this is the second and it is long' })] }),
+        Line.new({ streams: [Stream.new({ value: 'this is the third, it is even longer and still truncated' })] }),
+        Line.new({ streams: [Stream.new({ value: 'this should not render' })] }),
       ]
     }
 

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

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

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

@@ -23,14 +23,15 @@ module Vedeu
     end
 
     describe '#to_s' do
-      let(:line) { Line.new(
-          [],
-          mock('Interface'),
-          Colour.new({ foreground: '#00ff00', background: '#000000' }),
-          Style.new('normal')
-        )
+      let(:line) {
+        Vedeu::Line.new({
+          streams: [],
+          parent:  mock('Interface'),
+          colour:  Colour.new({ foreground: '#00ff00', background: '#000000' }),
+          style:   Style.new('normal')
+        })
       }
-      let(:stream) { Stream.new(stream_value, line, stream_colour, stream_style) }
+      let(:stream) { Stream.new({ value: stream_value, parent: line, colour: stream_colour, style: stream_style }) }
       let(:stream_value)  { 'Some text' }
       let(:stream_colour) { Colour.new({ foreground: '#ff0000', background: '#000000' }) }
       let(:stream_style)  { Style.new(:underline) }

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

@@ -4,17 +4,19 @@ module Vedeu
 
   describe Style do
 
-    let(:described) { Style }
+    let(:described) { Vedeu::Style }
+    let(:instance)  { described.new(value) }
+    let(:value)     { 'bold' }
 
     describe '#initialize' do
-      subject { described.new('bold') }
+      subject { instance }
 
       it { subject.must_be_instance_of(described) }
       it { subject.instance_variable_get('@value').must_equal('bold') }
     end
 
     describe '#attributes' do
-      subject { described.new('bold').attributes }
+      subject { instance.attributes }
 
       it { subject.must_be_instance_of(Hash) }
 
@@ -26,7 +28,7 @@ module Vedeu
     describe '#to_s' do
       let(:value) {}
 
-      subject { described.new(value).to_s }
+      subject { instance.to_s }
 
       it { subject.must_be_instance_of(String) }
       it { subject.must_equal('') }

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

@@ -5,15 +5,16 @@ module Vedeu
   describe Position do
 
     let(:described) { Vedeu::Position }
-    let(:instance)  { described.new(12, 19) }
-
+    let(:instance)  { described.new(y, x) }
+    let(:y)         { 12 }
+    let(:x)         { 19 }
 
     describe '#initialize' do
       subject { instance }
 
-      it { subject.must_be_instance_of(Position) }
-      it { subject.instance_variable_get('@y').must_equal(12) }
-      it { subject.instance_variable_get('@x').must_equal(19) }
+      it { subject.must_be_instance_of(described) }
+      it { subject.instance_variable_get('@y').must_equal(y) }
+      it { subject.instance_variable_get('@x').must_equal(x) }
     end
 
     describe '#to_s' 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.3.2'
+  spec.version       = '0.3.3'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}
@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-bundler',      '2.1.0'
   spec.add_development_dependency 'guard-cucumber',     '1.5.3'
   spec.add_development_dependency 'guard-minitest',     '2.4.3'
-  spec.add_development_dependency 'guard-yard',         '2.1.4'
   spec.add_development_dependency 'minitest',           '5.5.1'
   spec.add_development_dependency 'minitest-reporters', '1.0.10'
   spec.add_development_dependency 'mocha',              '1.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -108,20 +108,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.4.3
-- !ruby/object:Gem::Dependency
-  name: guard-yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement