earthquake 0.6.8 → 0.6.9

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.6.9

data/earthquake.gemspec

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

data/lib/earthquake/ext.rb

@@ -46,8 +46,8 @@ class String
   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}"
+      c = color || block.call(i)
+      "#{i.c(c)}#{applied_colors.join}"
     end
   end
 

data/lib/earthquake/output.rb

@@ -54,7 +54,7 @@ module Earthquake
     end
 
     def color_of(screen_name)
-      config[:colors][screen_name.to_i(36) % config[:colors].size]
+      config[:colors][screen_name.delete("^0-9A-Za-z_").to_i(36) % config[:colors].size]
     end
   end
 
@@ -92,8 +92,8 @@ module Earthquake
 
       text = item["text"].u
       text.gsub!(/\s+/, ' ') unless config[:raw_text]
-      text = text.coloring(/@([0-9A-Za-z_]+)/) { |i| color_of(i) }
-      text = text.coloring(/(?:^#([^\s]+))|(?:\s+#([^\s]+))/) { |i| color_of(i) }
+      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"]

metadata

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