colours 0.8.12 → 0.9.8

data/lib/colours/testing/testing.rb

@@ -9,9 +9,7 @@
 module Colours
 
   require 'colours/toplevel_methods/e.rb'
-  require 'colours/toplevel_methods/show_basic_colour_palette.rb'
-  require 'colours/toplevel_methods/make_colour.rb'
-  require 'colours/colour_table/colour_table.rb'
+  require 'colours/toplevel_methods/toplevel_methods.rb'
 
   # ========================================================================= #
   # === Colours.simple_colours_test

data/lib/colours/toplevel_methods/e.rb

@@ -2,23 +2,12 @@
 # Encoding: UTF-8
 # frozen_string_literal: true
 # =========================================================================== #
+# === Colours
+# =========================================================================== #
 # require 'colours/toplevel_methods/e.rb'
 # =========================================================================== #
 module Colours
 
-  require 'colours/constants/newline.rb'
-
-  begin
-    require 'colours/toplevel_methods/revert.rb'
-  rescue LoadError; end
-
-  # ========================================================================= #
-  # === ef
-  # ========================================================================= #
-  def ef(i)
-    e(i, false) # The variant without newlines.
-  end
-
   # ========================================================================= #
   # === Colours.e
   #
@@ -58,6 +47,13 @@ module Colours
     ::Colours.e(i, append_newline) # Point towards the class method of e().
   end; alias ci e # === ci
 
+  # ========================================================================= #
+  # === ef
+  # ========================================================================= #
+  def ef(i)
+    e(i, false) # The variant without newlines.
+  end
+
 end
 
 if __FILE__ == $PROGRAM_NAME

data/lib/colours/toplevel_methods/map_this_symbol_to_that_html_colour.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/ruby -w
+# Encoding: UTF-8
+# frozen_string_literal: true
+# =========================================================================== #
+# require 'colours/toplevel_methods/map_this_symbol_to_that_html_colour.rb'
+# =========================================================================== #
+module Colours
+
+  # ========================================================================= #
+  # === Colours.map_this_symbol_to_that_html_colour
+  #
+  # The job of this method is to map entries such as :bold_green to
+  # a corresponding HTML colour.
+  # ========================================================================= #
+  def self.map_this_symbol_to_that_html_colour(i)
+    if is_a_html_colour? i
+      i
+    else
+      case i
+      # ===================================================================== #
+      # === :cyanb
+      # ===================================================================== #
+      when :cyanb
+        :lightseagreen
+      # ===================================================================== #
+      # === :light_grey
+      # ===================================================================== #
+      when :light_grey
+        :lightgray
+      # ===================================================================== #
+      # === :bold_blue
+      # ===================================================================== #
+      when :bold_blue
+        :slateblue
+      # ===================================================================== #
+      # === :bold_red
+      # ===================================================================== #
+      when :bold_red, :redb
+        :crimson
+      # ===================================================================== #
+      # === :bold_yellow
+      # ===================================================================== #
+      when :bold_yellow
+        :goldenrod
+      # ===================================================================== #
+      # === :bold_green
+      # ===================================================================== #
+      when :bold_green
+        :seagreen
+      else
+        puts 'Unregistered input into the method '+__method__.to_s+': '+i.to_s
+        return i # We'll still return that input, though.
+      end
+    end
+  end
+
+end

data/lib/colours/toplevel_methods/{revert.rb → rev.rb}

@@ -1,42 +1,11 @@
 #!/usr/bin/ruby -w
 # Encoding: UTF-8
-# frozen_string_literal =  true
+# frozen_string_literal: true
 # =========================================================================== #
-# require 'colours/toplevel_methods/revert.rb'
+# require 'colours/toplevel_methods/rev.rb'
 # =========================================================================== #
 module Colours
 
-  require 'colours/constants/escape.rb'
-
-  # ========================================================================= #
-  # === Colours::COLOUR_NC
-  #
-  # Note that this will actually reset all attributes.
-  #
-  # The "\e[0m" sequence removes all attributes, including formatting
-  # and colours. It may be useful to add it to the end of each colour
-  # text - and this is what the Colours project is essentially doing.
-  #
-  # An alternative may be to assign REVERT to WHITE, but this seems
-  # to be incorrect according to the specification.
-  # ========================================================================= #
-  COLOUR_NC        = "#{ESC}0m" # No Colour.
-    REVERT         = COLOUR_NC    # === REVERT
-    REV            = COLOUR_NC    # === REV
-    CLOSING_TAG    = COLOUR_NC    # === CLOSING_TAG (also represented as "#{ESC}0m")
-    RESET          = COLOUR_NC    # === RESET
-    RESET_TERMINAL = COLOUR_NC    # === RESET_TERMINAL
-    CLEAR          = COLOUR_NC    # === CLEAR
-    COLOUR_RESET   = COLOUR_NC    # === COLOUR_RESET
-    DEFAULT_COLOUR = COLOUR_RESET # === DEFAULT_COLOUR
-
-  # ========================================================================= #
-  # === RESET_ALL_ATTRIBUTES
-  #
-  # This is essentially the same as COLOUR_NC / RESET.
-  # ========================================================================= #
-  RESET_ALL_ATTRIBUTES = "\x1b[0m"
-
   # ========================================================================= #
   # === @revert
   #
@@ -47,7 +16,9 @@ module Colours
   # ========================================================================= #
   # === Colours.set_revert
   # ========================================================================= #
-  def self.set_revert(i = :default)
+  def self.set_revert(
+      i = :default
+    )
     case i
     # ======================================================================= #
     # === :default
@@ -87,18 +58,4 @@ module Colours
   end; alias revert rev # === revert
        # alias default_colour rev
 
-  # ========================================================================= #
-  # === restore?
-  #
-  # This will restore to the default again.
-  # ========================================================================= #
-  def restore?
-    Colours.restore?
-  end; alias revert restore? # === revert
-       alias rev?   restore? # === rev?
-
-end
-
-if __FILE__ == $PROGRAM_NAME
-  pp Colours.rev
 end