earthquake 0.6.7 → 0.6.8

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/earthquake.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{earthquake}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo"]

data/lib/earthquake/ext.rb

@@ -43,6 +43,14 @@ class String
     "\e[#{codes.join(';')}m#{self}\e[0m"
   end
 
+  def coloring(pattern, color = nil, &block)
+    self.gsub(pattern) do |i|
+      applied_colors = self[0...$~.begin(0)].scan(/\e\[[\d;]+m/)
+      color ||= block.call(i)
+      "#{i.c(color)}#{applied_colors.join}"
+    end
+  end
+
   def u
     gsub(/&(lt|gt|amp|quot|apos);/) do |s|
       case s

data/lib/earthquake/output.rb

@@ -92,26 +92,14 @@ module Earthquake
 
       text = item["text"].u
       text.gsub!(/\s+/, ' ') unless config[:raw_text]
-      text.gsub!(/@([0-9A-Za-z_]+)/) do |i|
-        i.c(color_of($1))
-      end
-      text.gsub!(/(?:^#([^\s]+))|(?:\s+#([^\s]+))/) do |i|
-        i.c(color_of($1 || $2))
-      end
-      text.gsub!(URI.regexp(["http", "https"])) do |i|
-        i.c(:url)
-      end
+      text = text.coloring(/@([0-9A-Za-z_]+)/) { |i| color_of(i) }
+      text = text.coloring(/(?:^#([^\s]+))|(?:\s+#([^\s]+))/) { |i| color_of(i) }
+      text = text.coloring(URI.regexp(["http", "https"]), :url)
 
       if item["_highlights"]
         item["_highlights"].each do |h|
-          if config[:color][:highlight].nil?
-            c = color_of(h).to_i + 10
-          else
-            c = :highlight
-          end
-          text = text.gsub(/#{h}/i) do |i|
-            i.c(c)
-          end
+          color = config[:color][:highlight].nil? ? color_of(h).to_i + 10 : :highlight
+          text = text.coloring(/#{h}/i, color)
         end
       end
 

metadata

@@ -2,7 +2,7 @@
 name: earthquake
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - jugyo