vedeu 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b010b9db3a29aed26083a27acd4d7843e0ba8a86
-  data.tar.gz: f5487a4cdfe1bcd1339bdc8f8eedd96f9f96e768
+  metadata.gz: 09870ba45d07181770a6a5ce2cb4d76791e4407c
+  data.tar.gz: a8fc2634c87ee748a2ef2088f9ec1e0ffa9bf4a8
 SHA512:
-  metadata.gz: 419e080ddd2be42371edea189cbb56bf8ef02b8ba1b928aaa1a47790e4cf0da4b7ebfc82a09658cf0cc30a5af04b883f68051ad65a34a1f4070345821ca4fe97
-  data.tar.gz: c226c7c8af7ddcaa58f83abbb20372d8578843a4ecb246d932c48e8f80c037ad23302a0d563740b3f23ae03546dbe69518b5f0030ed7c00e983bfd7503e4133a
+  metadata.gz: f1fa1db173f45c407e2430aa91b34a2ba4e01e7153add82561928c7369fbd16b11ac23f8f21264407f7ea1fd2ff89986a11a1174911e9e85950440286549d93f
+  data.tar.gz: d6520ef6b775f1d5413271fba57b2c28394428fc41af772742c1b92aad2beed4b4c8c72dd939687a3b845465ddb3353e20910fe6cdb22a995ea110f45a7bbefa

data/examples/material_colours_app.rb

@@ -70,6 +70,27 @@ class VedeuMaterialColoursApp
     zindex(1)
   end
 
+  Vedeu.interface 'empty_interface' do
+    border 'empty_interface' do
+      colour(foreground: '#ffffff', background: :default)
+      title('Empty!')
+      horizontal('-')
+      top_right('+')
+      top_left('+')
+      bottom_right('+')
+      bottom_left('+')
+    end
+    colour(foreground: '#ffffff', background: :default)
+    cursor!
+    geometry 'empty_interface' do
+      x(50)
+      xn(64)
+      y(5)
+      yn(13)
+    end
+    zindex(1)
+  end
+
   Vedeu.keymap('_global_') do
     key(:up)    { Vedeu.trigger(:_cursor_up_)    }
     key(:right) { Vedeu.trigger(:_cursor_right_) }
@@ -149,6 +170,10 @@ class VedeuMaterialColoursApp
       line { centre 'Pink',        width: 20, background: '#e91e63' }
       line { centre 'Red',         width: 20, background: '#f44336' }
     end
+
+    view 'empty_interface' do
+      line { line '' }
+    end
   end
 
   Vedeu.focus_by_name 'main_interface'

data/lib/vedeu/all.rb

@@ -46,7 +46,6 @@ require 'vedeu/geometry/dimension'
 require 'vedeu/geometry/geometry'
 require 'vedeu/geometry/geometries'
 require 'vedeu/geometry/grid'
-require 'vedeu/geometry/position_index'
 require 'vedeu/geometry/position'
 
 require 'vedeu/colours/escape_sequences'

data/lib/vedeu/colours/colour_translator.rb

@@ -50,6 +50,11 @@ module Vedeu
       @colour = colour || ''
     end
 
+    # @return [Boolean]
+    def empty?
+      colour.nil? || colour.to_s.empty?
+    end
+
     # An object is equal when its values are the same.
     #
     # @param other [Vedeu::Views::Char]
@@ -62,7 +67,7 @@ module Vedeu
     # @return [String]
     # @see Vedeu::ColourTranslator
     def escape_sequence
-      if no_colour?
+      if empty?
         ''
 
       elsif registered?(colour)
@@ -124,11 +129,6 @@ module Vedeu
       repository.registered?(colour)
     end
 
-    # @return [Boolean]
-    def no_colour?
-      colour.nil? || colour.to_s.empty?
-    end
-
     # @return [Boolean]
     def named?
       colour.is_a?(Symbol) && valid_name?

data/lib/vedeu/cursor/cursor.rb

@@ -62,18 +62,6 @@ module Vedeu
       @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
-    # Override Ruby's Object#inspect method to provide a more helpful output.
-    #
-    # @return [String]
-    def inspect
-      "<Vedeu::Cursor (#{name}, " \
-      "#{visible}, "              \
-      "x:#{x}, "                  \
-      "y:#{y}, "                  \
-      "ox:#{ox}, "                \
-      "oy:#{oy})>"
-    end
-
     # Renders the cursor.
     #
     # @return [void]

data/lib/vedeu/dsl.rb

@@ -4,8 +4,31 @@ module Vedeu
   #
   module DSL
 
+    protected
+
+    # @!attribute [r] client
+    # @return [Object] The object instance where the DSL is being used.
+    attr_reader :client
+
+    # @!attribute [r] model
+    # @return [void] The new model object which the DSL is constructing.
+    attr_reader :model
+
     private
 
+    # Returns the default attributes for the new model.
+    #
+    # @note
+    #   Specific DSL classes may be overriding this method.
+    #
+    # @return [Hash<Symbol => void>]
+    def attributes
+      {
+        client: client,
+        parent: model,
+      }
+    end
+
     # :nocov:
     # Attempts to find the missing method on the client object.
     #

data/lib/vedeu/dsl/border.rb

@@ -337,16 +337,6 @@ module Vedeu
         model.vertical = char
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Border]
-      attr_reader :model
-
     end # Border
 
   end # DSL

data/lib/vedeu/dsl/composition.rb

@@ -117,23 +117,13 @@ module Vedeu
         model.add(new_model)
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Views::Composition]
-      attr_reader :model
-
       private
 
       # @param name [String]
       # @param lines [Vedeu::Views::Lines]
       # @return [Hash]
       def template_attributes(name, lines)
-        new_attributes(name).merge!(lines: lines)
+        new_attributes(name).merge!(value: lines)
       end
 
       # Return the current attributes combined with the existing interface
@@ -153,14 +143,6 @@ module Vedeu
         Vedeu.interfaces.by_name(name).attributes
       end
 
-      # @return [Hash]
-      def attributes
-        {
-          client: client,
-          parent: model,
-        }
-      end
-
     end # Composition
 
   end # DSL

data/lib/vedeu/dsl/geometry.rb

@@ -262,16 +262,6 @@ module Vedeu
         model.yn = value
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Geometry]
-      attr_reader :model
-
     end # Geometry
 
   end # DSL

data/lib/vedeu/dsl/group.rb

@@ -71,16 +71,6 @@ module Vedeu
         model.add(interface_name)
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Group]
-      attr_reader :model
-
     end # Group
 
   end # DSL

data/lib/vedeu/dsl/interface.rb

@@ -307,26 +307,6 @@ module Vedeu
       alias_method :z_index, :zindex
       alias_method :z,       :zindex
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Interface]
-      attr_reader :model
-
-      private
-
-      # @return [Hash]
-      def attributes
-        {
-          client: client,
-          parent: model,
-        }
-      end
-
     end # Interface
 
   end # DSL

data/lib/vedeu/dsl/keymap.rb

@@ -116,16 +116,6 @@ module Vedeu
         model.name = value
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Keymap]
-      attr_reader :model
-
     end # Keymap
 
   end # DSL

data/lib/vedeu/dsl/line.rb

@@ -67,9 +67,9 @@ module Vedeu
                                              parent: model.parent, &block)
 
         elsif value
-          content = Vedeu::Views::Line.build(client:  client,
-                                             parent:  model.parent,
-                                             streams: [build_stream(value)])
+          content = Vedeu::Views::Line.build(client: client,
+                                             parent: model.parent,
+                                             value:  [build_stream(value)])
 
         else
           fail Vedeu::InvalidSyntax, 'block not given'
@@ -107,26 +107,8 @@ module Vedeu
       end
       alias_method :stream, :streams
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Views::Line]
-      attr_reader :model
-
       private
 
-      # @return [Hash]
-      def attributes
-        {
-          client: client,
-          parent: model,
-        }
-      end
-
       # @param value [String]
       # @return [Vedeu::Views::Stream]
       def build_stream(value)

data/lib/vedeu/dsl/menu.rb

@@ -68,16 +68,6 @@ module Vedeu
         model.name = value
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Menu]
-      attr_reader :model
-
     end # Menu
 
   end # DSL

data/lib/vedeu/dsl/stream.rb

@@ -29,18 +29,12 @@ module Vedeu
         model.add(model.class.build(attributes, &block))
       end
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Views::Stream]
-      attr_reader :model
-
       private
 
+      # Returns the default attributes for the new model.
+      #
+      # Overrides {Vedeu::DSL#attributes}.
+      #
       # @return [Hash]
       def attributes
         {

data/lib/vedeu/dsl/view.rb

@@ -250,26 +250,6 @@ module Vedeu
       end
       alias_method :line, :lines
 
-      protected
-
-      # @!attribute [r] client
-      # @return [Object]
-      attr_reader :client
-
-      # @!attribute [r] model
-      # @return [Vedeu::Views::View]
-      attr_reader :model
-
-      private
-
-      # @return [Hash]
-      def attributes
-        {
-          client: client,
-          parent: model,
-        }
-      end
-
     end # View
 
   end # DSL

data/lib/vedeu/geometry/geometry.rb

@@ -89,19 +89,6 @@ module Vedeu
       @attributes.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
-    # Override Ruby's Object#inspect method to provide a more helpful output.
-    #
-    # @return [String]
-    def inspect
-      '<Vedeu::Geometry '   \
-      "x:#{x} "             \
-      "xn:#{xn} "           \
-      "y:#{y} "             \
-      "yn:#{yn} "           \
-      "centred:#{centred} " \
-      "maximise:#{maximised}>"
-    end
-
     # Will maximise the named interface geometry. This means it will occupy all
     # of the available space on the terminal window.
     #

data/lib/vedeu/geometry/position.rb

@@ -46,6 +46,17 @@ module Vedeu
       @x = (x.nil? || x < 1) ? 1 : x
     end
 
+    # Converts a position into an index for the terminal. An index is the
+    # position minus 1.
+    #
+    # @return [Array<Fixnum>]
+    def as_indices
+      xi = ((x - 1) <= 1) ? 0 : (x - 1)
+      yi = ((y - 1) <= 1) ? 0 : (y - 1)
+
+      [yi, xi]
+    end
+
     # @param other [Vedeu::Position]
     # @return [Fixnum]
     def <=>(other)

data/lib/vedeu/models/escape.rb

@@ -34,13 +34,6 @@ module Vedeu
     end
     alias_method :==, :eql?
 
-    # Override Ruby's Object#inspect method to provide a more helpful output.
-    #
-    # @return [String]
-    def inspect
-      "<Vedeu::Escape '#{Vedeu::Esc.escape(to_s)}'>"
-    end
-
     # @return [String]
     def position
       Vedeu::Position.coerce(@position)