ansible 0.1.1 → 0.2.0

data/lib/ansible.rb

@@ -1,25 +1,9 @@
 module Ansible
   def escape_to_html(data)
-    data = span("none", 0, true) + data
-
-    { 30 => :black,
-      31 => :red,
-      32 => :green,
-      33 => :yellow,
-      34 => :blue,
-      35 => :magenta,
-      36 => :cyan,
-      37 => :white,
-      90 => :gray
-    }.each do |key, value|
-      data.gsub!(/\e\[(\d;)?#{key}m/) { |match|
-        span(value, $1)
-      }
-    end
-
-    data.gsub!(/\e\[0?m/, span("none"))
-    data.gsub!(/\e\[(\d;)?(\d+)m/) { |match|
-      span($2, $1)
+    data = span(true, "none") + data
+    data.gsub!(/\e\[0?m/, span(false, "none"))
+    data.gsub!(/\e\[([0-9;]+)m/) { |match|
+      span(false, *$1.split(';'))
     }
     data + "</span>"
   end
@@ -40,11 +24,15 @@ module Ansible
   end
 
   private
-    def span(klass, level=0, first=false)
+    def span(first, *codes)
       s = first ? "" : "</span>"
 
-      classes = ["ansible_#{klass}"]
-      classes << "ansible_bold" if level.to_i == 1
+      if codes.include?("none")
+        classes = ["ansible_none"]
+      else
+        classes = codes.reject{|c| c.to_i == 0}.map{|c| "ansible_#{c.to_i}"}
+      end
+
       s += %Q{<span class="#{classes.join(" ")}">}
       s
     end

data/lib/ansible/version.rb

@@ -1,3 +1,3 @@
 module AnsibleVersion
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/ansible_spec.rb

@@ -6,8 +6,8 @@ end
 
 describe Ansible do
   ANSIBLE_NONE = %Q{<span class="ansible_none">}
-  ANSIBLE_RED = %Q{<span class="ansible_red">}
-  ANSIBLE_GREEN = %Q{<span class="ansible_green ansible_bold">}
+  ANSIBLE_RED = %Q{<span class="ansible_31">}
+  ANSIBLE_GREEN = %Q{<span class="ansible_1 ansible_32">}
   subject { Helper.new } 
   describe "#ansi_escaped" do
     SAMPLE_TEXT = {
@@ -22,7 +22,9 @@ describe Ansible do
       "escaped text other" =>
            %Q{#{ANSIBLE_NONE}escaped </span>#{ANSIBLE_RED}text </span>#{ANSIBLE_GREEN}other</span>#{ANSIBLE_NONE}</span>#{ANSIBLE_NONE}</span>},
       "escaped text" =>
-           %Q{#{ANSIBLE_NONE}escaped </span><span class="ansible_95 ansible_bold">text</span>#{ANSIBLE_NONE}</span>},
+           %Q{#{ANSIBLE_NONE}escaped </span><span class="ansible_1 ansible_95">text</span>#{ANSIBLE_NONE}</span>},
+      "escaped text" =>
+           %Q{#{ANSIBLE_NONE}escaped </span><span class="ansible_42 ansible_37 ansible_1">text</span>#{ANSIBLE_NONE}</span>},
     }
 
     it "should render the text as html" do

metadata

@@ -2,7 +2,7 @@
 name: ansible
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Solano Labs
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-04 00:00:00 -07:00
-default_executable: 
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -70,7 +69,6 @@ files:
 - spec/ansible_spec.rb
 - spec/spec_helper.rb
 - stylesheets/ansible.css
-has_rdoc: true
 homepage: http://www.tddium.com/
 licenses: []
 
@@ -94,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tddium
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Fast ANSI->HTML conversion