rawk_log 2.2.1 → 2.2.2

data/lib/rawk_log/command.rb

@@ -79,7 +79,11 @@ module RawkLog
     end
     
     def is_id?(word)
-      word =~ /^((\d+)|([\dA-F\-]{36}))$/i
+      word =~ /^((\d+(-.*)?)|([\dA-F\-]{36}))$/i
+    end
+    
+    def is_filename?(word)
+      word =~ /\.[a-z]{1,5}\d?$/i
     end
     
     def build_stats
@@ -153,6 +157,7 @@ module RawkLog
               end
               keywords
             end
+            keywords[-1] = '{filename}' if ! keywords.empty? and is_filename?(keywords[-1])
             k = "/#{keywords.join("/")}"
           end
         end

data/lib/rawk_log/stat.rb

@@ -4,8 +4,8 @@ module RawkLog
 
     DEFAULT_LABEL_SIZE = 30
 
-    HEADER                = "Count     Sum     Max  Median     Avg     Min     Std"
-    HEADER_NEW_LOG_FORMAT = "Count  Sum(s)     Max  Median     Avg     Min     Std"
+    HEADER                = "Count       Sum     Max  Median     Avg     Min     Std"
+    HEADER_NEW_LOG_FORMAT = "Count    Sum(s)     Max  Median     Avg     Min     Std"
 
     def initialize(key)
       @key=key
@@ -76,9 +76,9 @@ module RawkLog
     def to_s(label_size = DEFAULT_LABEL_SIZE)
       if count > 0
         if @new_log_format
-          sprintf("%*s %6d %7.2f %7d %7d %7d %7d %7d",-label_size, key,count,(sum.to_f/1000),max,median,average,min,standard_deviation)
+          sprintf("%*s %6d %9.2f %7d %7d %7d %7d %7d",-label_size, key,count,(sum.to_f/1000),max,median,average,min,standard_deviation)
         else
-          sprintf("%*s %6d %7.2f %7.2f %7.2f %7.2f %7.2f %7.2f",-label_size,key,count,sum,max,median,average,min,standard_deviation)
+          sprintf("%*s %6d %9.2f %7.2f %7.2f %7.2f %7.2f %7.2f",-label_size,key,count,sum,max,median,average,min,standard_deviation)
         end
       else
           sprintf("%*s %6d",-label_size,key,0)

data/lib/rawk_log/version.rb

@@ -1,3 +1,3 @@
 module RawkLog
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

data/test/examples/rails23.log

@@ -26,5 +26,5 @@ Rendering items/index
 Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
 
 Processing DocumentController#download (for 12.13.14.15 at 2012-12-13 11:49:03) [GET]
-Completed in 936ms (View: 1, DB: 31) | 200 OK [http://www.example.com/document/download/96164/Form 6 - Occupancy permit-2034-20156 / Unit 1.docx]
+Completed in 936ms (View: 1, DB: 31) | 200 OK [http://www.example.com/document/download/96164/Form 6 - Occupancy permit-2034-20156 - Unit 1.docx]
 

data/test/rails23_test.rb

@@ -30,6 +30,14 @@ class Rails23Test < Test::Unit::TestCase
     assert_match(/^\/items\s+5\s+0\.06/, @output)
   end
 
+  def test_recognises_ids_and_filenames
+    assert_match(/^\/document\/download\/{ID}\/{filename}/, @output)
+  end
+
+  def test_sums_entries
+    assert_match(/^\/items\s+5\s+0\.06/, @output)
+  end
+
   def test_exit_status
     assert_equal(0, @exit_status)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rawk_log
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors: