vedeu 0.5.4 → 0.5.5

data/lib/vedeu/output/wordwrap.rb

@@ -25,7 +25,7 @@ module Vedeu
       @options = defaults.merge!(options)
     end
 
-    # @return [Vedeu::Lines]
+    # @return [Vedeu::Views::Lines]
     def content
       case mode
       when :prune then to_line_objects(prune)
@@ -94,16 +94,16 @@ module Vedeu
     private
 
     # @param text_as_lines [Array<String>]
-    # @return [Vedeu::Lines]
+    # @return [Vedeu::Views::Lines]
     def to_line_objects(text_as_lines)
       line_objects = Array(text_as_lines).map do |text_line|
-        stream        = Vedeu::Stream.new(value: text_line)
-        line          = Vedeu::Line.new
+        stream        = Vedeu::Views::Stream.new(value: text_line)
+        line          = Vedeu::Views::Line.new
         stream.parent = line
         line.add(stream)
         line
       end
-      Vedeu::Lines.new(line_objects)
+      Vedeu::Views::Lines.new(line_objects)
     end
 
     # @return [Array<String>]

data/lib/vedeu/runtime/application.rb

@@ -114,7 +114,7 @@ module Vedeu
     def run_many
       Vedeu::MainLoop.start! { yield }
 
-    rescue ModeSwitch
+    rescue Vedeu::ModeSwitch
       Vedeu::Terminal.switch_mode!
 
       Vedeu.trigger(:_drb_restart_)

data/lib/vedeu/runtime/main_loop.rb

@@ -40,7 +40,7 @@ module Vedeu
       # :nocov:
       # Check the application has started and we wish to continue running.
       #
-      # @raise [VedeuInterrupt] When we wish to terminate the running
+      # @raise [Vedeu::VedeuInterrupt] When we wish to terminate the running
       #   application.
       # @return [void]
       def safe_exit_point!

data/lib/vedeu/templating/helpers.rb

@@ -8,10 +8,10 @@ module Vedeu
 
       # @param value [String] The HTML/CSS colour.
       # @param block [Proc]
-      # @return [Vedeu::Stream]
+      # @return [Vedeu::Views::Stream]
       # @raise [Vedeu::InvalidSyntax] The required block was not given.
       def background(value, &block)
-        define_stream({ background: value }, &block)
+        define_stream(background: value, &block)
       end
       alias_method :bg, :background
 
@@ -19,7 +19,7 @@ module Vedeu
       # @option attributes foreground [String] The HTML/CSS foreground colour.
       # @option attributes background [String] The HTML/CSS background colour.
       # @param block [Proc]
-      # @return [Vedeu::Stream]
+      # @return [Vedeu::Views::Stream]
       # @raise [Vedeu::InvalidSyntax] The required block was not given.
       def colour(attributes = {}, &block)
         define_stream(attributes, &block)
@@ -27,18 +27,18 @@ module Vedeu
 
       # @param value [String] The HTML/CSS colour.
       # @param block [Proc]
-      # @return [Vedeu::Stream]
+      # @return [Vedeu::Views::Stream]
       # @raise [Vedeu::InvalidSyntax] The required block was not given.
       def foreground(value, &block)
-        define_stream({ foreground: value }, &block)
+        define_stream(foreground: value, &block)
       end
       alias_method :fg, :foreground
 
       # @param value [Symbol]
       # @param block [Proc]
-      # @return [Vedeu::Stream]
+      # @return [Vedeu::Views::Stream]
       def style(value, &block)
-        define_stream({ style: value }, &block)
+        define_stream(style: value, &block)
       end
 
       private
@@ -48,9 +48,10 @@ module Vedeu
         fail Vedeu::InvalidSyntax, 'block not given' unless block_given?
 
         encode(
-          Vedeu::Stream.build(colour: Vedeu::Colour.new(attributes),
-                              style:  Vedeu::Style.new(attributes[:style]),
-                              value:  block.call))
+          Vedeu::Views::Stream.build(
+            colour: Vedeu::Colour.new(attributes),
+            style:  Vedeu::Style.new(attributes[:style]),
+            value:  block.call))
       end
 
       # @param data [String]

data/lib/vedeu/templating/template.rb

@@ -25,7 +25,7 @@ module Vedeu
         @options = options || {}
       end
 
-      # @return [Vedeu::Stream]
+      # @return [Vedeu::Views::Stream]
       def parse
         ERB.new(load, nil, '-').result(binding)
       end

data/lib/vedeu/templating/view_template.rb

@@ -9,12 +9,12 @@ module Vedeu
       include Vedeu::Common
       include Vedeu::Templating::Helpers
 
-      # @return [Vedeu::Lines]
+      # @return [Vedeu::Views::Lines]
       def parse
-        lines_collection = Vedeu::Lines.new
+        lines_collection = Vedeu::Views::Lines.new
 
         lines.each do |line|
-          line_object = Vedeu::Line.new
+          line_object = Vedeu::Views::Line.new
 
           streams_for(line).each do |stream|
             next unless present?(stream)
@@ -23,9 +23,9 @@ module Vedeu
                              Vedeu::Templating::Decoder.process(stream)
 
                            else
-                             Vedeu::Stream.new(colour: default_colour,
-                                               style:  default_style,
-                                               value:  stream)
+                             Vedeu::Views::Stream.new(colour: default_colour,
+                                                      style:  default_style,
+                                                      value:  stream)
 
                            end
           end

data/lib/vedeu/version.rb

@@ -1,7 +1,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 
 end
-

data/test/lib/vedeu/api_test.rb

@@ -4,55 +4,55 @@ module Vedeu
 
   describe API do
 
-    it { Vedeu.must_respond_to(:configure) }
+    it { Vedeu.must_respond_to(:bind) }
+    it { Vedeu.must_respond_to(:bind_alias) }
+    it { Vedeu.must_respond_to(:border) }
+    it { Vedeu.must_respond_to(:bound?) }
+    it { Vedeu.must_respond_to(:clear) }
+    it { Vedeu.must_respond_to(:clear_by_group) }
+    it { Vedeu.must_respond_to(:clear_by_name) }
     it { Vedeu.must_respond_to(:configuration) }
+    it { Vedeu.must_respond_to(:configure) }
     it { Vedeu.must_respond_to(:cursor) }
     it { Vedeu.must_respond_to(:drb_restart) }
     it { Vedeu.must_respond_to(:drb_start) }
     it { Vedeu.must_respond_to(:drb_status) }
     it { Vedeu.must_respond_to(:drb_stop) }
-    it { Vedeu.must_respond_to(:border) }
-    it { Vedeu.must_respond_to(:geometry) }
-    it { Vedeu.must_respond_to(:group) }
-    it { Vedeu.must_respond_to(:keymap) }
-    it { Vedeu.must_respond_to(:interface) }
-    it { Vedeu.must_respond_to(:renders) }
-    it { Vedeu.must_respond_to(:render) }
-    it { Vedeu.must_respond_to(:views) }
-    it { Vedeu.must_respond_to(:view) }
-    it { Vedeu.must_respond_to(:bind) }
-    it { Vedeu.must_respond_to(:bind_alias) }
-    it { Vedeu.must_respond_to(:bound?) }
-    it { Vedeu.must_respond_to(:unbind) }
-    it { Vedeu.must_respond_to(:unbind_alias) }
     it { Vedeu.must_respond_to(:events) }
+    it { Vedeu.must_respond_to(:exit) }
     it { Vedeu.must_respond_to(:focus) }
     it { Vedeu.must_respond_to(:focus_by_name) }
-    it { Vedeu.must_respond_to(:focussed?) }
     it { Vedeu.must_respond_to(:focus_next) }
     it { Vedeu.must_respond_to(:focus_previous) }
+    it { Vedeu.must_respond_to(:focussed?) }
+    it { Vedeu.must_respond_to(:geometry) }
     it { Vedeu.must_respond_to(:goto) }
+    it { Vedeu.must_respond_to(:group) }
+    it { Vedeu.must_respond_to(:height) }
+    it { Vedeu.must_respond_to(:hide_cursor) }
+    it { Vedeu.must_respond_to(:hide_group) }
+    it { Vedeu.must_respond_to(:hide_interface) }
+    it { Vedeu.must_respond_to(:interface) }
+    it { Vedeu.must_respond_to(:keymap) }
+    it { Vedeu.must_respond_to(:keypress) }
     it { Vedeu.must_respond_to(:log) }
-    it { Vedeu.must_respond_to(:log_stdout) }
     it { Vedeu.must_respond_to(:log_stderr) }
-    it { Vedeu.must_respond_to(:keypress) }
+    it { Vedeu.must_respond_to(:log_stdout) }
     it { Vedeu.must_respond_to(:menu) }
-    it { Vedeu.must_respond_to(:height) }
-    it { Vedeu.must_respond_to(:width) }
-    it { Vedeu.must_respond_to(:trigger) }
-    it { Vedeu.must_respond_to(:exit) }
-    it { Vedeu.must_respond_to(:clear) }
-    it { Vedeu.must_respond_to(:clear_by_name) }
-    it { Vedeu.must_respond_to(:clear_by_group) }
-    it { Vedeu.must_respond_to(:hide_cursor) }
+    it { Vedeu.must_respond_to(:render) }
+    it { Vedeu.must_respond_to(:renders) }
     it { Vedeu.must_respond_to(:show_cursor) }
-    it { Vedeu.must_respond_to(:toggle_cursor) }
-    it { Vedeu.must_respond_to(:hide_group) }
     it { Vedeu.must_respond_to(:show_group) }
-    it { Vedeu.must_respond_to(:toggle_group) }
-    it { Vedeu.must_respond_to(:hide_interface) }
     it { Vedeu.must_respond_to(:show_interface) }
+    it { Vedeu.must_respond_to(:toggle_cursor) }
+    it { Vedeu.must_respond_to(:toggle_group) }
     it { Vedeu.must_respond_to(:toggle_interface) }
+    it { Vedeu.must_respond_to(:trigger) }
+    it { Vedeu.must_respond_to(:unbind) }
+    it { Vedeu.must_respond_to(:unbind_alias) }
+    it { Vedeu.must_respond_to(:views) }
+    it { Vedeu.must_respond_to(:width) }
+
   end # API
 
 end # Vedeu

data/test/lib/vedeu/buffers/buffer_test.rb

@@ -42,50 +42,19 @@ module Vedeu
     end
 
     describe '#add' do
-      let(:back) {
-        Vedeu.interface 'buffer' do
-          lines do
-            line 'old_back'
-          end
-        end
-      }
-      let(:content) {
-        Vedeu.interface 'buffer' do
-          lines do
-            line 'new_back'
-          end
-        end
-      }
-
-      before { Vedeu.stubs(:trigger) }
-      after { Vedeu.interfaces.reset }
+      let(:content) { Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new]) }
 
       subject { instance.add(content) }
 
       it { subject.must_equal(true) }
-
-      it 'replaces the back buffer with the content' do
-        instance.back.must_equal(back)
-
-        subject
-
-        instance.back.must_equal(content)
-      end
     end
 
     describe '#back?' do
-      before { Vedeu.stubs(:trigger) }
-      after { Vedeu.interfaces.reset }
-
       subject { instance.back? }
 
       context 'with content' do
         let(:back) {
-          Vedeu.interface 'back' do
-            lines do
-              line 'back content'
-            end
-          end
+          Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new])
         }
 
         it { subject.must_equal(true) }
@@ -97,19 +66,13 @@ module Vedeu
     end
 
     describe '#front?' do
-      before { Vedeu.stubs(:trigger) }
-      after { Vedeu.interfaces.reset }
-
       subject { instance.front? }
 
       context 'with content' do
         let(:front) {
-          Vedeu.interface 'front' do
-            lines do
-              line 'front content'
-            end
-          end
+          Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new])
         }
+
         it { subject.must_equal(true) }
       end
 
@@ -119,18 +82,11 @@ module Vedeu
     end
 
     describe '#previous?' do
-      before { Vedeu.stubs(:trigger) }
-      after { Vedeu.interfaces.reset }
-
       subject { instance.previous? }
 
       context 'with content' do
         let(:previous) {
-          Vedeu.interface 'previous' do
-            lines do
-              line 'previous content'
-            end
-          end
+          Vedeu::Views::View.new(lines: [Vedeu::Views::Line.new])
         }
 
         it { subject.must_equal(true) }
@@ -172,96 +128,6 @@ module Vedeu
         Vedeu::Output.expects(:render)
         subject
       }
-
-      # @todo Add more tests.
-      # it { skip }
-      # it { subject.must_be_instance_of(Array) }
-
-      # context 'when there is content on the back buffer' do
-      #   let(:back) {
-      #     Vedeu.interface 'buffer' do
-      #       lines do
-      #         line 'old_back'
-      #       end
-      #     end
-      #   }
-      #   let(:front) {
-      #     Vedeu.interface 'buffer' do
-      #       lines do
-      #         line 'front'
-      #       end
-      #     end
-      #   }
-      #   let(:previous) {
-      #     Vedeu.interface 'buffer' do
-      #       lines do
-      #         line 'previous'
-      #       end
-      #     end
-      #   }
-      #   let(:buffer) { :back }
-
-      #   it { subject.must_equal([back]) }
-
-      #   it 'replaces the previous buffer with the front buffer' do
-      #     subject
-      #     instance.previous.must_equal(front)
-      #   end
-
-      #   it 'replaces the front buffer with the back buffer' do
-      #     subject
-      #     instance.front.must_equal(back)
-      #   end
-
-      #   it 'replaces the back buffer with an empty buffer' do
-      #     subject
-      #     instance.back.must_equal(nil)
-      #   end
-      # end
-
-      # context 'when there is no content on the back buffer' do
-      #   let(:buffer) { :back }
-
-      #   it { subject.must_equal([]) }
-      # end
-
-      # context 'when there is content on the front buffer' do
-      #   let(:buffer) { :front }
-      #   let(:front) {
-      #     Vedeu.interface 'buffer' do
-      #       lines do
-      #         line 'front'
-      #       end
-      #     end
-      #   }
-
-      #   it { subject.must_equal([front]) }
-      # end
-
-      # context 'when there is no content on the front buffer' do
-      #   let(:buffer) { :front }
-
-      #   it { subject.must_equal([]) }
-      # end
-
-      # context 'when there is content on the previous buffer' do
-      #   let(:buffer) { :previous }
-      #   let(:previous) {
-      #     Vedeu.interface 'buffer' do
-      #       lines do
-      #         line 'old_back'
-      #       end
-      #     end
-      #   }
-
-      #   it { subject.must_equal([previous]) }
-      # end
-
-      # context 'when there is no content on the previous buffer' do
-      #   let(:buffer) { :previous }
-
-      #   it { subject.must_equal([]) }
-      # end
     end
 
   end # Buffer

data/test/lib/vedeu/colours/colour_translator_test.rb

@@ -84,7 +84,7 @@ module Vedeu
 
         it 'raises an exception since the subclasses Background and ' \
            'Foreground handle this' do
-          proc { subject }.must_raise(NotImplemented)
+          proc { subject }.must_raise(Vedeu::NotImplemented)
         end
       end
 
@@ -93,7 +93,7 @@ module Vedeu
 
         it 'raises an exception since the subclasses Background and ' \
            'Foreground handle this' do
-          proc { subject }.must_raise(NotImplemented)
+          proc { subject }.must_raise(Vedeu::NotImplemented)
         end
       end
 
@@ -102,7 +102,7 @@ module Vedeu
 
         it 'raises an exception since the subclasses Background and ' \
            'Foreground handle this' do
-          proc { subject }.must_raise(NotImplemented)
+          proc { subject }.must_raise(Vedeu::NotImplemented)
         end
       end