shiny 0.3.1 → 0.3.2

data/README.rdoc

@@ -1,4 +1,4 @@
-= shiny
+= Shiny
 
 Shiny extends the ruby core string class with two methods, ansi and html. These two are proxy methods to provide a bunch of color and text formating methods.
 Over ansi there are the commen known ansi escape sequences available, bold, blink, underline and the whole colorful format things. The method html serves the same but in the html way, it makes the
@@ -10,6 +10,10 @@ standart w3c color names available and also a few other formats like overline, u
 
 == Usage
 
+First require it:
+
+  require 'shiny'
+
 Some ansi color examples:
 
   puts "magenta".ansi.magenta
@@ -41,7 +45,9 @@ Some other html effect examples:
   "overline".html.overline
   "line-through".html.line_through
 
-Some terminal helper examples: (include Shiny::Helpers)
+Some terminal helper examples:
+
+  include Shiny::Helpers
 
   say("green day?", :color => :green)
   say("fail!", :type => :error)

data/lib/shiny/ansi.rb

@@ -1,7 +1,7 @@
 module Shiny
-  # The ansi class serve a great list of color and a few format
-  # methods. To get an overview of all the generetad method, just look
-  # at the CODES hash
+  # The ansi class serves a large list of color and a few format
+  # methods. To get an overview of all the generated methods, just look
+  # at the CODES hash.
   #
   # Some color examples:
   #
@@ -53,7 +53,6 @@ module Shiny
       :on_bright_magenta =>  "\e[105m",
       :on_bright_cyan    =>  "\e[106m",
       :on_bright_white   =>  "\e[107m",
-      :reset             =>    "\e[0m",
       :bold              =>    "\e[1m",
       :underline         =>    "\e[4m",
       :negative          =>    "\e[7m",
@@ -69,16 +68,12 @@ module Shiny
     # Generate color instance methods
     # See CODES for a list of the created methods
     CODES.each do |code, value|
-      next if code == :reset
-      reset = CODES[:reset]
-      class_eval <<-DEF
-        def #{code.to_s}
-          @string = "#{value}" + @string + "#{reset}"
-          self
-        end
-      DEF
+      define_method code do
+        @string = "#{value}#{@string}\e[0m"
+        self
+      end
     end
-
+    
     # Remove all ansi escape sequences from the string
     #
     # @return [String] from ansi escape sequences cleaned

data/lib/shiny/helpers.rb

@@ -51,7 +51,13 @@ module Shiny
     # @param [String] sign ('#') The character around the message
     def wrap(message, sign="#")
       sign = sign[0] if  sign.length > 1
-      around = sign * (message.length + 4) + "\n"
+
+      to_ignore = 0
+      message.gsub(/\e\[[0-9]+m/) do |m|
+        to_ignore += m.length
+      end
+
+      around = sign * ((message.length - to_ignore) + 4) + "\n"
 
       output = ""
       output << around

data/lib/shiny/html.rb

@@ -2,46 +2,46 @@ module Shiny
   class HTML < Basic
     # List of the 17 w3c supported color names
     # @see http://www.w3.org/TR/CSS21/syndata.html#value-def-color
-    FORMATS = {
-      :black        => '<span style="color: black;">',
-      :silver       => '<span style="color: silver;">',
-      :gray         => '<span style="color: gray;">,',
-      :white        => '<span style="color: white;">',
-      :maroon       => '<span style="color: maroon;">',
-      :red          => '<span style="color: red;">',
-      :purple       => '<span style="color: purple;">',
-      :fuchsia      => '<span style="color: fuchsia;">',
-      :green        => '<span style="color: green;">',
-      :lime         => '<span style="color: lime;">',
-      :olive        => '<span style="color: olive;">',
-      :yellow       => '<span style="color: yellow;">',
-      :navy         => '<span style="color: navy;">',
-      :blue         => '<span style="color: blue;">',
-      :teal         => '<span style="color: teal;">',
-      :aqua         => '<span style="color: aqua;">',
-      :orange       => '<span style="color: orange;">',
-      :on_black     => '<span style="background-color: black;">',
-      :on_silver    => '<span style="background-color: silver;">',
-      :on_gray      => '<span style="background-color: gray;">',
-      :on_white     => '<span style="background-color: white;">',
-      :on_maroon    => '<span style="background-color: maroon;">',
-      :on_red       => '<span style="background-color: red;">',
-      :on_purple    => '<span style="background-color: purple;">',
-      :on_fuchsia   => '<span style="background-color: fuchsia;">',
-      :on_green     => '<span style="background-color: green;">',
-      :on_lime      => '<span style="background-color: lime;">',
-      :on_olive     => '<span style="background-color: olive;">',
-      :on_yellow    => '<span style="background-color: yellow;">',
-      :on_navy      => '<span style="background-color: navy;">',
-      :on_blue      => '<span style="background-color: blue;">',
-      :on_teal      => '<span style="background-color: teal;">',
-      :on_aqua      => '<span style="background-color: aqua;">',
-      :on_orange    => '<span style="background-color: orange;">',
-      :bold         => '<span style="font-weight: bold;">',
-      :underline    => '<span style="text-decoration: underline;">',
-      :overline     => '<span style="text-decoration: overline;">',
-      :line_through => '<span style="text-decoration: line-through;">',
-      :blink        => '<span style="text-decoration: blink;">'
+    STYLES = {
+      :black        => 'color: black',
+      :silver       => 'color: silver',
+      :gray         => 'color: gray',
+      :white        => 'color: white',
+      :maroon       => 'color: maroon',
+      :red          => 'color: red',
+      :purple       => 'color: purple',
+      :fuchsia      => 'color: fuchsia',
+      :green        => 'color: green',
+      :lime         => 'color: lime',
+      :olive        => 'color: olive',
+      :yellow       => 'color: yellow',
+      :navy         => 'color: navy',
+      :blue         => 'color: blue',
+      :teal         => 'color: teal',
+      :aqua         => 'color: aqua',
+      :orange       => 'color: orange',
+      :on_black     => 'background-color: black',
+      :on_silver    => 'background-color: silver',
+      :on_gray      => 'background-color: gray',
+      :on_white     => 'background-color: white',
+      :on_maroon    => 'background-color: maroon',
+      :on_red       => 'background-color: red',
+      :on_purple    => 'background-color: purple',
+      :on_fuchsia   => 'background-color: fuchsia',
+      :on_green     => 'background-color: green',
+      :on_lime      => 'background-color: lime',
+      :on_olive     => 'background-color: olive',
+      :on_yellow    => 'background-color: yellow',
+      :on_navy      => 'background-color: navy',
+      :on_blue      => 'background-color: blue',
+      :on_teal      => 'background-color: teal',
+      :on_aqua      => 'background-color: aqua',
+      :on_orange    => 'background-color: orange',
+      :bold         => 'font-weight: bold',
+      :underline    => 'text-decoration: underline',
+      :overline     => 'text-decoration: overline',
+      :line_through => 'text-decoration: line-through',
+      :blink        => 'text-decoration: blink'
     }
 
     # HTML span begin tag
@@ -51,14 +51,12 @@ module Shiny
     SPAN_END   = "</span>"
 
     # Generate html format instance methods
-    # See FORMATS for a list of created methods
-    FORMATS.each do |name, value|
-      class_eval <<-DEF
-        def #{name.to_s}
-          @string = '#{value}' + @string + '#{SPAN_END}'
-          self
-        end
-      DEF
+    # See STYLES for a list of created methods
+    STYLES.each do |name, value|
+      define_method name do
+        @string = "<span style=\"#{value};\">#{@string}</span>"
+        self
+      end
     end
 
     # Remove all html span format tags

data/spec/shiny_spec.rb

@@ -57,6 +57,15 @@ describe Shiny do
       $stdout.should_receive(:print).with(output)
       wrap("Hello I'm wrapped", "*")
     end
+
+    it "should not count escape sequences as characters" do
+      output =  "###########\n"
+      output += "# \e[31mI'm red\e[0m #\n"
+      output += "###########\n"
+
+      $stdout.should_receive(:print).with(output)
+      wrap("\e[31mI'm red\e[0m")
+    end
   end
 
   describe "#log" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Samuel Tonini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +01:00
+date: 2010-12-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency