vedeu 0.4.41 → 0.4.42

data/lib/vedeu/output/translator.rb

@@ -34,10 +34,7 @@ module Vedeu
     # @param value [Object|NilClass]
     # @return [Object]
     def self.coerce(value)
-      if value.nil?
-        ''
-
-      elsif value.is_a?(self)
+      if value.is_a?(self)
         value
 
       else
@@ -51,7 +48,7 @@ module Vedeu
     # @param colour [Fixnum|String|Symbol]
     # @return [Translator]
     def initialize(colour = '')
-      @colour = colour
+      @colour = colour || ''
     end
 
     # An object is equal when its values are the same.

data/lib/vedeu/repositories/model.rb

@@ -1,3 +1,5 @@
+require 'vedeu/support/common'
+
 module Vedeu
 
   # When included into a class, provides the mechanism to store the class in a
@@ -6,6 +8,8 @@ module Vedeu
   # @api private
   module Model
 
+    include Vedeu::Common
+
     # @!attribute [rw] repository
     # @return [Vedeu::Repository]
     attr_accessor :repository
@@ -95,19 +99,6 @@ module Vedeu
 
     private
 
-    # Removes the module part from the expression in the string.
-    #
-    # @example
-    #   demodulize('Vedeu::DSL::Interface') # => "Interface"
-    #
-    # @param klass [Class|String]
-    # @return [void]
-    def demodulize(klass)
-      klass = klass.to_s
-
-      klass[(klass.rindex('::') + 2)..-1]
-    end
-
     # Returns the DSL class name responsible for this model.
     #
     # @return [String]

data/lib/vedeu/support/common.rb

@@ -5,6 +5,36 @@ module Vedeu
   # @api private
   module Common
 
+    # Removes the module part from the expression in the string.
+    #
+    # @example
+    #   demodulize('Vedeu::DSL::Interface') # => "Interface"
+    #
+    # @param klass [Class|String]
+    # @return [void]
+    def demodulize(klass)
+      klass = klass.to_s
+
+      klass[(klass.rindex('::') + 2)..-1]
+    end
+
+    # Converts a class name to a lowercase snake case string.
+    #
+    # @example
+    #   snake_case(MyClassName) # => "my_class_name"
+    #   snake_case(NameSpaced::ClassName) # => "name_spaced/class_name"
+    #
+    # @param name [String]
+    # @return [String]
+    def snake_case(name)
+      name.gsub!(/::/, '/')
+      name.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+      name.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      name.tr!('-', '_')
+      name.downcase!
+      name
+    end
+
     # Returns a boolean indicating whether a variable has a useful value.
     #
     # @param variable [String|Symbol|Array|Fixnum] The variable to check.

data/lib/vedeu/version.rb

@@ -1,6 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.4.41'
+  VERSION = '0.4.42'
 
 end

data/lib/vedeu.rb

@@ -15,6 +15,8 @@ require 'singleton'
 require 'thread'
 require 'time'
 
+require 'thor'
+
 require 'vedeu/support/log'
 
 # Vedeu is a GUI framework for terminal/console applications written in Ruby.

data/test/lib/vedeu/application/application_view_test.rb

@@ -9,10 +9,8 @@ module Vedeu
     let(:object)    {}
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(Vedeu::ApplicationView) }
-      it { subject.instance_variable_get('@object').must_equal(object) }
+      it { instance.must_be_instance_of(Vedeu::ApplicationView) }
+      it { instance.instance_variable_get('@object').must_equal(object) }
     end
 
     describe '.render' do

data/test/lib/vedeu/application/controller_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Vedeu
+
+  class ControllerTestClass
+
+    include Vedeu::Controller
+
+  end # ControllerTestClass
+
+  describe Controller do
+
+    let(:described) { Vedeu::ControllerTestClass }
+    let(:instance)  { described.new }
+
+    context 'ClassMethods' do
+
+    end
+
+    context 'InstanceMethods' do
+
+    end
+
+  end # Controller
+
+end # Vedeu

data/test/lib/vedeu/application/helper_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Vedeu
+
+  class HelperTestClass
+
+    include Vedeu::Helper
+
+  end # HelperTestClass
+
+  describe Helper do
+
+    let(:described) { Vedeu::HelperTestClass }
+    let(:instance)  { described.new }
+
+    context 'ClassMethods' do
+
+    end
+
+    context 'InstanceMethods' do
+
+    end
+
+  end # Helper
+
+end # Vedeu

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

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Vedeu
+
+  class ViewTestClass
+
+    include Vedeu::View
+
+  end # ViewTestClass
+
+  describe View do
+
+    let(:described) { Vedeu::ViewTestClass }
+    let(:instance)  { described.new }
+
+    context 'ClassMethods' do
+
+    end
+
+    context 'InstanceMethods' do
+
+    end
+
+  end # View
+
+end # Vedeu

data/test/lib/vedeu/application_test.rb

@@ -14,11 +14,9 @@ module Vedeu
     end
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
+      it { instance.must_be_instance_of(described) }
       it do
-        subject.instance_variable_get('@configuration').
+        instance.instance_variable_get('@configuration').
           must_equal(configuration)
       end
     end

data/test/lib/vedeu/bootstrap_test.rb

@@ -10,12 +10,10 @@ module Vedeu
     let(:entry_point) {}
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
-      it { subject.instance_variable_get('@argv').must_equal(argv) }
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@argv').must_equal(argv) }
       it do
-        subject.instance_variable_get('@entry_point').must_equal(entry_point)
+        instance.instance_variable_get('@entry_point').must_equal(entry_point)
       end
     end
 

data/test/lib/vedeu/{generator → cli/generator}/helpers_test.rb

@@ -26,14 +26,6 @@ module Vedeu
         # it { subject.must_equal('MyFirstApp') }
       end
 
-      describe '#app_name_as_snake_case' do
-        let(:_name) { 'MyFirstApp' }
-
-        subject { instance.app_name_as_snake_case(_name) }
-
-        it { subject.must_equal('my_first_app') }
-      end
-
       describe '#make_directory' do
         let(:destination) {}
 
@@ -119,7 +111,7 @@ module Vedeu
 
         it { subject.must_be_instance_of(String) }
 
-        it { subject.must_match('vedeu/generator/templates/application/.') }
+        it { subject.must_match('vedeu/cli/generator/templates/application/.') }
       end
 
     end # Helpers

data/test/lib/vedeu/cli/main_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+module Vedeu
+
+  module CLI
+
+    describe Main do
+    end # Main
+
+  end # CLI
+
+end # Vedeu

data/test/lib/vedeu/cursor/reposition_test.rb

@@ -19,8 +19,6 @@ module Vedeu
     after { Vedeu.cursors.reset }
 
     describe '#initialize' do
-      subject { instance }
-
       it { instance.must_be_instance_of(Vedeu::Reposition) }
       it { instance.instance_variable_get('@entity').must_equal(entity) }
       it { instance.instance_variable_get('@name').must_equal(_name) }

data/test/lib/vedeu/distributed/subprocess_test.rb

@@ -9,13 +9,11 @@ module Vedeu
     let(:application) {}
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
+      it { instance.must_be_instance_of(described) }
       it do
-        subject.instance_variable_get('@application').must_equal(application)
+        instance.instance_variable_get('@application').must_equal(application)
       end
-      it { subject.instance_variable_get('@pid').must_equal(nil) }
+      it { instance.instance_variable_get('@pid').must_equal(nil) }
     end
 
     describe '.execute!' do

data/test/lib/vedeu/distributed/uri_test.rb

@@ -12,11 +12,9 @@ module Vedeu
       let(:port)      {}
 
       describe '#initialize' do
-        subject { instance }
-
-        it { subject.must_be_instance_of(described) }
-        it { subject.instance_variable_get('@host').must_equal('localhost') }
-        it { subject.instance_variable_get('@port').must_equal(21_420) }
+        it { instance.must_be_instance_of(described) }
+        it { instance.instance_variable_get('@host').must_equal('localhost') }
+        it { instance.instance_variable_get('@port').must_equal(21_420) }
       end
 
       describe '#host' do

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

@@ -13,23 +13,6 @@ module Vedeu
       let(:attributes) { { name: 'borders' } }
       let(:boolean)    { true }
 
-      before do
-        Vedeu.interface 'borders' do
-          geometry do
-            height 3
-            width  3
-          end
-          lines do
-            line ''
-          end
-        end
-      end
-      after do
-        Vedeu.borders.reset
-        Vedeu.buffers.reset
-        Vedeu.interfaces.reset
-      end
-
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
         it { instance.instance_variable_get('@model').must_equal(model) }

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

@@ -37,14 +37,6 @@ module Vedeu
         let(:filename) {}
         let(:object)   {}
         let(:content)  { "Hydrogen\nCarbon\nOxygen\nNitrogen" }
-        let(:as_lines) {
-          [
-            Vedeu::Line.new(streams: [Vedeu::Stream.new(value: 'Hydrogen')]),
-            Vedeu::Line.new(streams: [Vedeu::Stream.new(value: 'Carbon')]),
-            Vedeu::Line.new(streams: [Vedeu::Stream.new(value: 'Oxygen')]),
-            Vedeu::Line.new(streams: [Vedeu::Stream.new(value: 'Nitrogen')])
-          ]
-        }
 
         subject { instance.template_for(_name, filename, object) }
 

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

@@ -12,34 +12,49 @@ module Vedeu
       let(:background) { '#00ff00' }
       let(:foreground) { '#ff00ff' }
 
+      context 'setting both background and foreground' do
+        let(:dsl) {
+          Vedeu.interface 'my_interface' do
+            background '#00ff00'
+            foreground '#ff00ff'
+          end
+        }
+        after { Vedeu.interfaces.reset }
+
+        it { dsl.colour.background.colour.must_equal(background) }
+        it { dsl.colour.foreground.colour.must_equal(foreground) }
+      end
+
       describe '#background' do
+        let(:dsl) {
+          Vedeu.interface 'my_interface' do
+            background '#00ff00'
+          end
+        }
+        after { Vedeu.interfaces.reset }
+
         subject { instance.background(background) }
 
         it { instance.must_respond_to(:bg) }
         it { instance.must_respond_to(:bgcolor) }
-
-        it { subject.must_be_instance_of(Vedeu::Colour) }
-
-        it 'sets the background' do
-          subject.attributes.must_equal(
-            background: '#00ff00', foreground: ''
-          )
-        end
+        it { dsl.colour.background.must_be_instance_of(Vedeu::Background) }
+        it { dsl.colour.background.colour.must_equal(background) }
       end
 
       describe '#foreground' do
+        let(:dsl) {
+          Vedeu.interface 'my_interface' do
+            foreground '#ff00ff'
+          end
+        }
+        after { Vedeu.interfaces.reset }
+
         subject { instance.foreground(foreground) }
 
         it { instance.must_respond_to(:fg) }
         it { instance.must_respond_to(:fgcolor) }
-
-        it { subject.must_be_instance_of(Vedeu::Colour) }
-
-        it 'sets the foreground' do
-          subject.attributes.must_equal(
-            background: '', foreground: '#ff00ff'
-          )
-        end
+        it { dsl.colour.foreground.must_be_instance_of(Vedeu::Foreground) }
+        it { dsl.colour.foreground.colour.must_equal(foreground) }
       end
 
       describe '#colour' do
@@ -52,16 +67,13 @@ module Vedeu
         context 'with an empty value' do
           let(:attributes) { { background: background, foreground: '' } }
 
-          it 'sets only the valid attributes' do
-            subject.attributes.must_equal(
-              background: '#00ff00', foreground: ''
-            )
-          end
+          it { subject.background.colour.must_equal(background) }
+          it { subject.foreground.colour.must_equal('') }
         end
       end
 
       describe '#style' do
-        let(:args)  { :bold }
+        let(:args) { :bold }
 
         subject { instance.style(args) }
 

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

@@ -43,6 +43,7 @@ module Vedeu
           end
         }
 
+        it { described.must_respond_to(:render) }
         it { subject.must_be_instance_of(Array) }
 
         context 'when the block is not given' do

data/test/lib/vedeu/events/trigger_test.rb

@@ -18,13 +18,11 @@ module Vedeu
     end
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
-      it { subject.instance_variable_get('@name').must_equal(event_name) }
-      it { subject.instance_variable_get('@args').must_equal([args]) }
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@name').must_equal(event_name) }
+      it { instance.instance_variable_get('@args').must_equal([args]) }
       it do
-        subject.instance_variable_get('@repository').must_equal(Vedeu.events)
+        instance.instance_variable_get('@repository').must_equal(Vedeu.events)
       end
     end
 

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

@@ -33,21 +33,22 @@ module Vedeu
     before { Terminal.stubs(:size).returns([12, 40]) }
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
-      it { subject.instance_variable_get('@attributes').must_equal(attributes) }
-      it { subject.instance_variable_get('@centred').must_equal(centred) }
-      it { subject.instance_variable_get('@height').must_equal(height) }
-      it { subject.instance_variable_get('@maximised').must_equal(maximised) }
-      it { subject.instance_variable_get('@name').must_equal(_name) }
-      it { subject.instance_variable_get('@width').must_equal(width) }
-      it { subject.instance_variable_get('@x').must_equal(x) }
-      it { subject.instance_variable_get('@xn').must_equal(xn) }
-      it { subject.instance_variable_get('@y').must_equal(y) }
-      it { subject.instance_variable_get('@yn').must_equal(yn) }
+      it { instance.must_be_instance_of(described) }
+      it {
+        instance.instance_variable_get('@attributes').must_equal(attributes)
+      }
+      it { instance.instance_variable_get('@centred').must_equal(centred) }
+      it { instance.instance_variable_get('@height').must_equal(height) }
+      it { instance.instance_variable_get('@maximised').must_equal(maximised) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
+      it { instance.instance_variable_get('@width').must_equal(width) }
+      it { instance.instance_variable_get('@x').must_equal(x) }
+      it { instance.instance_variable_get('@xn').must_equal(xn) }
+      it { instance.instance_variable_get('@y').must_equal(y) }
+      it { instance.instance_variable_get('@yn').must_equal(yn) }
       it do
-        subject.instance_variable_get('@repository').must_equal(Vedeu.geometries)
+        instance.instance_variable_get('@repository').
+          must_equal(Vedeu.geometries)
       end
     end
 

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

@@ -28,10 +28,8 @@ module Vedeu
     end
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
-      it { subject.instance_variable_get('@interfaces').must_equal(interfaces) }
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@interfaces').must_equal(interfaces) }
     end
 
     describe '#add' do

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

@@ -98,6 +98,8 @@ module Vedeu
     end
 
     describe '#current' do
+      before { Focus.reset }
+
       subject { described.current }
 
       it 'returns the name of the interface currently in focus' do
@@ -108,8 +110,6 @@ module Vedeu
       end
 
       context 'when no interfaces are defined' do
-        before { Focus.reset }
-
         it { subject.must_equal(nil) }
       end
 
@@ -162,6 +162,7 @@ module Vedeu
 
     describe '#next_visible_item' do
       before do
+        Vedeu.stubs(:trigger)
         Vedeu.interface('gold') { visible true }
         Vedeu.interface('silver') { visible true }
         Vedeu.interface('platinum') { visible false }
@@ -192,6 +193,7 @@ module Vedeu
 
     describe '#prev_item' do
       it 'the previous interface is focussed when the method is called' do
+
         Focus.add('thallium')
         Focus.add('lead')
         Focus.add('bismuth')
@@ -207,6 +209,7 @@ module Vedeu
 
     describe '#prev_visible_item' do
       before do
+        Vedeu.stubs(:trigger)
         Vedeu.interface('gold') { visible true }
         Vedeu.interface('silver') { visible true }
         Vedeu.interface('platinum') { visible false }

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

@@ -16,16 +16,14 @@ module Vedeu
     let(:members)    { ['carbon', 'nitrogen', 'oxygen'] }
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
+      it { instance.must_be_instance_of(described) }
       it {
-        subject.instance_variable_get('@attributes').must_be_instance_of(Hash)
+        instance.instance_variable_get('@attributes').must_be_instance_of(Hash)
       }
-      it { subject.instance_variable_get('@members').must_equal(members) }
-      it { subject.instance_variable_get('@name').must_equal(_name) }
+      it { instance.instance_variable_get('@members').must_equal(members) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
       it {
-        subject.instance_variable_get('@repository').must_equal(Vedeu.groups)
+        instance.instance_variable_get('@repository').must_equal(Vedeu.groups)
       }
     end
 

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

@@ -33,18 +33,18 @@ module Vedeu
     let(:zindex)     { 1 }
 
     describe '#initialize' do
-      subject { instance }
-
-      it { subject.must_be_instance_of(described) }
-      it { subject.instance_variable_get('@client').must_equal(client) }
-      it { subject.instance_variable_get('@delay').must_equal(delay) }
-      it { subject.instance_variable_get('@group').must_equal(group) }
-      it { subject.instance_variable_get('@lines').must_equal(lines) }
-      it { subject.instance_variable_get('@name').must_equal(_name) }
-      it { subject.instance_variable_get('@parent').must_equal(parent) }
-      it { subject.instance_variable_get('@repository').must_equal(repository) }
-      it { subject.instance_variable_get('@visible').must_equal(visible) }
-      it { subject.instance_variable_get('@zindex').must_equal(zindex) }
+      it { instance.must_be_instance_of(described) }
+      it { instance.instance_variable_get('@client').must_equal(client) }
+      it { instance.instance_variable_get('@delay').must_equal(delay) }
+      it { instance.instance_variable_get('@group').must_equal(group) }
+      it { instance.instance_variable_get('@lines').must_equal(lines) }
+      it { instance.instance_variable_get('@name').must_equal(_name) }
+      it { instance.instance_variable_get('@parent').must_equal(parent) }
+      it {
+        instance.instance_variable_get('@repository').must_equal(repository)
+      }
+      it { instance.instance_variable_get('@visible').must_equal(visible) }
+      it { instance.instance_variable_get('@zindex').must_equal(zindex) }
     end
 
     describe 'accessors' do
@@ -70,16 +70,12 @@ module Vedeu
     describe '#lines' do
       subject { instance.lines }
 
-      it { instance.must_respond_to(:content) }
       it { instance.must_respond_to(:value) }
     end
 
     describe '#lines?' do
       subject { instance.lines? }
 
-      it { instance.must_respond_to(:content?) }
-      it { instance.must_respond_to(:value?) }
-
       context 'when the interface has content' do
         let(:lines) { [:line] }