vedeu 0.1.10 → 0.1.12

data/test/lib/vedeu/api/view_test.rb

@@ -5,7 +5,7 @@ module Vedeu
     describe View do
       before do
         Store.reset
-        Interface.save('testing_view') do
+        Interface.create('testing_view') do
           x      1
           y      1
           colour  foreground: '#ffffff', background: '#000000'

data/test/lib/vedeu/models/attributes/{collection_test.rb → attributes_test.rb}

@@ -2,36 +2,36 @@ require 'test_helper'
 
 module Vedeu
   class TestClass
-    include Collection
+    include Attributes
 
     def initialize(*args); end
   end
 
-  describe Collection do
+  describe Attributes do
     describe '#coercer' do
       it 'returns an empty collection when nil or empty' do
         [nil, '', [], {}].each do |empty_value|
-          Collection.coercer(empty_value, TestClass, :key).must_equal([])
+          Attributes.coercer(empty_value, TestClass, :key).must_equal([])
         end
       end
 
       it 'returns a single model in a collection when a String' do
-        Collection.coercer('test', TestClass, :key).size.must_equal(1)
+        Attributes.coercer('test', TestClass, :key).size.must_equal(1)
       end
 
       it 'returns a collection of models when a single hash' do
-        Collection.coercer({ :test1 => 'test1' }, TestClass, :key)
+        Attributes.coercer({ :test1 => 'test1' }, TestClass, :key)
           .size.must_equal(1)
       end
 
       it 'returns a collection of models when multiple hashes' do
-        Collection.coercer([
+        Attributes.coercer([
           { :test1 => 'test1' }, { :test2 => 'test2' }
         ], TestClass, :key).size.must_equal(2)
       end
 
       it 'returns a collection of models when a single array' do
-        Collection.coercer([{ :test3 => 'test3' }], TestClass, :key)
+        Attributes.coercer([{ :test3 => 'test3' }], TestClass, :key)
           .size.must_equal(1)
       end
     end

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

@@ -161,70 +161,5 @@ module Vedeu
         geometry.east.must_equal(26)
       end
     end
-
-    describe '#position' do
-      it 'centred is true' do
-        console = IO.console
-        console.stub :winsize, [25, 80] do
-          geometry = Geometry.new({ height: 6, width: 18, centred: true })
-          geometry.position.must_equal({
-            y:       9,
-            x:       31,
-            height:  6,
-            width:   18,
-            centred: true,
-            top:     9,
-            bottom:  15,
-            left:    31,
-            right:   49,
-          })
-        end
-      end
-
-      it 'centred is false and x is set' do
-        geometry = Geometry.new({ height: 6, width: 18, x: 7 })
-        geometry.position.must_equal({
-          y:       1,
-          x:       7,
-          height:  6,
-          width:   18,
-          centred: false,
-          top:     1,
-          bottom:  7,
-          left:    7,
-          right:   25,
-        })
-      end
-
-      it 'centred is false and y is set' do
-        geometry = Geometry.new({ height: 6, width: 18, y: 5 })
-        geometry.position.must_equal({
-          y:       5,
-          x:       1,
-          height:  6,
-          width:   18,
-          centred: false,
-          top:     5,
-          bottom:  11,
-          left:    1,
-          right:   19,
-        })
-      end
-
-      it 'centred is false' do
-        geometry = Geometry.new({ height: 6, width: 18 })
-        geometry.position.must_equal({
-          y:       1,
-          x:       1,
-          height:  6,
-          width:   18,
-          centred: false,
-          top:     1,
-          bottom:  7,
-          left:    1,
-          right:   19,
-        })
-      end
-    end
   end
 end

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

@@ -13,12 +13,37 @@ module Vedeu
       })
     }
 
-    it 'has a colour attribute' do
-      line.colour.must_be_instance_of(Colour)
+    describe '#attributes' do
+      it 'returns the attributes' do
+        line.attributes.must_equal(
+          {
+            colour: {
+              foreground: '#ff0000',
+              background: '#000000'
+            },
+            streams: [],
+            style: 'normal'
+          }
+        )
+      end
+    end
+
+    describe '#colour' do
+      it 'has a colour attribute' do
+        line.colour.must_be_instance_of(Colour)
+      end
     end
 
-    it 'has a streams attribute' do
-      line.streams.must_equal([])
+    describe '#streams' do
+      it 'has a streams attribute' do
+        line.streams.must_equal([])
+      end
+    end
+
+    describe '#style' do
+      it 'has a style attribute' do
+        line.style.must_equal("\e[24m\e[21m\e[27m")
+      end
     end
 
     describe '#to_s' do

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

@@ -9,32 +9,77 @@ module Vedeu
           background: '#000000'
         },
         text:  'Some text',
-        style: 'normal',
+        style: style,
         width: width,
         align: align
       })
     }
+    let(:style) { 'normal' }
     let(:align) { :left }
     let(:width) { 9 }
 
-    it 'has a colour attribute' do
-      stream.colour.must_be_instance_of(Colour)
+    describe '#colour' do
+      it 'has a colour attribute' do
+        stream.colour.must_be_instance_of(Colour)
+      end
     end
 
-    it 'has a text attribute' do
-      stream.text.must_equal('Some text')
+    describe '#text' do
+      it 'has a text attribute' do
+        stream.text.must_equal('Some text')
+      end
     end
 
-    it 'has a style attribute' do
-      stream.style.must_equal("\e[24m\e[21m\e[27m")
+    describe '#style' do
+      it 'has a style attribute' do
+        stream.style.must_equal("\e[24m\e[21m\e[27m")
+      end
     end
 
-    it 'has a width attribute' do
-      stream.width.must_equal(9)
+    describe '#width' do
+      it 'has a width attribute' do
+        stream.width.must_equal(9)
+      end
     end
 
-    it 'has an align attribute' do
-      stream.align.must_equal(:left)
+    describe '#align' do
+      it 'has an align attribute' do
+        stream.align.must_equal(:left)
+      end
+    end
+
+    describe '#style' do
+      describe 'for a single style' do
+        let(:style) { 'normal' }
+
+        it 'returns an escape sequence' do
+          stream.style.must_equal("\e[24m\e[21m\e[27m")
+        end
+      end
+
+      describe 'for multiple styles' do
+        let(:style) { ['normal', 'underline'] }
+
+        it 'returns an escape sequence for multiple styles' do
+          stream.style.must_equal("\e[24m\e[21m\e[27m\e[4m")
+        end
+      end
+
+      describe 'for an unknown style' do
+        let(:style) { 'unknown' }
+
+        it 'returns an empty string for an unknown style' do
+          stream.style.must_equal('')
+        end
+      end
+
+      describe 'for an empty or nil' do
+        let(:style) { '' }
+
+        it 'returns an empty string for empty or nil' do
+          stream.style.must_equal('')
+        end
+      end
     end
 
     describe '#to_s' do

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

@@ -47,6 +47,7 @@ module Vedeu
           },
           lines:    []
         })
+
         Render.call(interface).must_equal(
           "\e[1;1H                                \e[1;1H" \
           "\e[2;1H                                \e[2;1H" \

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.10'
+  spec.version       = '0.1.12'
   spec.authors       = ['Gavin Laking']
   spec.email         = ['gavinlaking@gmail.com']
   spec.summary       = %q{A terminal case of wonderland.}
@@ -26,6 +26,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry',                '0.10.0'
   spec.add_development_dependency 'rake',               '10.3.2'
   spec.add_development_dependency 'simplecov',          '0.9.0'
-
-  spec.add_dependency 'virtus', '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,20 +150,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: virtus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
 description: 
 email:
 - gavinlaking@gmail.com
@@ -185,9 +171,9 @@ files:
 - bin/vedeu
 - lib/vedeu.rb
 - lib/vedeu/api/api.rb
-- lib/vedeu/api/base.rb
 - lib/vedeu/api/events.rb
 - lib/vedeu/api/grid.rb
+- lib/vedeu/api/helpers.rb
 - lib/vedeu/api/interface.rb
 - lib/vedeu/api/line.rb
 - lib/vedeu/api/log.rb
@@ -197,20 +183,14 @@ files:
 - lib/vedeu/application.rb
 - lib/vedeu/configuration.rb
 - lib/vedeu/launcher.rb
-- lib/vedeu/models/attributes/background.rb
-- lib/vedeu/models/attributes/collection.rb
+- lib/vedeu/models/attributes/attributes.rb
 - lib/vedeu/models/attributes/colour_translator.rb
-- lib/vedeu/models/attributes/foreground.rb
-- lib/vedeu/models/attributes/interface_collection.rb
-- lib/vedeu/models/attributes/line_collection.rb
-- 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/buffers.rb
 - lib/vedeu/output/clear.rb
 - lib/vedeu/output/render.rb
@@ -226,18 +206,14 @@ files:
 - test/lib/vedeu/api/store_test.rb
 - test/lib/vedeu/api/view_test.rb
 - test/lib/vedeu/configuration_test.rb
-- test/lib/vedeu/models/attributes/collection_test.rb
+- test/lib/vedeu/models/attributes/attributes_test.rb
 - test/lib/vedeu/models/attributes/colour_translator_test.rb
-- test/lib/vedeu/models/attributes/interface_collection_test.rb
-- test/lib/vedeu/models/attributes/line_collection_test.rb
-- 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/buffers_test.rb
 - test/lib/vedeu/output/clear_test.rb
 - test/lib/vedeu/output/render_test.rb
@@ -246,8 +222,6 @@ files:
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/stats.sh
-- test/support/bench.rb
-- test/support/colours.rb
 - test/support/model_test_data.json
 - test/test_helper.rb
 - vedeu.gemspec
@@ -282,18 +256,14 @@ test_files:
 - test/lib/vedeu/api/store_test.rb
 - test/lib/vedeu/api/view_test.rb
 - test/lib/vedeu/configuration_test.rb
-- test/lib/vedeu/models/attributes/collection_test.rb
+- test/lib/vedeu/models/attributes/attributes_test.rb
 - test/lib/vedeu/models/attributes/colour_translator_test.rb
-- test/lib/vedeu/models/attributes/interface_collection_test.rb
-- test/lib/vedeu/models/attributes/line_collection_test.rb
-- 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/buffers_test.rb
 - test/lib/vedeu/output/clear_test.rb
 - test/lib/vedeu/output/render_test.rb
@@ -302,7 +272,5 @@ test_files:
 - test/lib/vedeu/support/menu_test.rb
 - test/lib/vedeu/support/terminal_test.rb
 - test/stats.sh
-- test/support/bench.rb
-- test/support/colours.rb
 - test/support/model_test_data.json
 - test/test_helper.rb

data/lib/vedeu/models/attributes/background.rb

@@ -1,7 +0,0 @@
-module Vedeu
-  class Background < Virtus::Attribute
-    def coerce(value)
-      ColourTranslator.new(value).background
-    end
-  end
-end

data/lib/vedeu/models/attributes/collection.rb

@@ -1,11 +0,0 @@
-module Vedeu
-  module Collection
-    extend self
-
-    def coercer(value, model, key)
-      return [] if value.nil? || value.empty?
-
-      [value].flatten.map { |v| model.new(v) }
-    end
-  end
-end

data/lib/vedeu/models/attributes/foreground.rb

@@ -1,7 +0,0 @@
-module Vedeu
-  class Foreground < Virtus::Attribute
-    def coerce(value)
-      ColourTranslator.new(value).foreground
-    end
-  end
-end

data/lib/vedeu/models/attributes/interface_collection.rb

@@ -1,13 +0,0 @@
-module Vedeu
-  class InterfaceCollection < Virtus::Attribute
-    def coerce(values)
-      return [] if values.nil? || values.empty?
-
-      [values].flatten.map do |view_attributes|
-        stored_attributes = API::Store.query(view_attributes[:name])
-
-        Interface.new(stored_attributes.merge!(view_attributes))
-      end
-    end
-  end
-end