vedeu 0.8.3 → 0.8.4

data/lib/vedeu/presentation/style.rb

@@ -75,6 +75,11 @@ module Vedeu
       end
       alias_method :==, :eql?
 
+      # @return [String]
+      def to_ast
+        ':s'
+      end
+
       # Return the terminal escape sequences after converting the
       # style or styles.
       #

data/lib/vedeu/renderers/all.rb

@@ -132,6 +132,7 @@ end # Vedeu
 
 require 'vedeu/renderers/options'
 require 'vedeu/renderers/file'
+require 'vedeu/renderers/escape'
 require 'vedeu/renderers/html'
 require 'vedeu/renderers/json'
 require 'vedeu/renderers/terminal'

data/lib/vedeu/renderers/escape.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Vedeu
+
+  module Renderers
+
+    # Converts a grid of {Vedeu::Cells} objects or
+    # {Vedeu::Cells::Char} objects into a stream of characters without
+    # escape sequences.
+    #
+    class Escape < Vedeu::Renderers::File
+
+      include Vedeu::Renderers::Options
+
+      # Render a cleared output.
+      #
+      # @return [String]
+      def clear
+        render('[[:clear]]')
+      end
+
+      private
+
+      # Combine all characters in a row to produce a line, then all
+      # lines should be terminated with `\n`. Convert to an array of
+      # UTF8 codepoints, and any codepoint above 255 should be
+      # converted to a space.
+      #
+      # @return [String]
+      def content
+        return '[[:empty]]' if string?(output) || absent?(output)
+
+        buffer.map { |row| row.join("\n") }.join("\n\n")
+      end
+
+      # @return [Array<String>]
+      def buffer
+        empty = Array.new(Vedeu.height) { Array.new(Vedeu.width) { '[:cell]' } }
+
+        output.each do |row|
+          row.each do |char|
+            next unless renderable?(char) &&
+                        positionable?(char) &&
+                        escapable?(char)
+
+            empty[char.position.y - 1][char.position.x - 1] = char.to_ast
+          end
+        end
+
+        empty
+      end
+
+      # @return [Boolean]
+      def positionable?(char)
+        char.respond_to?(:position) &&
+        char.position.is_a?(Vedeu::Geometries::Position)
+      end
+
+      # @return [Array<Class>]
+      def renderables
+        [
+          Vedeu::Cells::Border,
+          Vedeu::Cells::BottomHorizontal,
+          Vedeu::Cells::BottomLeft,
+          Vedeu::Cells::BottomRight,
+          Vedeu::Cells::Corner,
+          Vedeu::Cells::Char,
+          Vedeu::Cells::Clear,
+          Vedeu::Cells::Cursor,
+          Vedeu::Cells::Empty,
+          Vedeu::Cells::Escape,
+          Vedeu::Cells::Horizontal,
+          Vedeu::Cells::LeftVertical,
+          Vedeu::Cells::RightVertical,
+          Vedeu::Cells::TopHorizontal,
+          Vedeu::Cells::TopLeft,
+          Vedeu::Cells::TopRight,
+          Vedeu::Cells::Vertical,
+        ]
+      end
+
+      # @return [Boolean]
+      def renderable?(char)
+        renderables.include?(char.class)
+      end
+
+      # @return [Boolean]
+      def escapable?(char)
+        char.respond_to?(:to_ast)
+      end
+
+    end # Escape
+
+  end # Renderers
+
+end # Vedeu

data/lib/vedeu/repositories/defaults.rb

@@ -12,6 +12,8 @@ module Vedeu
     #
     module Defaults
 
+      include Vedeu::Common
+
       # Returns a new instance of the class including this module.
       #
       # @note
@@ -23,12 +25,7 @@ module Vedeu
       # @return [void] A new instance of the class including this
       #   module.
       def initialize(attributes = {})
-        fail Vedeu::Error::InvalidSyntax,
-             'Argument :attributes is not a Hash.' unless attributes.is_a?(Hash)
-
-        attrs = attributes.keep_if { |key, _| defaults.key?(key) }
-
-        defaults.merge!(attrs).each do |key, value|
+        defaults.merge!(validate(attributes)).each do |key, value|
           instance_variable_set("@#{key}", value || defaults.fetch(key))
         end
       end
@@ -40,6 +37,17 @@ module Vedeu
         {}
       end
 
+      # @param attributes [Hash]
+      # @raise [Vedeu::Error::InvalidSyntax] When the :attributes
+      #   param is not a Hash.
+      # @return [Hash]
+      def validate(attributes)
+        fail Vedeu::Error::InvalidSyntax,
+             'Argument :attributes is not a Hash.' unless hash?(attributes)
+
+        attributes.keep_if { |key, _| defaults.key?(key) }
+      end
+
     end # Defaults
 
   end # Repositories

data/lib/vedeu/runtime/launcher.rb

@@ -112,7 +112,11 @@ module Vedeu
       $stdout = STDOUT
       $stderr = STDERR
 
-      @kernel.exit(exit_code)
+      # Commenting out this line means Vedeu can be run as a module within an
+      # application. Specifically, this allows me to run some very basic
+      # integration tests.
+      #
+      # @kernel.exit(exit_code)
     end
     # :nocov:
 

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 
 end

data/lib/vedeu/views/lines.rb

@@ -18,6 +18,11 @@ module Vedeu
         if collection.is_a?(Vedeu::Views::Lines)
           collection
 
+        elsif collection.is_a?(Vedeu::Views::Streams)
+          if collection.empty?
+            # @todo Investigate whether this is being used.
+          end
+
         elsif collection.is_a?(Array)
           return new(collection, parent, name) if collection.empty?
 

data/lib/vedeu/views/stream.rb

@@ -68,7 +68,14 @@ module Vedeu
       # @param child [Vedeu::Views::Stream]
       # @return [Vedeu::Views::Streams]
       def add(child)
-        parent.add(child)
+        if defined?(parent) && present?(parent)
+          parent.add(child)
+
+        else
+          @value = child
+
+          self
+        end
       end
       alias_method :<<, :add
 

data/lib/vedeu/views/streams.rb

@@ -37,6 +37,11 @@ module Vedeu
         elsif collection.is_a?(Vedeu::Views::Stream)
           new([collection], parent, name)
 
+        elsif collection.is_a?(Vedeu::Views::Chars)
+          return new([], parent, name) if collection.empty?
+
+          new([Vedeu::Views::Stream.new(value: collection)], parent, name)
+
         elsif collection.is_a?(String)
           return new([], parent, name) if collection.empty?
 
@@ -45,7 +50,7 @@ module Vedeu
         else
           fail Vedeu::Error::InvalidSyntax,
                'Cannot coerce for Vedeu::View::Streams, as collection ' \
-               'unrecognised.'
+               "unrecognised. (#{collection.class.name})"
 
         end
       end

data/lib/vedeu/views/value.rb

@@ -109,19 +109,13 @@ module Vedeu
 
         # @return [void]
         def value
-          @_value ||= if present?(@value)
-                        collection.coerce(@value, self)
-
-                      else
-                        collection.coerce([], self)
-
-                      end
+          collection.coerce(@value || [], self)
         end
 
         # @param value [void]
         # @return [void]
         def value=(value)
-          @_value = @value = collection.coerce(value, self)
+          @value = collection.coerce(value, self)
         end
 
         # Returns a boolean indicating whether this model has a

data/lib/vedeu/views/view.rb

@@ -76,7 +76,7 @@ module Vedeu
       # @param child [Vedeu::Views::Line]
       # @return [Vedeu::Views::Lines]
       def add(child)
-        @_value = value.add(child)
+        @value = value.add(child)
       end
       alias_method :<<, :add
 

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

@@ -58,14 +58,6 @@ module Vedeu
       end
 
       describe '.coerce' do
-        let(:attributes) {
-          {
-            background: background,
-            foreground: foreground,
-          }
-        }
-        let(:background) {}
-        let(:foreground) {}
         let(:_value) {}
 
         subject { described.coerce(_value) }

data/test/lib/vedeu/common_test.rb

@@ -167,6 +167,30 @@ module Vedeu
       end
     end
 
+    describe '#line_model?' do
+      subject { instance.line_model? }
+
+      context 'when a model method is available in the including class' do
+        let(:model) { Vedeu::Views::Line.new }
+
+        before { instance.stubs(:model).returns(model) }
+
+        context 'when the model is a line' do
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the model is not a line' do
+          let(:model) { :invalid }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      context 'when a model method is not available in the including class' do
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#numeric?' do
       let(:_value) {}
 
@@ -252,6 +276,30 @@ module Vedeu
       end
     end
 
+    describe '#stream_model?' do
+      subject { instance.stream_model? }
+
+      context 'when a model method is available in the including class' do
+        let(:model) { Vedeu::Views::Stream.new }
+
+        before { instance.stubs(:model).returns(model) }
+
+        context 'when the model is a stream' do
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the model is not a stream' do
+          let(:model) { :invalid }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      context 'when a model method is not available in the including class' do
+        it { subject.must_equal(false) }
+      end
+    end
+
     describe '#string?' do
       let(:_value) {}
 
@@ -296,6 +344,30 @@ module Vedeu
       end
     end
 
+    describe '#view_model?' do
+      subject { instance.view_model? }
+
+      context 'when a model method is available in the including class' do
+        let(:model) { Vedeu::Views::View.new }
+
+        before { instance.stubs(:model).returns(model) }
+
+        context 'when the model is a view' do
+          it { subject.must_equal(true) }
+        end
+
+        context 'when the model is not a view' do
+          let(:model) { :invalid }
+
+          it { subject.must_equal(false) }
+        end
+      end
+
+      context 'when a model method is not available in the including class' do
+        it { subject.must_equal(false) }
+      end
+    end
+
   end # Common
 
 end # Vedeu

data/test/lib/vedeu/dsl/string/align_test.rb

@@ -88,7 +88,7 @@ module Vedeu
 
           context 'when a width is not given' do
             let(:width)    {}
-            let(:expected) { 'Some text...                  ' }
+            let(:expected) { 'Some text...' }
 
             it 'uses the width of the named geometry' do
               subject.must_equal(expected)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Gavin Laking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -460,7 +460,6 @@ files:
 - docs/streams.md
 - docs/template.md
 - docs/view.md
-- examples/284_slow_rendering.rb
 - examples/dsl_alignment.rb
 - examples/dsl_colours.rb
 - examples/dsl_demo_groups.rb
@@ -475,26 +474,52 @@ files:
 - examples/views/expected/vedeu_full_screen.json
 - examples/views/expected/vedeu_full_screen.out
 - examples/views/expected/vedeu_full_screen.txt
-- examples/views/expected/vedeu_line.html
-- examples/views/expected/vedeu_line.json
-- examples/views/expected/vedeu_line.out
-- examples/views/expected/vedeu_line.txt
-- examples/views/expected/vedeu_lines.html
-- examples/views/expected/vedeu_lines.json
-- examples/views/expected/vedeu_lines.out
-- examples/views/expected/vedeu_lines_alignment.html
-- examples/views/expected/vedeu_lines_alignment.json
-- examples/views/expected/vedeu_lines_alignment.out
 - examples/views/full_screen.rb
-- examples/views/line.rb
-- examples/views/lines.rb
-- examples/views/lines_alignment.rb
 - examples/views/lines_line_stream.rb
 - examples/views/lines_line_streams.rb
 - examples/views/lines_line_streams_stream.rb
 - examples/views/lines_line_streams_stream_stream.rb
 - examples/views/lines_streams.rb
-- examples/views/runner.sh
+- integrations/342_streams.rb
+- integrations/dsl_app_001.rb
+- integrations/dsl_app_002.rb
+- integrations/dsl_app_003.rb
+- integrations/dsl_app_004.rb
+- integrations/dsl_app_005.rb
+- integrations/dsl_app_006.rb
+- integrations/dsl_app_007.rb
+- integrations/dsl_app_008.rb
+- integrations/dsl_app_009.rb
+- integrations/dsl_app_010.rb
+- integrations/dsl_app_011.rb
+- integrations/dsl_app_012.rb
+- integrations/dsl_app_013.rb
+- integrations/dsl_app_014.rb
+- integrations/dsl_app_015.rb
+- integrations/dsl_app_016.rb
+- integrations/dsl_app_017.rb
+- integrations/dsl_app_018.rb
+- integrations/dsl_app_019.rb
+- integrations/dsl_app_020.rb
+- integrations/expected/342_streams.out
+- integrations/expected/dsl_app_001.out
+- integrations/expected/dsl_app_002.out
+- integrations/expected/dsl_app_003.out
+- integrations/expected/dsl_app_004.out
+- integrations/expected/dsl_app_005.out
+- integrations/expected/dsl_app_006.out
+- integrations/expected/dsl_app_007.out
+- integrations/expected/dsl_app_008.out
+- integrations/expected/dsl_app_009.out
+- integrations/expected/dsl_app_010.out
+- integrations/expected/dsl_app_011.out
+- integrations/expected/dsl_app_012.out
+- integrations/expected/dsl_app_013.out
+- integrations/expected/dsl_app_014.out
+- integrations/expected/dsl_app_015.out
+- integrations/expected/dsl_app_016.out
+- integrations/support/test_interface.rb
+- integrations/test_runner.sh
 - lib/vedeu.rb
 - lib/vedeu/all.rb
 - lib/vedeu/application/all.rb
@@ -704,6 +729,7 @@ files:
 - lib/vedeu/presentation/style.rb
 - lib/vedeu/presentation/styles.rb
 - lib/vedeu/renderers/all.rb
+- lib/vedeu/renderers/escape.rb
 - lib/vedeu/renderers/file.rb
 - lib/vedeu/renderers/html.rb
 - lib/vedeu/renderers/json.rb