evidence 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2314c07b4b1873ae89834bd97ac81be2f0c1783
-  data.tar.gz: b297e819e4f1792b05dc3a49dde97066378aed13
+  metadata.gz: c4452c553dbfd933c77777214e88a3c6651b6d6b
+  data.tar.gz: 20caf0f7e7237d665f7198020b6ed992191e7c0e
 SHA512:
-  metadata.gz: 28d755cd6038e0c97bbee4ea1da7ed25940aaa8162887685a0da565b708c30cedcae3720ef0568d1d38fae1ee9560ce2a310fa01dafa3cc02c085b2f7745802d
-  data.tar.gz: 763e35c45812f677a1dc0448b80eab549396913cad12033dca7d5543ea822e63f0945ec746857460483c1dfbf4ebfe179f77bb3d561a7ebb97a7e34352665ff1
+  metadata.gz: 2df08138de4eb510a9ae6c055c780e8e2131df176dbb7552f53f72344f1a9707ad058970519f4e8786a492a0ef96915df4af7517429bb23d8d684fed1d8b64a1
+  data.tar.gz: 3b8c55e4d356e7074011ed7e074d3ff1dcea185f012b80d451763dc6807c53188cee143445dedbba58a8796903b79e85d17ecfce9c465d76eeac35692b964b32

data/lib/evidence/action_parser.rb

@@ -0,0 +1,55 @@
+module Evidence
+  class ActionParser
+
+    def initialize(pid, message, action_patterns)
+      @pid, @message = pid, message
+      @processes = Hash.new
+      @start_action_pattern, @end_action_pattern = action_patterns[:start], action_patterns[:end]
+    end
+
+    def to_proc
+      lambda do |log|
+        pid = @pid[log]
+        if @processes.has_key?(pid)
+          @processes[pid] << log
+          if end_action?(@message[log])
+            parse_action_logs(@processes.delete(pid))
+          end
+        else
+          if start_action?(@message[log])
+            @processes[pid] = [log]
+          end
+          nil
+        end
+      end
+    end
+
+    def parse_action_logs(logs)
+      {
+        request: request(@message[logs[0]]),
+        response: response(@message[logs[-1]]),
+        logs: logs
+      }
+    end
+
+    def end_action?(msg)
+      msg =~ @end_action_pattern
+    end
+
+    def start_action?(msg)
+      msg =~ @start_action_pattern
+    end
+
+    def request(msg)
+      to_hash(@start_action_pattern.match(msg))
+    end
+
+    def response(msg)
+      to_hash(@end_action_pattern.match(msg))
+    end
+
+    def to_hash(m)
+      Hash[m.names.map(&:to_sym).zip(m.captures)]
+    end
+  end
+end

data/lib/evidence/rails.rb

@@ -0,0 +1,27 @@
+module Evidence
+  def rails2_action_patterns
+    {
+      start: /^
+          (\#012\#012)?             # ignore encoded newlines
+          Processing\s+
+          (?<controller>\w+)\#(?<action>\w+)\s+
+          \(for\s+
+          (?<remote_addr>[^\s]+)\s+
+          at\s+
+          (?<timestamp>[^\)]+)\)\s+
+          \[(?<method>[\w]+)\]
+        $/x,
+      end: /^
+          Completed\sin\s
+          (?<completed_time>\d+)ms\s+
+          \((View\:\s(?<view_time>\d+))?
+          \s*,?\s*
+          (\s*DB\:\s(?<db_time>\d+))?
+          \)\s+\|\s+
+          (?<code>\d+)\s+
+          (?<status>\w+)\s+
+          \[(?<url>.+)\]
+        $/x
+    }
+  end
+end

data/lib/evidence/rails_action_parser.rb

@@ -1,9 +1,10 @@
 module Evidence
-  class RailsActionParser
+  class ActionParser
 
-    def initialize(pid, message)
+    def initialize(pid, message, action_patterns)
       @pid, @message = pid, message
       @processes = Hash.new
+      @start_action_pattern, @end_action_pattern = action_patterns[:start], action_patterns[:end]
     end
 
     def to_proc
@@ -32,46 +33,19 @@ module Evidence
     end
 
     def end_action?(msg)
-      msg =~ end_action_pattern
+      msg =~ @end_action_pattern
     end
 
     def start_action?(msg)
-      msg =~ start_action_pattern
+      msg =~ @start_action_pattern
     end
 
     def request(msg)
-      to_hash(start_action_pattern.match(msg))
+      to_hash(@start_action_pattern.match(msg))
     end
 
     def response(msg)
-      to_hash(end_action_pattern.match(msg))
-    end
-
-    def start_action_pattern
-      /^
-        (\#012\#012)?             # ignore encoded newlines
-        Processing\s+
-        (?<controller>\w+)\#(?<action>\w+)\s+
-        \(for\s+
-        (?<remote_addr>[^\s]+)\s+
-        at\s+
-        (?<timestamp>[^\)]+)\)\s+
-        \[(?<method>[\w]+)\]
-      $/x
-    end
-
-    # Completed in 755ms (View: 330, DB: 215) | 200 OK [url]
-    def end_action_pattern
-      /^
-        Completed\sin\s
-        (?<completed_time>\d+)ms\s+
-        \(View\:\s(?<view_time>\d+)
-        (,\s*DB\:\s(?<db_time>\d+))?
-        \)\s+\|\s+
-        (?<code>\d+)\s+
-        (?<status>\w+)\s+
-        \[(?<url>.+)\]
-      $/x
+      to_hash(@end_action_pattern.match(msg))
     end
 
     def to_hash(m)

data/lib/evidence.rb

@@ -1,5 +1,6 @@
 require 'evidence/lazy'
-require 'evidence/rails_action_parser'
+require 'evidence/rails'
+require 'evidence/action_parser'
 
 Enumerator::Lazy.send(:include, Evidence::Lazy)
 
@@ -17,12 +18,16 @@ module Evidence
     end
   end
 
+  # default to rails 2
+  def rails_action_parser(pid, message, version=2)
+    rails2_action_parser(pid, message)
+  end
   # Parse out rails actions by given:
   #   pid: a lambda returns process id used to group logs
   #   message: a lambda returns rails log string message
   # example: logs.map(&rails_action_parser(pid, message)).compact
-  def rails_action_parser(pid, message)
-    RailsActionParser.new(pid, message)
+  def rails2_action_parser(pid, message)
+    ActionParser.new(pid, message, rails2_action_patterns)
   end
 
   # Rails action request timestamp parser

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evidence
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Xiao Li
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,7 +34,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- lib/evidence/action_parser.rb
 - lib/evidence/lazy.rb
+- lib/evidence/rails.rb
 - lib/evidence/rails_action_parser.rb
 - lib/evidence.rb
 - examples/mingle_logs_analysis.rb