vedeu 0.6.1 → 0.6.2

data/test/lib/vedeu/terminal/terminal_test.rb

@@ -14,7 +14,9 @@ module Vedeu
 
     describe '.open' do
       context 'when a block was not given' do
-        it { proc { Vedeu::Terminal.open }.must_raise(Vedeu::InvalidSyntax) }
+        it {
+          proc { Vedeu::Terminal.open }.must_raise(Vedeu::Error::InvalidSyntax)
+        }
       end
 
       it 'opens a new terminal console in raw mode' do
@@ -93,8 +95,6 @@ module Vedeu
     end
 
     describe '.resize' do
-      before { Vedeu.interfaces.reset }
-
       subject { described.resize }
 
       it { subject.must_be_instance_of(TrueClass) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vedeu
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Gavin Laking
@@ -283,13 +283,14 @@ files:
 - lib/vedeu/buffers/buffers.rb
 - lib/vedeu/buffers/virtual_buffer.rb
 - lib/vedeu/buffers/virtual_buffers.rb
+- lib/vedeu/colours/all.rb
 - lib/vedeu/colours/background.rb
 - lib/vedeu/colours/backgrounds.rb
 - lib/vedeu/colours/colour.rb
-- lib/vedeu/colours/colour_translator.rb
-- lib/vedeu/colours/colours.rb
 - lib/vedeu/colours/foreground.rb
 - lib/vedeu/colours/foregrounds.rb
+- lib/vedeu/colours/repository.rb
+- lib/vedeu/colours/translator.rb
 - lib/vedeu/common.rb
 - lib/vedeu/configuration/api.rb
 - lib/vedeu/configuration/cli.rb
@@ -331,10 +332,11 @@ files:
 - lib/vedeu/esc/borders.rb
 - lib/vedeu/esc/colours.rb
 - lib/vedeu/esc/esc.rb
+- lib/vedeu/events/aliases.rb
+- lib/vedeu/events/all.rb
+- lib/vedeu/events/collection.rb
 - lib/vedeu/events/event.rb
-- lib/vedeu/events/event_aliases.rb
-- lib/vedeu/events/event_collection.rb
-- lib/vedeu/events/events.rb
+- lib/vedeu/events/repository.rb
 - lib/vedeu/events/trigger.rb
 - lib/vedeu/exceptions.rb
 - lib/vedeu/geometry/area.rb
@@ -347,12 +349,13 @@ files:
 - lib/vedeu/input/editor/all.rb
 - lib/vedeu/input/editor/capture.rb
 - lib/vedeu/input/editor/cropper.rb
+- lib/vedeu/input/editor/cursor.rb
 - lib/vedeu/input/editor/document.rb
 - lib/vedeu/input/editor/documents.rb
 - lib/vedeu/input/editor/editor.rb
+- lib/vedeu/input/editor/insert.rb
 - lib/vedeu/input/editor/line.rb
 - lib/vedeu/input/editor/lines.rb
-- lib/vedeu/input/editor/virtual_cursor.rb
 - lib/vedeu/input/input.rb
 - lib/vedeu/input/input_translator.rb
 - lib/vedeu/input/key.rb
@@ -473,10 +476,10 @@ files:
 - test/lib/vedeu/colours/background_test.rb
 - test/lib/vedeu/colours/backgrounds_test.rb
 - test/lib/vedeu/colours/colour_test.rb
-- test/lib/vedeu/colours/colour_translator_test.rb
-- test/lib/vedeu/colours/colours_test.rb
 - test/lib/vedeu/colours/foreground_test.rb
 - test/lib/vedeu/colours/foregrounds_test.rb
+- test/lib/vedeu/colours/repository_test.rb
+- test/lib/vedeu/colours/translator_test.rb
 - test/lib/vedeu/common_test.rb
 - test/lib/vedeu/configuration/api_test.rb
 - test/lib/vedeu/configuration/cli_test.rb
@@ -509,10 +512,10 @@ files:
 - test/lib/vedeu/esc/borders_test.rb
 - test/lib/vedeu/esc/colours_test.rb
 - test/lib/vedeu/esc/esc_test.rb
-- test/lib/vedeu/events/event_aliases_test.rb
-- test/lib/vedeu/events/event_collection_test.rb
+- test/lib/vedeu/events/aliases_test.rb
+- test/lib/vedeu/events/collection_test.rb
 - test/lib/vedeu/events/event_test.rb
-- test/lib/vedeu/events/events_test.rb
+- test/lib/vedeu/events/repository_test.rb
 - test/lib/vedeu/events/trigger_test.rb
 - test/lib/vedeu/exceptions_test.rb
 - test/lib/vedeu/geometry/area_test.rb
@@ -524,12 +527,13 @@ files:
 - test/lib/vedeu/geometry/position_test.rb
 - test/lib/vedeu/input/editor/capture_test.rb
 - test/lib/vedeu/input/editor/cropper_test.rb
+- test/lib/vedeu/input/editor/cursor_test.rb
 - test/lib/vedeu/input/editor/document_test.rb
 - test/lib/vedeu/input/editor/documents_test.rb
 - test/lib/vedeu/input/editor/editor_test.rb
+- test/lib/vedeu/input/editor/insert_test.rb
 - test/lib/vedeu/input/editor/line_test.rb
 - test/lib/vedeu/input/editor/lines_test.rb
-- test/lib/vedeu/input/editor/virtual_cursor_test.rb
 - test/lib/vedeu/input/input_test.rb
 - test/lib/vedeu/input/input_translator_test.rb
 - test/lib/vedeu/input/key_test.rb
@@ -678,10 +682,10 @@ test_files:
 - test/lib/vedeu/colours/background_test.rb
 - test/lib/vedeu/colours/backgrounds_test.rb
 - test/lib/vedeu/colours/colour_test.rb
-- test/lib/vedeu/colours/colour_translator_test.rb
-- test/lib/vedeu/colours/colours_test.rb
 - test/lib/vedeu/colours/foreground_test.rb
 - test/lib/vedeu/colours/foregrounds_test.rb
+- test/lib/vedeu/colours/repository_test.rb
+- test/lib/vedeu/colours/translator_test.rb
 - test/lib/vedeu/common_test.rb
 - test/lib/vedeu/configuration/api_test.rb
 - test/lib/vedeu/configuration/cli_test.rb
@@ -714,10 +718,10 @@ test_files:
 - test/lib/vedeu/esc/borders_test.rb
 - test/lib/vedeu/esc/colours_test.rb
 - test/lib/vedeu/esc/esc_test.rb
-- test/lib/vedeu/events/event_aliases_test.rb
-- test/lib/vedeu/events/event_collection_test.rb
+- test/lib/vedeu/events/aliases_test.rb
+- test/lib/vedeu/events/collection_test.rb
 - test/lib/vedeu/events/event_test.rb
-- test/lib/vedeu/events/events_test.rb
+- test/lib/vedeu/events/repository_test.rb
 - test/lib/vedeu/events/trigger_test.rb
 - test/lib/vedeu/exceptions_test.rb
 - test/lib/vedeu/geometry/area_test.rb
@@ -729,12 +733,13 @@ test_files:
 - test/lib/vedeu/geometry/position_test.rb
 - test/lib/vedeu/input/editor/capture_test.rb
 - test/lib/vedeu/input/editor/cropper_test.rb
+- test/lib/vedeu/input/editor/cursor_test.rb
 - test/lib/vedeu/input/editor/document_test.rb
 - test/lib/vedeu/input/editor/documents_test.rb
 - test/lib/vedeu/input/editor/editor_test.rb
+- test/lib/vedeu/input/editor/insert_test.rb
 - test/lib/vedeu/input/editor/line_test.rb
 - test/lib/vedeu/input/editor/lines_test.rb
-- test/lib/vedeu/input/editor/virtual_cursor_test.rb
 - test/lib/vedeu/input/input_test.rb
 - test/lib/vedeu/input/input_translator_test.rb
 - test/lib/vedeu/input/key_test.rb

data/lib/vedeu/colours/colour_translator.rb

@@ -1,260 +0,0 @@
-module Vedeu
-
-  # Convert a CSS/HTML colour string into a terminal escape sequence.
-  #
-  # If provided with an empty value or a string it cannot convert, it will
-  # return an empty string.
-  #
-  # When provided with a named colour, uses the terminal's value for that
-  # colour. If a theme is being used with the terminal, which overrides the
-  # defaults, then the theme's colour will be used. The recognised names are:
-  # :black, :red, :green, :yellow, :blue, :magenta, :cyan, :white, :default.
-  #
-  # When a number between 0 and 255 is provided, Vedeu will use the terminal
-  # colour corresponding with that colour.
-  #
-  # Finally, when provided a CSS/HTML colour string e.g. '#ff0000', Vedeu will
-  # translate that to the 8-bit escape sequence or when you have a capable
-  # terminal and the `TERM=xterm-truecolor` environment variable set,
-  # a 24-bit representation.
-  #
-  # @todo More documentation required (create a fancy chart!)
-  #
-  class ColourTranslator
-
-    # @!attribute [r] colour
-    # @return [String]
-    attr_reader :colour
-    alias_method :value, :colour
-
-    # Produces new objects of the correct class from the value, ignores objects
-    # that have already been coerced.
-    #
-    # @param value [Object|NilClass]
-    # @return [Object]
-    def self.coerce(value)
-      if value.is_a?(self)
-        value
-
-      else
-        new(value)
-
-      end
-    end
-
-    # Return a new instance of Vedeu::ColourTranslator.
-    #
-    # @param colour [Fixnum|String|Symbol]
-    # @return [Vedeu::ColourTranslator]
-    def initialize(colour = '')
-      @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]
-    # @return [Boolean]
-    def eql?(other)
-      self.class == other.class && colour == other.colour
-    end
-    alias_method :==, :eql?
-
-    # @return [String]
-    # @see Vedeu::ColourTranslator
-    def escape_sequence
-      if empty?
-        ''
-
-      elsif registered?(colour)
-        retrieve(colour)
-
-      elsif rgb?
-        rgb
-
-      elsif numbered?
-        numbered
-
-      elsif named?
-        named
-
-      else
-        ''
-
-      end
-    end
-    alias_method :to_s, :escape_sequence
-    alias_method :to_str, :escape_sequence
-
-    # @return [String]
-    def to_html
-      return colour if rgb?
-
-      ''
-    end
-
-    private
-
-    # Retrieves the escape sequence for the HTML/CSS colour code.
-    #
-    # @param colour [String]
-    # @return [String]
-    def retrieve(colour)
-      repository.retrieve(colour)
-    end
-
-    # Registers a HTML/CSS colour code and escape sequence to reduce processing.
-    #
-    # @param colour [String] A HTML/CSS colour code.
-    # @param escape_sequence [String] The HTML/CSS colour code as an escape
-    #   sequence.
-    # @return [String]
-    def register(colour, escape_sequence)
-      repository.register(colour, escape_sequence)
-    end
-
-    # Returns a boolean indicating the HTML/CSS colour code has been registered.
-    #
-    # @param colour [String]
-    # @return [Boolean]
-    def registered?(colour)
-      repository.registered?(colour)
-    end
-
-    # @return [Boolean]
-    def named?
-      colour.is_a?(Symbol) && valid_name?
-    end
-
-    # Returns an escape sequence for a named background colour.
-    #
-    # @note
-    #   Valid names can be found at {Vedeu::Esc#codes}
-    #
-    # @return [String]
-    def named
-      "\e[#{named_codes}m"
-    end
-
-    # Returns a boolean indicating whether the colour provided is a valid named
-    # colour.
-    #
-    # @return [Boolean]
-    def valid_name?
-      Vedeu::Esc.codes.keys.include?(colour)
-    end
-
-    # Returns a boolean indicating whether the colour provided is a terminal
-    # numbered colour.
-    #
-    # @return [Boolean]
-    def numbered?
-      colour.is_a?(Fixnum) && valid_range?
-    end
-
-    # Returns an escape sequence.
-    #
-    # @return [String]
-    def numbered
-      "#{numbered_prefix}#{css_to_numbered}m"
-    end
-
-    # Returns a boolean indicated whether the colour is a valid HTML/CSS colour.
-    #
-    # @return [Boolean]
-    def rgb?
-      return true if colour =~ /^#([A-Fa-f0-9]{6})$/
-
-      false
-    end
-
-    # Returns an escape sequence.
-    #
-    # @return [String]
-    def rgb
-      if Vedeu::Configuration.colour_mode == 16_777_216
-        register(colour, format(rgb_prefix, *css_to_rgb))
-
-      else
-        numbered
-
-      end
-    end
-
-    # Returns a boolean indicating whether the numbered colour is within the
-    # range of valid terminal numbered colours.
-    #
-    # @return [Boolean]
-    def valid_range?
-      colour >= 0 && colour <= 255
-    end
-
-    # Returns a collection of converted HTML/CSS octets as their decimal
-    # equivalents.
-    #
-    # @example
-    #   colour = '#aadd55'
-    #   css_to_rgb # => [170, 221, 85]
-    #
-    # @return [Array]
-    def css_to_rgb
-      [
-        colour[1..2].to_i(16),
-        colour[3..4].to_i(16),
-        colour[5..6].to_i(16),
-      ]
-    end
-
-    # @return [Fixnum]
-    def css_to_numbered
-      if rgb?
-        [16, red, green, blue].inject(:+)
-
-      elsif numbered?
-        colour
-
-      end
-    end
-
-    # Takes the red component of {#css_to_rgb} and converts to the correct value
-    # for setting the terminal red value.
-    #
-    # @return [Fixnum]
-    def red
-      (css_to_rgb[0] / 51) * 36
-    end
-
-    # Takes the green component of {#css_to_rgb} and converts to the correct
-    # value for setting the terminal green value.
-    #
-    # @return [Fixnum]
-    def green
-      (css_to_rgb[1] / 51) * 6
-    end
-
-    # Takes the blue component of {#css_to_rgb} and converts to the correct
-    # value for setting the terminal blue value.
-    #
-    # @return [Fixnum]
-    def blue
-      (css_to_rgb[2] / 51) * 1
-    end
-
-    # @raise [Vedeu::NotImplemented] Subclasses of this class must implement
-    #   this method.
-    # @return [Vedeu::NotImplemented]
-    def not_implemented
-      fail Vedeu::NotImplemented, 'Subclasses implement this.'
-    end
-    alias_method :named_codes,     :not_implemented
-    alias_method :numbered_prefix, :not_implemented
-    alias_method :repository,      :not_implemented
-    alias_method :rgb_prefix,      :not_implemented
-
-  end # ColourTranslator
-
-end # Vedeu

data/lib/vedeu/colours/colours.rb

@@ -1,66 +0,0 @@
-module Vedeu
-
-  # Allows the storing of HTML/CSS colours and their respective escape
-  # sequences.
-  #
-  class Colours
-
-    # @!attribute [r] storage
-    # @return [Hash<String => String>]
-    attr_reader :storage
-
-    # Returns a new instance of Vedeu::Colours.
-    #
-    # @return [Vedeu::Colours]
-    def initialize
-      @storage = {}
-    end
-
-    # Registers a colour with respective escape sequence.
-    #
-    # @return [String]
-    def register(colour, escape_sequence)
-      storage.store(colour, escape_sequence)
-    end
-
-    # Returns a boolean indicating whether the colour has been registered.
-    #
-    # @param colour [String]
-    # @return [Boolean]
-    def registered?(colour)
-      return false unless colour
-
-      storage.key?(colour)
-    end
-
-    # Removes all stored colours.
-    #
-    # @return [Hash]
-    def reset!
-      storage.clear
-    end
-
-    # Retrieves the escape sequence of a registered colour.
-    #
-    # @return [String]
-    def retrieve(colour)
-      storage.fetch(colour, '')
-    end
-
-    # Retrieves the escape sequence of a registered colour, or registers the
-    # colour with its respective escape sequence.
-    #
-    # @return [String]
-    def retrieve_or_register(colour, escape_sequence)
-      if registered?(colour)
-        retrieve(colour)
-
-      else
-        register(colour, escape_sequence)
-
-      end
-    end
-
-  end # Colours
-
-end # Vedeu