vedeu 0.1.15 → 0.1.16

data/lib/vedeu/application.rb

@@ -1,15 +1,20 @@
 module Vedeu
-  ModeSwitch = Class.new(StandardError)
-
   class Application
+
+    # :nocov:
+    # @param options [Hash]
+    # @return []
     def self.start(options = {})
       new(options).start
     end
 
+    # @param options [Hash]
+    # @return [Application]
     def initialize(options = {})
       @options = options
     end
 
+    # @return []
     def start
       Terminal.open(mode) do
         Terminal.set_cursor_mode
@@ -78,5 +83,7 @@ module Vedeu
         mode:        :raw
       }
     end
+    # :nocov:
+
   end
 end

data/lib/vedeu/configuration.rb

@@ -1,41 +1,99 @@
 module Vedeu
   class Configuration
+
+    # @param args [Array]
+    # @return [Hash]
     def self.configure(args = [])
       new(args).configure
     end
 
+    # @return [Hash]
+    def self.options
+      new.options
+    end
+
+    # @param args [Array]
+    # @return [Configuration]
     def initialize(args = [])
-      @args    = args
-      @options = {}
+      @_options = {}
+      @args     = args
     end
 
+    # @return [Hash]
     def configure
       parser = OptionParser.new do |opts|
         opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
 
         opts.on('-1', '--run-once', 'Run application once.') do
-          options[:interactive] = false
+          _options[:interactive] = false
         end
 
         opts.on('-c', '--cooked', 'Run application in cooked mode.') do
-          options[:mode] = :cooked
+          _options[:mode] = :cooked
         end
 
         opts.on('-r', '--raw', 'Run application in raw mode (default).') do
-          options[:mode] = :raw
+          _options[:mode] = :raw
         end
 
         opts.on('-d', '--debug', 'Run application with debugging on.') do
-          options[:debug] = true
+          _options[:debug] = true
+        end
+
+        opts.on('-C',
+                '--colour-mode',
+                'Run application in either `16` or `256` colour mode.') do |mode|
+          if ['16', '256'].include?(mode)
+            _options[:colour_mode] = mode
+
+          else
+            exit
+
+          end
         end
       end
       parser.parse!(args)
 
-      options
+      _options
+    end
+
+    # @return [Hash]
+    def options
+      @options ||= defaults.merge!(@_options)
     end
 
     private
 
-    attr_accessor :args, :options
+    attr_accessor :args, :_options
+
+    def defaults
+      {
+        colour_mode: detect_colour_mode,
+        debug:       false,
+        interactive: true,
+        mode:        :raw
+      }
+    end
+
+    def detect_colour_mode
+      if ENV['VEDEUTERM']
+        case ENV['VEDEUTERM']
+        when /-256color$/  then 256
+        when /-truecolor$/ then 16777216
+        else
+          256
+        end
+
+      else
+        case ENV['TERM']
+        when /-256color$/, 'xterm' then 256
+        when /-color$/, 'rxvt'     then 16
+        else
+          256
+        end
+
+      end
+    end
+
   end
 end

data/lib/vedeu/launcher.rb

@@ -1,5 +1,13 @@
 module Vedeu
   class Launcher
+
+    # :nocov:
+    # @param argv [Array]
+    # @param stdin []
+    # @param stdout []
+    # @param stderr []
+    # @param kernel []
+    # @return [Launcher]
     def initialize(argv, stdin  = STDIN,
                          stdout = STDOUT,
                          stderr = STDERR,
@@ -12,6 +20,7 @@ module Vedeu
       @exit_code = 1
     end
 
+    # @return []
     def execute!
       $stdin, $stdout, $stderr = @stdin, @stdout, @stderr
 
@@ -35,5 +44,7 @@ module Vedeu
     def configuration
       Configuration.configure(argv)
     end
+    # :nocov:
+
   end
 end

data/lib/vedeu/models/attributes/background.rb

@@ -0,0 +1,29 @@
+module Vedeu
+  class Background < ColourTranslator
+
+    private
+
+    def named
+      ["\e[", background_codes[colour], "m"].join
+    end
+
+    def numbered
+      ["\e[48;5;", css_to_numbered, "m"].join
+    end
+
+    def rgb
+      if Terminal.colour_mode == 16777216
+        sprintf("\e[48;2;%s;%s;%sm", *css_to_rgb)
+
+      else
+        numbered
+
+      end
+    end
+
+    def background_codes
+      codes.inject({}){ |h, (k, v)| h.merge(k => v + 10) }
+    end
+
+  end
+end

data/lib/vedeu/models/attributes/coercions.rb

@@ -0,0 +1,30 @@
+module Vedeu
+  module Coercions
+    module ClassMethods
+
+      # Produces new objects of the correct class from attributes hashes,
+      # ignores objects that have already been coerced.
+      #
+      # @param values [Array|Hash]
+      # @return [Array]
+      def coercer(values)
+        return [] if values.nil? || values.empty?
+
+        [values].flatten.map do |value|
+          if value.is_a?(self)
+            value
+
+          else
+            self.new(value)
+
+          end
+        end
+      end
+    end
+
+    def self.included(receiver)
+      receiver.extend(ClassMethods)
+    end
+
+  end
+end

data/lib/vedeu/models/attributes/colour_translator.rb

@@ -1,35 +1,125 @@
 module Vedeu
   class ColourTranslator
-    def initialize(html_colour = '')
-      @html_colour = html_colour
-    end
 
-    def background
-      return '' unless valid?
+    # @param colour [String]
+    # @return [String]
+    def self.escape_sequence(colour = '')
+      new(colour).escape_sequence
+    end
 
-      sprintf("\e[48;2;%s;%s;%sm", *translate)
+    # @param colour [String]
+    # @return [ColourTranslator]
+    def initialize(colour = '')
+      @colour = colour
     end
 
-    def foreground
-      return '' unless valid?
+    # @return [String]
+    def escape_sequence
+      if no_colour?
+        ''
+
+      elsif named?
+        named
+
+      elsif numbered?
+        numbered
+
+      elsif rgb?
+        rgb
 
-      sprintf("\e[38;2;%s;%s;%sm", *translate)
+      else
+        ''
+
+      end
     end
 
     private
 
-    attr_reader :html_colour
+    attr_reader :colour
+
+    def no_colour?
+      colour.nil? || colour.to_s.empty?
+    end
+
+    def named?
+      colour.is_a?(Symbol) && valid_name?
+    end
 
-    def translate
+    def named
+      fail NotImplemented, 'Subclasses implement this.'
+    end
+
+    def valid_name?
+      codes.keys.include?(colour)
+    end
+
+    def numbered?
+      colour.is_a?(Fixnum) && valid_range?
+    end
+
+    def numbered
+      fail NotImplemented, 'Subclasses implement this.'
+    end
+
+    def valid_range?
+      colour >= 0 && colour <= 255
+    end
+
+    def rgb?
+      colour.is_a?(String) && valid_rgb?
+    end
+
+    def rgb
+      fail NotImplemented, 'Subclasses implement this.'
+    end
+
+    def valid_rgb?
+      colour =~ /^#([A-Fa-f0-9]{6})$/
+    end
+
+    def css_to_rgb
       [
-        html_colour[1..2].to_i(16),
-        html_colour[3..4].to_i(16),
-        html_colour[5..6].to_i(16)
+        colour[1..2].to_i(16),
+        colour[3..4].to_i(16),
+        colour[5..6].to_i(16)
       ]
     end
 
-    def valid?
-      html_colour.is_a?(String) && html_colour =~ /^#([A-Fa-f0-9]{6})$/
+    def css_to_numbered
+      if rgb?
+        [16, red, green, blue].inject(:+)
+
+      elsif numbered?
+        colour
+
+      end
+    end
+
+    def red
+      (css_to_rgb[0] / 51) * 36
     end
+
+    def green
+      (css_to_rgb[1] / 51) * 6
+    end
+
+    def blue
+      (css_to_rgb[2] / 51) * 1
+    end
+
+    def codes
+      {
+        black:   30,
+        red:     31,
+        green:   32,
+        yellow:  33,
+        blue:    34,
+        magenta: 35,
+        cyan:    36,
+        white:   37,
+        default: 39,
+      }
+    end
+
   end
 end

data/lib/vedeu/models/attributes/foreground.rb

@@ -0,0 +1,29 @@
+module Vedeu
+  class Foreground < ColourTranslator
+
+    private
+
+    def named
+      ["\e[", foreground_codes[colour], "m"].join
+    end
+
+    def numbered
+      ["\e[38;5;", css_to_numbered, "m"].join
+    end
+
+    def rgb
+      if Terminal.colour_mode == 16777216
+        sprintf("\e[38;2;%s;%s;%sm", *css_to_rgb)
+
+      else
+        numbered
+
+      end
+    end
+
+    def foreground_codes
+      codes
+    end
+
+  end
+end

data/lib/vedeu/models/attributes/presentation.rb

@@ -0,0 +1,15 @@
+module Vedeu
+  module Presentation
+
+    # @return [Colour]
+    def colour
+      @colour ||= Colour.new(attributes[:colour])
+    end
+
+    # @return [Style]
+    def style
+      @style ||= Style.new(attributes[:style])
+    end
+
+  end
+end

data/lib/vedeu/models/colour.rb

@@ -1,21 +1,25 @@
 module Vedeu
   class Colour
-    def initialize(attributes = {})
-      @attributes = attributes
-    end
 
-    def attributes
-      defaults.merge!(@attributes)
+    attr_reader :attributes
+
+    # @param attributes [Hash]
+    # @return [Colour]
+    def initialize(attributes = {})
+      @attributes = defaults.merge!(attributes)
     end
 
+    # @return [String]
     def foreground
-      @foreground ||= ColourTranslator.new(attributes[:foreground]).foreground
+      @foreground ||= Foreground.escape_sequence(attributes[:foreground])
     end
 
+    # @return [String]
     def background
-      @background ||= ColourTranslator.new(attributes[:background]).background
+      @background ||= Background.escape_sequence(attributes[:background])
     end
 
+    # @return [String]
     def to_s
       foreground + background
     end
@@ -28,5 +32,6 @@ module Vedeu
         background: ''
       }
     end
+
   end
 end