vedeu 0.8.6 → 0.8.7

data/lib/vedeu/templating/view_template.rb

@@ -26,8 +26,8 @@ module Vedeu
                              Vedeu::Templating::Decoder.process(stream)
 
                            else
-                             Vedeu::Views::Stream.new(colour: default_colour,
-                                                      style:  default_style,
+                             Vedeu::Views::Stream.new(colour: stream_colour,
+                                                      style:  stream_style,
                                                       value:  stream)
 
                            end
@@ -54,24 +54,22 @@ module Vedeu
       # Return the interface colours if a name option is set,
       # otherwise use the default colours.
       #
-      # @return [Vedeu::Colours::Colour|Hash<Symbol => Symbol>]
-      def default_colour
-        return interface.colour if options[:name]
+      # @return [Vedeu::Colours::Colour|Hash<Symbol => NilClass,String,Symbol>]
+      def stream_colour
+        return interface.colour if name
 
-        {
-          background: :default,
-          foreground: :default,
-        }
+        default[:colour]
       end
 
-      # Return the interface style(s) if a name option is set,
-      # otherwise use the default style.
-      #
-      # @return [Symbol]
-      def default_style
-        return interface.style if options[:name]
-
-        :normal
+      # @return [Hash<Symbol => Hash<Symbol => Symbol>,Symbol>]
+      def default
+        {
+          colour: {
+            background: :default,
+            foreground: :default,
+          },
+          style: :normal,
+        }
       end
 
       # Returns the interface by name.
@@ -80,7 +78,7 @@ module Vedeu
       def interface
         Vedeu.interfaces.by_name(name)
       end
-      alias_method :interface?, :interface
+      alias interface? interface
 
       # @return [String|Symbol]
       def name
@@ -95,6 +93,16 @@ module Vedeu
         line.split(/({{\s*[^}]+\s*}})/)
       end
 
+      # Return the interface style(s) if a name option is set,
+      # otherwise use the default style.
+      #
+      # @return [Symbol]
+      def stream_style
+        return interface.style if name
+
+        default[:style]
+      end
+
       # Convert the content into an array of strings without the line
       # ending character.
       #

data/lib/vedeu/terminal/terminal.rb

@@ -15,8 +15,8 @@ module Vedeu
                    :height,
                    :width
 
-    alias_method :tyn, :height
-    alias_method :txn, :width
+    alias tyn height
+    alias txn width
 
     # Opens a terminal screen in either `raw` or `cooked` mode. On
     # exit, attempts to restore the screen. See
@@ -51,7 +51,7 @@ module Vedeu
         console.print(stream)
       end
     end
-    alias_method :write, :output
+    alias write output
 
     # {include:file:docs/dsl/by_method/resize.md}
     # @return [Boolean]
@@ -140,8 +140,8 @@ module Vedeu
     def origin
       1
     end
-    alias_method :tx, :origin
-    alias_method :ty, :origin
+    alias tx origin
+    alias ty origin
 
     # Returns a tuple containing the height and width of the current
     # terminal.

data/lib/vedeu/version.rb

@@ -3,6 +3,6 @@
 module Vedeu
 
   # The current version of Vedeu.
-  VERSION = '0.8.6'
+  VERSION = '0.8.7'.freeze
 
 end

data/lib/vedeu/views/chars.rb

@@ -52,7 +52,7 @@ module Vedeu
         end
       end
 
-      alias_method :chars, :value
+      alias chars value
 
     end # Chars
 

data/lib/vedeu/views/composition.rb

@@ -18,9 +18,9 @@ module Vedeu
       deputy     Vedeu::DSL::View
       entity     Vedeu::Views::View
 
-      alias_method :views,  :value
-      alias_method :views=, :value=
-      alias_method :views?, :value?
+      alias views value
+      alias views= value=
+      alias views? value?
 
       # Returns a new instance of Vedeu::Views::Composition.
       #
@@ -41,7 +41,7 @@ module Vedeu
       def add(child)
         @value = value.add(child)
       end
-      alias_method :<<, :add
+      alias << add
 
       # @return [Hash<Symbol => void>]
       def attributes

data/lib/vedeu/views/default_attributes.rb

@@ -23,7 +23,7 @@ module Vedeu
       # @!attribute [r] truncate
       # @return [Boolean]
       attr_reader :truncate
-      alias_method :truncate?, :truncate
+      alias truncate? truncate
 
       # @!attribute [r] width
       # @return [Fixnum|NilClass]
@@ -32,7 +32,7 @@ module Vedeu
       # @!attribute [r] wordwrap
       # @return [Boolean]
       attr_reader :wordwrap
-      alias_method :wordwrap?, :wordwrap
+      alias wordwrap? wordwrap
 
       # @return [Hash<Symbol => void>]
       def attributes

data/lib/vedeu/views/line.rb

@@ -37,8 +37,8 @@ module Vedeu
       def_delegators :value,
                      :streams
 
-      alias_method :streams=, :value=
-      alias_method :streams?, :value?
+      alias streams= value=
+      alias streams? value?
 
       # Returns a new instance of Vedeu::Views::Line.
       #
@@ -61,7 +61,7 @@ module Vedeu
       def add(child)
         @value = value.add(child)
       end
-      alias_method :<<, :add
+      alias << add
 
       # Returns an array of all the characters with formatting for
       # this line.
@@ -69,7 +69,7 @@ module Vedeu
       # @return [Array]
       # @see Vedeu::Views::Stream
       def chars
-        return [] unless value?
+        return [] unless streams?
 
         @chars ||= streams.flat_map(&:chars)
       end
@@ -81,7 +81,7 @@ module Vedeu
       def eql?(other)
         self.class == other.class && value == other.value
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # @return [NilClass|String|Symbol]
       def name
@@ -104,7 +104,7 @@ module Vedeu
       #
       # @return [Fixnum]
       def size
-        value.map(&:size).inject(0, :+)
+        streams.map(&:size).inject(0, :+)
       end
 
     end # Line

data/lib/vedeu/views/lines.rb

@@ -43,7 +43,7 @@ module Vedeu
         end
       end
 
-      alias_method :lines, :value
+      alias lines value
 
     end # Lines
 

data/lib/vedeu/views/stream.rb

@@ -39,10 +39,10 @@ module Vedeu
                      :chars,
                      :size
 
-      alias_method :content, :value
-      alias_method :text,    :value
-      alias_method :chars=, :value=
-      alias_method :chars?, :value?
+      alias content value
+      alias text value
+      alias chars= value=
+      alias chars? value?
 
       # @!attribute [w] value
       # @return [String]
@@ -76,7 +76,7 @@ module Vedeu
           self
         end
       end
-      alias_method :<<, :add
+      alias << add
 
       # An object is equal when its values are the same.
       #
@@ -85,7 +85,7 @@ module Vedeu
       def eql?(other)
         self.class == other.class && value == other.value
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # @return [NilClass|String|Symbol]
       def name

data/lib/vedeu/views/streams.rb

@@ -54,7 +54,7 @@ module Vedeu
         end
       end
 
-      alias_method :streams, :value
+      alias streams value
 
     end # Streams
 

data/lib/vedeu/views/view.rb

@@ -38,13 +38,13 @@ module Vedeu
       def_delegators :value,
                      :lines
 
-      alias_method :lines=, :value=
-      alias_method :lines?, :value?
+      alias lines= value=
+      alias lines? value?
 
       # @!attribute [rw] cursor_visible
       # @return [Boolean]
       attr_accessor :cursor_visible
-      alias_method :cursor_visible?, :cursor_visible
+      alias cursor_visible? cursor_visible
 
       # @!attribute [rw] name
       # @return [String|Symbol]
@@ -77,7 +77,7 @@ module Vedeu
       def add(child)
         @value = value.add(child)
       end
-      alias_method :<<, :add
+      alias << add
 
       # @return [Hash]
       def attributes

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

@@ -46,7 +46,7 @@ module Vedeu
       let(:top_left)          { 'l' }
       let(:top_right)         { 'k' }
       let(:geometry) {}
-      let(:_name)    { 'borders' }
+      let(:_name)    { :vedeu_borders_border }
 
       describe '.build' do
         subject {

data/test/lib/vedeu/borders/caption_test.rb

@@ -10,7 +10,7 @@ module Vedeu
 
       let(:described) { Vedeu::Borders::Caption }
       let(:instance)  { described.new(_name, _value, horizontal) }
-      let(:_name)     { 'Vedeu::Borders::Caption' }
+      let(:_name)     { :vedeu_borders_caption }
       let(:_value)    { 'Bismuth' }
       let(:type)      { :bottom_horizontal }
       let(:horizontal) {

data/test/lib/vedeu/borders/dsl_test.rb

@@ -12,12 +12,11 @@ module Vedeu
       let(:instance)   { described.new(model, client) }
       let(:model)      { Vedeu::Borders::Border.new(attributes) }
       let(:client)     {}
-      let(:attributes) { { name: 'borders' } }
+      let(:attributes) { { name: _name } }
       let(:boolean)    { true }
+      let(:_name)      { :vedeu_borders_dsl }
 
       describe '.border' do
-        let(:_name) { 'Vedeu::Borders::DSL' }
-
         after { Vedeu.borders.reset! }
 
         subject { described.border(_name) { } }

data/test/lib/vedeu/borders/refresh_test.rb

@@ -26,7 +26,7 @@ module Vedeu
       }
       let(:visible)     { true }
       let(:enabled)     { false }
-      let(:_name)       { 'Vedeu::Borders::Refresh' }
+      let(:_name)       { :vedeu_borders_refresh }
       let(:title)       {}
       let(:caption)     {}
       let(:show_top)    { true }

data/test/lib/vedeu/borders/title_test.rb

@@ -10,7 +10,7 @@ module Vedeu
 
       let(:described)  { Vedeu::Borders::Title }
       let(:instance)   { described.new(_name, _value, horizontal) }
-      let(:_name)      { 'Vedeu::Borders::Title' }
+      let(:_name)      { :vedeu_borders_title }
       let(:_value)     { 'Aluminium' }
       let(:horizontal) {
         [

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

@@ -10,19 +10,18 @@ module Vedeu
 
       let(:described)  { Vedeu::Buffers::Buffer }
       let(:instance)   { described.new(attributes) }
-      let(:_name)      { 'krypton' }
-      let(:back)       {}
-      let(:front)      {}
-      let(:previous)   {}
-      let(:interface)  {}
       let(:attributes) {
         {
-          name:     _name,
           back:     back,
           front:    front,
+          name:     _name,
           previous: previous,
         }
       }
+      let(:back)       {}
+      let(:front)      {}
+      let(:_name)      { :vedeu_buffers_buffer }
+      let(:previous)   {}
 
       describe '#initialize' do
         it { instance.must_be_instance_of(described) }
@@ -31,7 +30,8 @@ module Vedeu
         it { instance.instance_variable_get('@front').must_equal(front) }
         it { instance.instance_variable_get('@previous').must_equal(previous) }
         it do
-          instance.instance_variable_get('@repository').must_equal(Vedeu.buffers)
+          instance.instance_variable_get('@repository')
+            .must_equal(Vedeu.buffers)
         end
       end
 

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

@@ -15,7 +15,7 @@ module Vedeu
 
       let(:described) { Vedeu::Buffers::Refresh }
       let(:instance)  { described.new(_name, options) }
-      let(:_name)     { 'Vedeu::Buffers::Refresh' }
+      let(:_name)     { :vedeu_buffers_refresh }
       let(:options)   {
         {
           content_only: content_only,

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

@@ -92,6 +92,33 @@ module Vedeu
         end
       end
 
+      describe '#to_ast' do
+        subject { instance.to_ast }
+
+        context 'when there is no background' do
+          let(:colour)   { '' }
+          let(:expected) { '' }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when there is a background' do
+          context 'when the background is an CSS/HTML value' do
+            let(:colour)   { '#ff0000' }
+            let(:expected) { ':bg_ff0000' }
+
+            it { subject.must_equal(expected) }
+          end
+
+          context 'when the background is not a CSS/HTML value' do
+            let(:colour)   { 233 }
+            let(:expected) { ':bg' }
+
+            it { subject.must_equal(expected) }
+          end
+        end
+      end
+
       describe '#to_h' do
         subject { instance.to_h }
 

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

@@ -92,6 +92,33 @@ module Vedeu
         end
       end
 
+      describe '#to_ast' do
+        subject { instance.to_ast }
+
+        context 'when there is no foreground' do
+          let(:colour)   { '' }
+          let(:expected) { '' }
+
+          it { subject.must_equal(expected) }
+        end
+
+        context 'when there is a foreground' do
+          context 'when the foreground is an CSS/HTML value' do
+            let(:colour)   { '#ff0000' }
+            let(:expected) { ':fg_ff0000' }
+
+            it { subject.must_equal(expected) }
+          end
+
+          context 'when the foreground is not a CSS/HTML value' do
+            let(:colour)   { 233 }
+            let(:expected) { ':fg' }
+
+            it { subject.must_equal(expected) }
+          end
+        end
+      end
+
       describe '#to_h' do
         subject { instance.to_h }