vedeu 0.4.5 → 0.4.6

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

@@ -0,0 +1,108 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Collection do
+
+    let(:described)  { Collection }
+    let(:instance)   { described.new(collection, parent, model_name) }
+    let(:collection) { [] }
+    let(:model_name) { 'elements' }
+    let(:parent)     { Vedeu::ModelTestClass.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Collection) }
+      it { instance.instance_variable_get('@collection').must_equal([]) }
+      it { instance.instance_variable_get('@name').must_equal(model_name) }
+      it { instance.instance_variable_get('@parent').must_equal(parent) }
+    end
+
+    describe '#[]' do
+      let(:collection) { [:hydrogen, :helium, :lithium, :beryllium] }
+      let(:value) { 1..2 }
+
+      subject { instance[value] }
+
+      it { subject.must_be_instance_of(Array) }
+      it { subject.must_equal([:helium, :lithium]) }
+    end
+
+    describe '#add' do
+      subject { instance.add(:hydrogen) }
+
+      it { subject.must_be_instance_of(Collection) }
+      it { subject.all.must_equal([:hydrogen]) }
+
+      context 'with multiple objects' do
+        subject { instance.add(:hydrogen, :helium) }
+
+        it 'adds all the objects to the collection' do
+          subject.all.must_equal([:hydrogen, :helium])
+        end
+      end
+    end
+
+    describe '#all' do
+      subject { instance.all }
+
+      it { subject.must_be_instance_of(Array) }
+      it { subject.must_equal([]) }
+
+      context 'when the collection is not empty' do
+        before { instance.add(:hydrogen) }
+
+        it 'returns the populated collection' do
+          subject.must_equal([:hydrogen])
+        end
+      end
+    end
+
+    describe '#empty?' do
+      subject { instance.empty? }
+
+      context 'when the collection is empty' do
+        it { subject.must_be_instance_of(TrueClass) }
+      end
+
+      context 'when the collection is not empty' do
+        before { instance.add(:hydrogen) }
+
+        it { subject.must_be_instance_of(FalseClass) }
+      end
+    end
+
+    describe '#size' do
+      subject { instance.size }
+
+      it { subject.must_be_instance_of(Fixnum) }
+
+      context 'when the collection is empty' do
+        it { subject.must_equal(0) }
+      end
+
+      context 'when the collection is not empty' do
+        before { instance.add(:hydrogen) }
+
+        it { subject.must_equal(1) }
+      end
+    end
+
+    describe '#to_s' do
+      subject { instance.to_s }
+
+      it { subject.must_be_instance_of(String) }
+
+      context 'when the collection is empty' do
+        it { subject.must_equal('') }
+      end
+
+      context 'when the collection is not empty' do
+        before { instance.add(:hydrogen) }
+
+        it { subject.must_equal('hydrogen') }
+      end
+    end
+
+  end # Collection
+
+end # Vedeu

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

@@ -0,0 +1,71 @@
+require 'test_helper'
+
+module Vedeu
+
+  describe Chars do
+
+    let(:described) { Vedeu::Chars }
+    let(:instance)  { described.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Chars) }
+    end
+
+  end # Chars
+
+  describe Events do
+
+    let(:described) { Vedeu::Events }
+    let(:instance)  { described.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Events) }
+    end
+
+  end # Events
+
+  describe Interfaces do
+
+    let(:described) { Vedeu::Interfaces }
+    let(:instance)  { described.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Interfaces) }
+    end
+
+  end # Interfaces
+
+  describe Keys do
+
+    let(:described) { Vedeu::Keys }
+    let(:instance)  { described.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Keys) }
+    end
+
+  end # Keys
+
+  describe Lines do
+
+    let(:described) { Vedeu::Lines }
+    let(:instance)  { described.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Lines) }
+    end
+
+  end # Lines
+
+  describe Streams do
+
+    let(:described) { Vedeu::Streams }
+    let(:instance)  { described.new }
+
+    describe '#initialize' do
+      it { instance.must_be_instance_of(Vedeu::Streams) }
+    end
+
+  end # Streams
+
+end # Vedeu

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

@@ -12,11 +12,31 @@ module Vedeu
     describe '#initialize' do
       it { instance.must_be_instance_of(Vedeu::Template) }
       it { instance.instance_variable_get('@object').must_equal(object) }
-      it { instance.instance_variable_get('@path').must_equal(path) }
+      it { instance.instance_variable_get('@path').must_equal('') }
     end
 
     describe '.parse' do
       subject { described.parse(object, path) }
+
+      before { File.stubs(:read).returns('') }
+
+      context 'when the path is empty' do
+        it { proc { subject }.must_raise(MissingRequired) }
+      end
+
+      context 'when the path is does not exist' do
+        let(:path) { '/tmp/vedeu_does_not_exist' }
+
+        it { proc { subject }.must_raise(MissingRequired) }
+      end
+
+      context 'when the path exists' do
+        let(:path) { '/tmp/vedeu_does_exist' }
+
+        before { File.stubs(:exist?).returns(true) }
+
+        it { subject.must_equal('') }
+      end
     end
 
   end # Template

data/test/support/helpers/model_test_class.rb

@@ -1,4 +1,4 @@
-require 'vedeu/models/model'
+require 'vedeu/repositories/model'
 require 'vedeu/output/presentation'
 
 module Vedeu

data/test/test_helper.rb

@@ -18,7 +18,6 @@ SimpleCov.start do
   add_group  'dsl',           'vedeu/dsl'
   add_group  'events',        'vedeu/events'
   add_group  'input',         'vedeu/input'
-  add_group  'models/view',   'vedeu/models/view'
   add_group  'models',        'vedeu/models'
   add_group  'output',        'vedeu/output'
   add_group  'presentation',  'vedeu/presentation'

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.4.5'
+  spec.version       = '0.4.6'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -301,6 +301,8 @@ files:
 - examples/geometry_app.rb
 - examples/hello_world.rb
 - examples/lines_app.rb
+- examples/view_templates_app/template.erb
+- examples/view_templates_app/view_templates_app.rb
 - features/start_stop.feature
 - features/support/env.rb
 - inch.yml
@@ -355,7 +357,6 @@ files:
 - lib/vedeu/dsl/view.rb
 - lib/vedeu/events/all.rb
 - lib/vedeu/events/event.rb
-- lib/vedeu/events/events.rb
 - lib/vedeu/events/trigger.rb
 - lib/vedeu/exceptions.rb
 - lib/vedeu/geometry/all.rb
@@ -363,46 +364,40 @@ files:
 - lib/vedeu/geometry/content_geometry.rb
 - lib/vedeu/geometry/coordinate.rb
 - lib/vedeu/geometry/grid.rb
+- lib/vedeu/geometry/index_position.rb
 - lib/vedeu/geometry/limit.rb
 - lib/vedeu/geometry/position.rb
+- lib/vedeu/geometry/position_index.rb
 - lib/vedeu/geometry/position_validator.rb
 - lib/vedeu/input/all.rb
 - lib/vedeu/input/input.rb
 - lib/vedeu/input/key.rb
 - lib/vedeu/input/keymap.rb
-- lib/vedeu/input/keys.rb
 - lib/vedeu/input/mapper.rb
 - lib/vedeu/launcher.rb
 - lib/vedeu/main_loop.rb
 - lib/vedeu/models/all.rb
-- lib/vedeu/models/collection.rb
+- lib/vedeu/models/char.rb
+- lib/vedeu/models/composition.rb
 - lib/vedeu/models/focus.rb
 - lib/vedeu/models/geometry.rb
 - lib/vedeu/models/group.rb
+- lib/vedeu/models/interface.rb
+- lib/vedeu/models/line.rb
 - lib/vedeu/models/menu.rb
-- lib/vedeu/models/model.rb
-- lib/vedeu/models/view/all.rb
-- lib/vedeu/models/view/char.rb
-- lib/vedeu/models/view/chars.rb
-- lib/vedeu/models/view/composition.rb
-- lib/vedeu/models/view/interface.rb
-- lib/vedeu/models/view/interfaces.rb
-- lib/vedeu/models/view/line.rb
-- lib/vedeu/models/view/lines.rb
-- lib/vedeu/models/view/stream.rb
-- lib/vedeu/models/view/streams.rb
+- lib/vedeu/models/stream.rb
 - lib/vedeu/output/all.rb
 - lib/vedeu/output/background.rb
 - lib/vedeu/output/border.rb
+- lib/vedeu/output/char_builder.rb
+- lib/vedeu/output/clear.rb
 - lib/vedeu/output/colour.rb
 - lib/vedeu/output/compositor.rb
 - lib/vedeu/output/esc.rb
 - lib/vedeu/output/foreground.rb
 - lib/vedeu/output/html_char.rb
 - lib/vedeu/output/html_renderer.rb
-- lib/vedeu/output/index_position.rb
 - lib/vedeu/output/output.rb
-- lib/vedeu/output/position_index.rb
 - lib/vedeu/output/presentation.rb
 - lib/vedeu/output/refresh.rb
 - lib/vedeu/output/renderer.rb
@@ -415,6 +410,9 @@ files:
 - lib/vedeu/output/virtual_terminal.rb
 - lib/vedeu/output/wordwrap.rb
 - lib/vedeu/repositories/all.rb
+- lib/vedeu/repositories/collection.rb
+- lib/vedeu/repositories/collections.rb
+- lib/vedeu/repositories/model.rb
 - lib/vedeu/repositories/repository.rb
 - lib/vedeu/support/all.rb
 - lib/vedeu/support/coercions.rb
@@ -463,7 +461,9 @@ files:
 - test/lib/vedeu/geometry/content_geometry_test.rb
 - test/lib/vedeu/geometry/coordinate_test.rb
 - test/lib/vedeu/geometry/grid_test.rb
+- test/lib/vedeu/geometry/index_position_test.rb
 - test/lib/vedeu/geometry/limit_test.rb
+- test/lib/vedeu/geometry/position_index_test.rb
 - test/lib/vedeu/geometry/position_test.rb
 - test/lib/vedeu/geometry/position_validator_test.rb
 - test/lib/vedeu/input/input_test.rb
@@ -472,32 +472,26 @@ files:
 - test/lib/vedeu/input/mapper_test.rb
 - test/lib/vedeu/launcher_test.rb
 - test/lib/vedeu/main_loop_test.rb
-- test/lib/vedeu/models/collection_test.rb
+- test/lib/vedeu/models/char_test.rb
+- test/lib/vedeu/models/composition_test.rb
 - test/lib/vedeu/models/focus_test.rb
 - test/lib/vedeu/models/geometry_test.rb
 - test/lib/vedeu/models/group_test.rb
+- test/lib/vedeu/models/interface_test.rb
+- test/lib/vedeu/models/line_test.rb
 - test/lib/vedeu/models/menu_test.rb
-- test/lib/vedeu/models/model_test.rb
-- test/lib/vedeu/models/view/char_test.rb
-- test/lib/vedeu/models/view/chars_test.rb
-- test/lib/vedeu/models/view/composition_test.rb
-- test/lib/vedeu/models/view/interface_test.rb
-- test/lib/vedeu/models/view/interfaces_test.rb
-- test/lib/vedeu/models/view/line_test.rb
-- test/lib/vedeu/models/view/lines_test.rb
-- test/lib/vedeu/models/view/stream_test.rb
-- test/lib/vedeu/models/view/streams_test.rb
+- test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/output/background_test.rb
 - test/lib/vedeu/output/border_test.rb
+- test/lib/vedeu/output/char_builder_test.rb
+- test/lib/vedeu/output/clear_test.rb
 - test/lib/vedeu/output/colour_test.rb
 - test/lib/vedeu/output/compositor_test.rb
 - test/lib/vedeu/output/esc_test.rb
 - test/lib/vedeu/output/foreground_test.rb
 - test/lib/vedeu/output/html_char_test.rb
 - test/lib/vedeu/output/html_renderer_test.rb
-- test/lib/vedeu/output/index_position_test.rb
 - test/lib/vedeu/output/output_test.rb
-- test/lib/vedeu/output/position_index_test.rb
 - test/lib/vedeu/output/presentation_test.rb
 - test/lib/vedeu/output/refresh_test.rb
 - test/lib/vedeu/output/renderer_test.rb
@@ -509,6 +503,9 @@ files:
 - test/lib/vedeu/output/virtual_terminal_test.rb
 - test/lib/vedeu/output/wordwrap_test.rb
 - test/lib/vedeu/repositories/all_test.rb
+- test/lib/vedeu/repositories/collection_test.rb
+- test/lib/vedeu/repositories/collections_test.rb
+- test/lib/vedeu/repositories/model_test.rb
 - test/lib/vedeu/repositories/repository_test.rb
 - test/lib/vedeu/support/coercions_test.rb
 - test/lib/vedeu/support/common_test.rb
@@ -593,7 +590,9 @@ test_files:
 - test/lib/vedeu/geometry/content_geometry_test.rb
 - test/lib/vedeu/geometry/coordinate_test.rb
 - test/lib/vedeu/geometry/grid_test.rb
+- test/lib/vedeu/geometry/index_position_test.rb
 - test/lib/vedeu/geometry/limit_test.rb
+- test/lib/vedeu/geometry/position_index_test.rb
 - test/lib/vedeu/geometry/position_test.rb
 - test/lib/vedeu/geometry/position_validator_test.rb
 - test/lib/vedeu/input/input_test.rb
@@ -602,32 +601,26 @@ test_files:
 - test/lib/vedeu/input/mapper_test.rb
 - test/lib/vedeu/launcher_test.rb
 - test/lib/vedeu/main_loop_test.rb
-- test/lib/vedeu/models/collection_test.rb
+- test/lib/vedeu/models/char_test.rb
+- test/lib/vedeu/models/composition_test.rb
 - test/lib/vedeu/models/focus_test.rb
 - test/lib/vedeu/models/geometry_test.rb
 - test/lib/vedeu/models/group_test.rb
+- test/lib/vedeu/models/interface_test.rb
+- test/lib/vedeu/models/line_test.rb
 - test/lib/vedeu/models/menu_test.rb
-- test/lib/vedeu/models/model_test.rb
-- test/lib/vedeu/models/view/char_test.rb
-- test/lib/vedeu/models/view/chars_test.rb
-- test/lib/vedeu/models/view/composition_test.rb
-- test/lib/vedeu/models/view/interface_test.rb
-- test/lib/vedeu/models/view/interfaces_test.rb
-- test/lib/vedeu/models/view/line_test.rb
-- test/lib/vedeu/models/view/lines_test.rb
-- test/lib/vedeu/models/view/stream_test.rb
-- test/lib/vedeu/models/view/streams_test.rb
+- test/lib/vedeu/models/stream_test.rb
 - test/lib/vedeu/output/background_test.rb
 - test/lib/vedeu/output/border_test.rb
+- test/lib/vedeu/output/char_builder_test.rb
+- test/lib/vedeu/output/clear_test.rb
 - test/lib/vedeu/output/colour_test.rb
 - test/lib/vedeu/output/compositor_test.rb
 - test/lib/vedeu/output/esc_test.rb
 - test/lib/vedeu/output/foreground_test.rb
 - test/lib/vedeu/output/html_char_test.rb
 - test/lib/vedeu/output/html_renderer_test.rb
-- test/lib/vedeu/output/index_position_test.rb
 - test/lib/vedeu/output/output_test.rb
-- test/lib/vedeu/output/position_index_test.rb
 - test/lib/vedeu/output/presentation_test.rb
 - test/lib/vedeu/output/refresh_test.rb
 - test/lib/vedeu/output/renderer_test.rb
@@ -639,6 +632,9 @@ test_files:
 - test/lib/vedeu/output/virtual_terminal_test.rb
 - test/lib/vedeu/output/wordwrap_test.rb
 - test/lib/vedeu/repositories/all_test.rb
+- test/lib/vedeu/repositories/collection_test.rb
+- test/lib/vedeu/repositories/collections_test.rb
+- test/lib/vedeu/repositories/model_test.rb
 - test/lib/vedeu/repositories/repository_test.rb
 - test/lib/vedeu/support/coercions_test.rb
 - test/lib/vedeu/support/common_test.rb

data/lib/vedeu/events/events.rb

@@ -1,10 +0,0 @@
-require 'vedeu/models/collection'
-
-module Vedeu
-
-  # A collection of {Vedeu::Event} instances.
-  #
-  class Events < Vedeu::Model::Collection
-  end # Events
-
-end # Vedeu

data/lib/vedeu/input/keys.rb

@@ -1,10 +0,0 @@
-require 'vedeu/models/collection'
-
-module Vedeu
-
-  # A collection of {Vedeu::Key} instances.
-  #
-  class Keys < Vedeu::Model::Collection
-  end # Keys
-
-end # Vedeu

data/lib/vedeu/models/collection.rb

@@ -1,81 +0,0 @@
-module Vedeu
-
-  module Model
-
-    # Convert an Array into an object which has some meaning in the context it
-    # is being used.
-    #
-    class Collection
-
-      include Enumerable
-
-      attr_accessor :parent, :name
-
-      # @param collection [Array|Vedeu::Model::Collection]
-      # @param parent []
-      # @param name [String|NilClass]
-      # @return [Vedeu::Model::Collection]
-      def self.coerce(collection = [], parent = nil, name = nil)
-        if collection.kind_of?(Vedeu::Model::Collection)
-          collection
-
-        else
-          new(Array(collection), parent, name)
-
-        end
-      end
-
-      # @param collection []
-      # @param parent []
-      # @param name []
-      # @return [Vedeu::Model::Collection]
-      def initialize(collection = [], parent = nil, name = nil)
-        @collection = collection
-        @parent     = parent
-        @name       = name
-      end
-
-      # @param value [Fixnum]
-      # @return [void]
-      def [](value)
-        @collection[value]
-      end
-
-      # @param other [Vedeu::Model::Collection]
-      # @return [Vedeu::Model::Collection]
-      def add(*other)
-        self.class.new(@collection += other, parent, name)
-      end
-      alias_method :<<, :add
-
-      # @return [Array]
-      def all
-        @collection
-      end
-
-      # @param block [Proc]
-      # @return [Enumerator]
-      def each(&block)
-        @collection.each(&block)
-      end
-
-      # @return [Boolean]
-      def empty?
-        @collection.empty?
-      end
-
-      # @return [Fixnum]
-      def size
-        @collection.size
-      end
-
-      # @return [String]
-      def to_s
-        @collection.map(&:to_s).join
-      end
-
-    end # Collection
-
-  end # Model
-
-end # Vedeu

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

@@ -1,12 +0,0 @@
-require 'vedeu/models/view/chars'
-require 'vedeu/models/view/char'
-require 'vedeu/models/view/composition'
-require 'vedeu/models/view/interfaces'
-require 'vedeu/models/view/interface'
-require 'vedeu/models/view/lines'
-require 'vedeu/models/view/line'
-require 'vedeu/models/view/streams'
-require 'vedeu/models/view/stream'
-
-module Vedeu
-end # Vedeu

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

@@ -1,99 +0,0 @@
-require 'vedeu/output/html_char'
-require 'vedeu/output/presentation'
-
-module Vedeu
-
-  # A Char represents a single character of the terminal. It is a container for
-  # the a single character in a {Vedeu::Stream}.
-  #
-  # Though a multi-character String can be passed as a value, only the first
-  # character is returned in the escape sequence.
-  #
-  class Char
-
-    include Vedeu::Presentation
-
-    attr_accessor :border,
-      :parent
-
-    attr_reader :value
-
-    # Returns a new instance of Char.
-    #
-    # @param attributes [Hash]
-    # @option attributes value    [String]
-    # @option attributes parent   [Line]
-    # @option attributes colour   [Colour]
-    # @option attributes style    [Style]
-    # @option attributes position [Position]
-    # @option attributes border   [Boolean]
-    # @return [Char]
-    def initialize(attributes = {})
-      @attributes = defaults.merge!(attributes)
-
-      @border   = @attributes[:border]
-      @colour   = @attributes[:colour]
-      @parent   = @attributes[:parent]
-      @style    = @attributes[:style]
-      @value    = @attributes[:value]
-    end
-
-    # @param other []
-    # @return [Boolean]
-    def ==(other)
-      eql?(other)
-    end
-
-    # @param other []
-    # @return [Boolean]
-    def eql?(other)
-      self.class == other.class && value == other.value
-    end
-
-    # @return [Vedeu::Position]
-    def position
-      @position ||= Vedeu::Position.coerce(attributes[:position])
-    end
-
-    # @param value [Vedeu::Position]
-    # @return [Vedeu::Position]
-    def position=(value)
-      @position = Vedeu::Position.coerce(value)
-    end
-
-    # @return [Fixnum|NilClass]
-    def x
-      position.x if position
-    end
-
-    # @return [Fixnum|NilClass]
-    def y
-      position.y if position
-    end
-
-    # @return [String]
-    def to_html
-      @to_html ||= HTMLChar.render(self)
-    end
-
-    private
-
-    attr_reader :attributes
-
-    # The default values for a new instance of this class.
-    #
-    # @return [Hash]
-    def defaults
-      {
-        border:   nil,
-        colour:   nil,
-        parent:   nil,
-        position: nil,
-        style:    nil,
-        value:    '',
-      }
-    end
-
-  end # Char
-
-end # Vedeu

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

@@ -1,10 +0,0 @@
-require 'vedeu/models/collection'
-
-module Vedeu
-
-  # A collection of {Vedeu::Char} instances.
-  #
-  class Chars < Vedeu::Model::Collection
-  end # Chars
-
-end # Vedeu