shog 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b76b9492d628aa816c7a48655b9ccf60fbbb67
-  data.tar.gz: 760570d2e3cf9e05d76ba40637bbe79d4b4438a3
+  metadata.gz: e10f5ef853af5fcbf4cb08c8ad1c9ea3bd2e052b
+  data.tar.gz: 7959b91a38b1127f3d3334f57c9a60b02588c48a
 SHA512:
-  metadata.gz: fa2b214992b45e4a17006556678a55ec0685d941cf029015adc3259bcc0ac310d6699a3462d70039b06f8cb5dd1c0942a0b9543798864979c323f14852c26157
-  data.tar.gz: 0548365aa47e8911eb6e5d397b55f964a6d915ff81d2fca5059ed0f80dd190380d521fce73dd3a7bbc65a733755b788e49006ee54bd1181c5091089f8d9c5033
+  metadata.gz: fdfb3ad47f314de243ab410374ff173556693e7d1a1c5f393892ec54b2c5826897d61a839392ea74e4f334be4bbc25974bee7c8f58bd279f0f4da33875d2bbe9
+  data.tar.gz: d8f5eb102d0cc7b74b7238b092543a6c6611e80ca65a91cc262fadcc5140dce9a748955572b290af81ccf7a824628c7e8ae3e70a4fda4606c31a33e28967d824

data/lib/shog.rb

@@ -2,6 +2,7 @@ require 'shog/version'
 require 'shog/formatter'
 require 'shog/formatters'
 require 'shog/rails'
+require 'shog/extensions'
 
 module Shog
 

data/lib/shog/extensions.rb

@@ -0,0 +1,17 @@
+module Shog
+  module Extensions
+    module Colored
+      extend self
+
+      # Removes any ASCII color encoding
+      def uncolorize
+        # http://refiddle.com/18rj
+        gsub /\e\[\d+(;\d+)*m/, ''
+      end
+
+
+    end
+  end
+end
+
+String.send :include, Shog::Extensions::Colored

data/lib/shog/formatter.rb

@@ -79,10 +79,10 @@ module Shog
     # @param [Float] expected maximum amount of time it should have taken.
     # @return [String] the formatted time.
     def format_time( time, expected = 30 )
-      timef = time.to_f
+      timef = time.uncolorize.to_f
       case
-      when timef > expected * 2 then time.to_s.red
-      when timef > expected     then time.to_s.yellow
+      when timef > expected * 2 then time.to_s.uncolorize.red
+      when timef > expected     then time.to_s.uncolorize.yellow
       else time
       end
     end
@@ -161,7 +161,7 @@ module Shog
     # Resets any previously configured formatting settings.
     # @return [Formatter] self.
     def reset_config!
-      @configuration ||= {
+      @configuration = {
         severity_tags: {},
         severities: {},
         matchers: {},

data/lib/shog/formatters/requests.rb

@@ -13,13 +13,13 @@ module Shog
           # Highlight HTTP request methods
           match /Started\s+(?<method>PUT|PATCH|GET|POST|DELETE)\s+(?<path>"[^"]*")[^\d\.]+(?<ip>[\d\.]+)(?<time>.*)/ do |msg,match|
             # http://refiddle.com/ge6
-            "#{match["method"].ljust 6} ".green.bold + " #{match["path"]} ".white.bold + " for " + "#{match["ip"]}".yellow + " #{match["time"]}".black.bold
+            "#{match["method"].ljust 6} ".green.bold + " #{match["path"]} ".white.bold + " for " + "#{match["ip"]}".yellow + " #{match["time"]}".black
           end
 
           # Dim detailed info about rendering views
           match /\s*Rendered\s+(?<view>[^\s]+)\swithin\s(?<layout>[^\s]+)\s\((?<time>.*)\)/ do |msg,match|
             # http://refiddle.com/18qr
-            "  Rendered #{ match["view"] } within ".black + match["layout"].black.bold + " " + format_time( match['time'].black )
+            "  Rendered #{ match["view"].bold }".black + " within ".black + match["layout"].black.bold + " " + format_time( match['time'].black )
           end
 
           # Highlight the final rendered response
@@ -34,7 +34,7 @@ module Shog
             parts << match['friendly'].yellow
             parts << 'in'
             parts << format_time( match['time'], 250 )
-            parts << match['details']
+            parts << match['details'].black
 
             parts.join(" ")
           end
@@ -48,9 +48,6 @@ module Shog
         end
       end
 
-
-
-
     end
   end
 end

data/lib/shog/version.rb

@@ -1,5 +1,5 @@
 module Shog
-  VERSION_NUMBER  = "0.1.1"
+  VERSION_NUMBER  = "0.1.2"
   VERSION_SUFFIX  = ""
   VERSION         = "#{VERSION_NUMBER}#{VERSION_SUFFIX}"
 end

data/spec/lib/shog/formatter_spec.rb

@@ -70,6 +70,10 @@ describe Shog::Formatter do
       expect( formatter.format_time( "50ms", 30 ) ).to eq "50ms".yellow
     end
 
+    it "is yellow when above expected and has existing color" do
+      expect( formatter.format_time( "50ms".black, 30 ) ).to eq "50ms".yellow
+    end
+
     it "is red when way above expected" do
       expect( formatter.format_time( "150ms", 30 ) ).to eq "150ms".red
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shog
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paul Alexander
@@ -103,6 +103,7 @@ files:
 - docs/images/plain.png
 - docs/images/shogged.png
 - lib/shog.rb
+- lib/shog/extensions.rb
 - lib/shog/formatter.rb
 - lib/shog/formatters.rb
 - lib/shog/formatters/defaults.rb