vedeu 0.5.11 → 0.5.12

data/lib/vedeu/configuration/configuration.rb

@@ -55,7 +55,7 @@ module Vedeu
       # with the arguments provided.
       #
       # @example
-      #   Vedeu.configure
+      #   Vedeu.configure do
       #     # ...
       #   end
       #

data/lib/vedeu/dsl/view.rb

@@ -128,12 +128,12 @@ module Vedeu
         #   Typically includes `view` with associated sub-directives.
         # @raise [Vedeu::InvalidSyntax] The required block was not given.
         # @return [Array<View>]
-        def render(&block)
+        def renders(&block)
           fail Vedeu::InvalidSyntax, 'block not given' unless block_given?
 
           store(:store_immediate, &block)
         end
-        alias_method :renders, :render
+        alias_method :render, :renders
 
         # Define a view (content) for an interface.
         #

data/lib/vedeu/events/event.rb

@@ -183,7 +183,10 @@ module Vedeu
       @executed_at = @now # set execution time to now
       @now         = 0    # reset now
 
-      Vedeu.log(type: :event, message: "Triggering: '#{name.inspect}'")
+      message = "Triggering: '#{name.inspect}'"
+      message << " with '#{args.inspect}'" if args.any?
+
+      Vedeu.log(type: :event, message: message)
 
       closure.call(*args)
     end

data/lib/vedeu/log/log.rb

@@ -192,7 +192,11 @@ module Vedeu
       #
       # The 'type' will be shown as the first colour defined in the value
       # array, whilst the 'message' will be shown using the last colour.
-      # Valid types are available by viewing the source for this method.
+      #
+      # Valid types available:
+      #
+      #     :config, :create, :debug, :error, :drb, :event, :info, :input,
+      #     :output, :reset, :store, :test, :timer, :update
       #
       # @return [Hash<Symbol => Array<Symbol>>]
       def message_types

data/lib/vedeu/runtime/bootstrap.rb

@@ -8,25 +8,21 @@ module Vedeu
   class Bootstrap
 
     # @param argv [Array<String>]
-    # @param entry_point [void]
     # @return [void]
-    def self.start(argv = ARGV, entry_point = nil)
-      new(argv, entry_point).start
+    def self.start(argv = ARGV)
+      new(argv).start
     end
 
     # Returns a new instance of Vedeu::Bootstrap.
     #
     # @param argv [Array<String>]
-    # @param entry_point [void]
     # @return [Vedeu::Bootstrap]
-    def initialize(argv, entry_point = nil)
-      @argv        = argv
-      @entry_point = entry_point
+    def initialize(argv)
+      @argv = argv
     end
 
     # Loads all of the client application files so that Vedeu has access to
-    # them, calls the 'entry_point' controller, ready to start the application,
-    # then launches the client application.
+    # them, then launches the client application.
     #
     # @return [void]
     def start
@@ -44,10 +40,6 @@ module Vedeu
     # @return [Array<String>]
     attr_reader :argv
 
-    # @!attribute [r] entry_point
-    # @return [void]
-    attr_reader :entry_point
-
     private
 
     # @return [String]
@@ -80,7 +72,13 @@ module Vedeu
 
     # @return [void]
     def client_initialize!
-      entry_point || root
+      if Vedeu::Configuration.root
+        Vedeu.trigger(:_goto_, *Vedeu::Configuration.root)
+
+      else
+        Vedeu.log_stderr(type: :debug, message: client_initialize_error)
+
+      end
     end
 
     # Load each of the loadable files.
@@ -111,9 +109,13 @@ module Vedeu
       end unless Vedeu::Configuration.log?
     end
 
-    # @return [Class]
-    def root
-      Vedeu::Configuration.root if Vedeu::Configuration.root
+    # @return [String]
+    def client_initialize_error
+      "Please update the 'root' setting in 'config/configuration.rb' to "     \
+      "start Vedeu using this controller and action: (args are optional)\n\n" \
+      "Vedeu.configure do\n" \
+      "  root :some_controller, :show, *args\n" \
+      "end\n\n"
     end
 
   end # Bootstrap

data/lib/vedeu/runtime/router.rb

@@ -22,7 +22,7 @@ module Vedeu
       end
 
       Vedeu.log(type:    :create,
-                message: "Adding ':#{controller}'")
+                message: "Controller: ':#{controller}'")
 
       if registered?(controller)
         storage[controller].merge!(klass: klass)
@@ -46,7 +46,7 @@ module Vedeu
     def add_action(controller, action)
       if present?(controller) && present?(action)
         Vedeu.log(type:    :create,
-                  message: "Adding ':#{action}' for ':#{controller}'")
+                  message: "Action: ':#{action}' (for ':#{controller}')")
 
         if registered?(controller)
           storage[controller][:actions] << action

data/lib/vedeu/version.rb

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

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

@@ -11,6 +11,28 @@ module Vedeu
     describe '#initialize' do
       it { instance.must_be_instance_of(described) }
       it { instance.instance_variable_get('@params').must_equal(params) }
+
+      context 'defined methods' do
+        let(:params) {
+          {
+            elements: [:hydrogen, :helium]
+          }
+        }
+
+        it { instance.must_respond_to(:elements) }
+        it { instance.elements.must_equal(params[:elements]) }
+
+        context 'but the params contain a key already defined as a method' do
+          let(:params) {
+            {
+              render: [:some_value]
+            }
+          }
+
+          it { instance.must_respond_to(:render) }
+          it { proc { instance.render }.wont_equal(params[:render]) }
+        end
+      end
     end
 
     # describe 'accessors' do
@@ -28,6 +50,8 @@ module Vedeu
       it { instance.must_respond_to(:render) }
     end
 
+
+
   end # ApplicationView
 
 end # Vedeu

data/test/lib/vedeu/bindings/application_test.rb

@@ -4,7 +4,7 @@ module Vedeu
 
   module Bindings
 
-	  describe Application do
+    describe Application do
 
       context 'the application specific events are defined' do
         it { Vedeu.bound?(:_goto_).must_equal(true) }
@@ -31,7 +31,7 @@ module Vedeu
         }
       end
 
-	  end # Application
+    end # Application
 
   end # Bindings
 

data/test/lib/vedeu/bindings_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Vedeu
 
-	describe Bindings do
+  describe Bindings do
 
     let(:described) { Vedeu::Bindings }
 
@@ -51,6 +51,6 @@ module Vedeu
       it { subject.must_equal(true) }
     end
 
-	end # Bindings
+  end # Bindings
 
 end # Vedeu

data/test/lib/vedeu/configuration/api_test.rb

@@ -240,36 +240,36 @@ module Vedeu
 
       describe '#root' do
         it 'sets the options to the desired value' do
-          configuration = Vedeu.configure { root(::YourApp::SomeController.new) }
-          configuration.root.must_be_instance_of(YourApp::SomeController)
+          configuration = Vedeu.configure { root(:controller, :action, :args) }
+          configuration.root.must_equal([:controller, :action, :args])
         end
       end
 
       describe '#stdin' do
-        let(:io) {}
+        let(:io) { IO.console }
 
-        subject { instance.stdin(io) }
-
-        # @todo Add more tests.
-        # it { skip }
+        it 'sets the option to the desired value' do
+          configuration = Vedeu.configure { stdin(IO.console) }
+          configuration.stdin.must_equal(io)
+        end
       end
 
       describe '#stdout' do
-        let(:io) {}
+        let(:io) { IO.console }
 
-        subject { instance.stdout(io) }
-
-        # @todo Add more tests.
-        # it { skip }
+        it 'sets the option to the desired value' do
+          configuration = Vedeu.configure { stdout(IO.console) }
+          configuration.stdout.must_equal(io)
+        end
       end
 
       describe '#stderr' do
-        let(:io) {}
-
-        subject { instance.stderr(io) }
+        let(:io) { IO.console }
 
-        # @todo Add more tests.
-        # it { skip }
+        it 'sets the option to the desired value' do
+          configuration = Vedeu.configure { stderr(IO.console) }
+          configuration.stderr.must_equal(io)
+        end
       end
 
       describe '#compression!' do

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

@@ -232,13 +232,14 @@ module Vedeu
     describe '#move' do
       let(:_name) { 'move_move' }
 
+      before { Vedeu.stubs(:trigger) }
+
       subject { instance.move }
 
       context 'when the entity is a Vedeu::Geometry' do
         let(:entity) { Vedeu::Geometry }
 
-        # @todo Add more tests.
-        # it { skip }
+        it { subject.must_be_instance_of(Vedeu::Geometry) }
       end
 
       context 'when the entity is a Vedeu::Cursor' do
@@ -247,33 +248,51 @@ module Vedeu
     end
 
     describe '#refresh' do
+      before { Vedeu.stubs(:trigger) }
+
       subject { instance.refresh }
 
       context 'when the entity is a Vedeu::Geometry' do
         let(:entity) { Vedeu::Geometry }
 
-        # @todo Add more tests.
-        # it { skip }
+        it {
+          Vedeu.expects(:trigger)
+          subject
+        }
       end
 
       context 'when the entity is a Vedeu::Cursor' do
-        # @todo Add more tests.
-        # it { skip }
+        it {
+          Vedeu.expects(:trigger)
+          subject
+        }
       end
     end
 
     describe '#merged_attributes' do
       subject { instance.merged_attributes }
 
-      context 'when the entity is a Vedeu::Geometry' do
-        let(:entity) { Vedeu::Geometry }
+      it { subject.must_be_instance_of(Hash) }
 
-        it { subject.must_be_instance_of(Hash) }
+      context 'when the entity is a Vedeu::Geometry' do
+        let(:entity)   { Vedeu::Geometry }
+        let(:expected) {
+          {
+            centred: false,
+            maximised: false,
+            name: '',
+            x: 5,
+            y: 5,
+            xn: 10,
+            yn: 10
+          }
+        }
+
+        it { subject.must_equal(expected) }
       end
 
       context 'when the entity is a Vedeu::Cursor' do
-        # @todo Add more tests.
-        # it { skip }
+        it { subject.must_be_instance_of(Hash) }
       end
     end
 

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

@@ -156,7 +156,10 @@ module Vedeu
       describe '#delay' do
         subject { instance.delay(0.25) }
 
-        it { subject; model.delay.must_equal(0.25) }
+        it {
+          subject
+          model.delay.must_equal(0.25)
+        }
       end
 
       describe '#focus!' do
@@ -253,7 +256,10 @@ module Vedeu
       describe '#name' do
         subject { instance.name('nickel') }
 
-        it { subject; model.name.must_equal('nickel') }
+        it {
+          subject
+          model.name.must_equal('nickel')
+        }
       end
 
       describe '#no_cursor!' do

data/test/lib/vedeu/esc/actions_test.rb

@@ -4,7 +4,7 @@ module Vedeu
 
   module EscapeSequences
 
-  	describe Actions do
+    describe Actions do
 
       let(:described) { Vedeu::EscapeSequences::Actions }
 
@@ -32,7 +32,7 @@ module Vedeu
         it { described.characters.must_be_instance_of(Hash) }
       end
 
-  	end # Actions
+    end # Actions
 
   end # EscapeSequences
 

data/test/lib/vedeu/esc/borders_test.rb

@@ -4,7 +4,7 @@ module Vedeu
 
   module EscapeSequences
 
-  	describe Borders do
+    describe Borders do
 
       let(:described) { Vedeu::EscapeSequences::Borders }
 
@@ -30,7 +30,7 @@ module Vedeu
         it { described.characters.must_be_instance_of(Hash) }
       end
 
-  	end # Borders
+    end # Borders
 
   end # EscapeSequences
 

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Vedeu
 
-	describe EventAliases do
+  describe EventAliases do
 
     let(:described) { Vedeu::EventAliases }
 
@@ -118,6 +118,6 @@ module Vedeu
       end
     end
 
-	end # EventAliases
+  end # EventAliases
 
 end # Vedeu

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

@@ -2,7 +2,7 @@ require 'test_helper'
 
 module Vedeu
 
-	describe EventCollection do
+  describe EventCollection do
 
     let(:described) { Vedeu::EventCollection }
     let(:instance)  { described.new }