logeater 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce5032b80ebdd86abf84a53642d881c1e61315ac
-  data.tar.gz: 215a2ba9e8e0d90dd14daa6a7df4baa7c2295fe4
+  metadata.gz: 4976cf2269f67a86ae95b9f6a182a527e15757c6
+  data.tar.gz: 07888882f6e46fbff69fea38a46672efcb766caa
 SHA512:
-  metadata.gz: f0a033a7a9e51498b21728cca217978dcd1b1145cddf2a704386558496e01e4949d1e91c0bd20bd411f6540d46ad9edd929adfc25dff2f3e484c365a0672164e
-  data.tar.gz: bd808f7f9d91d28b09b5ccc0f2e552319edf0f3f2e9e1b64495fe2b71ac7e906acbf7daa74d37ebb333823a31604877d6e10f968c1dba17f0e194cfd14f25ea6
+  metadata.gz: 930d7fc93409a85005d38a8529cf9f4357922894458da1a9fb02760d3d7ebebefe79d1069d165e37148500a59e0ad02be8364fc29b86a72069dd6dd985996dea
+  data.tar.gz: 47774aa8db964b8405673f750d7c666b98fdf4952b683ad3b1c9f37e7939b897388b01d9aaed489965445dd56a2d546d8bf1effc906c9367e22ab18ba5efec62

data/bin/logeater

@@ -1,39 +1,5 @@
 #!/usr/bin/env ruby
 
-require "logeater"
+require "logeater/cli"
 
-app = ARGV.shift
-unless app
-  puts "USAGE: logeater <app> <files...>"
-  exit
-end
-
-files = ARGV
-if files.empty?
-  puts "USAGE: logeater <app> <files...>"
-  exit
-end
-
-started_all = Time.now
-files.each_with_index do |file, i|
-  reader = Logeater::Reader.new(app, file, progress: true)
-  reader.remove_existing_entries!
-  
-  started_count = Logeater::Request.count
-  started_at = Time.now
-  reader.import
-  finished_at = Time.now
-  finished_count = Logeater::Request.count
-  
-  puts " > \e[34mImported \e[1m%d\e[0;34m requests in \e[1m%.2f\e[0;34m seconds (%d of %d)\e[0m\n\n" % [
-    finished_count - started_count,
-    finished_at - started_at,
-    i + 1,
-    files.length ]
-end
-
-finished_all = Time.now
-seconds = finished_all - started_all
-minutes = (seconds / 60).to_i
-seconds -= (minutes * 60)
-puts "Total time %d minutes, %.2f seconds" % [minutes, seconds]
+Logeater::CLI.start(ARGV)

data/db/migrate/20150207183757_change_requests_params_to_jsonb.rb

@@ -0,0 +1,9 @@
+class ChangeRequestsParamsToJsonb < ActiveRecord::Migration
+  def up
+    execute "alter table requests alter column params type jsonb using params::jsonb"
+  end
+
+  def down
+    execute "alter table requests alter column params type json using params::json"
+  end
+end

data/db/migrate/20150224021844_change_requests_path_to_text.rb

@@ -0,0 +1,9 @@
+class ChangeRequestsPathToText < ActiveRecord::Migration
+  def up
+    execute "alter table requests alter column path type text"
+  end
+
+  def down
+    execute "alter table requests alter column path type varchar"
+  end
+end

data/db/migrate/20150602022241_add_user_id_and_tester_bar_to_requests.rb

@@ -0,0 +1,6 @@
+class AddUserIdAndTesterBarToRequests < ActiveRecord::Migration
+  def change
+    add_column :requests, :user_id, :integer
+    add_column :requests, :tester_bar, :boolean
+  end
+end

data/db/schema.rb

@@ -9,35 +9,40 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150122021627) do
+ActiveRecord::Schema.define(version: 20150602022241) do
 
-  create_table "requests", :force => true do |t|
-    t.string   "app",           :null => false
-    t.string   "logfile",       :null => false
-    t.string   "uuid",          :null => false
-    t.string   "subdomain"
+  # These are extensions that must be enabled in order to support this database
+  enable_extension "plpgsql"
+
+  create_table "requests", force: :cascade do |t|
+    t.string   "app",           limit: 255, null: false
+    t.string   "logfile",       limit: 255, null: false
+    t.string   "uuid",          limit: 255, null: false
+    t.string   "subdomain",     limit: 255
     t.datetime "started_at"
     t.datetime "completed_at"
     t.integer  "duration"
-    t.string   "http_method"
-    t.string   "path"
-    t.json     "params"
-    t.string   "controller"
-    t.string   "action"
-    t.string   "remote_ip"
-    t.string   "format"
+    t.string   "http_method",   limit: 255
+    t.text     "path"
+    t.jsonb    "params"
+    t.string   "controller",    limit: 255
+    t.string   "action",        limit: 255
+    t.string   "remote_ip",     limit: 255
+    t.string   "format",        limit: 255
     t.integer  "http_status"
-    t.string   "http_response"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :null => false
+    t.string   "http_response", limit: 255
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.integer  "user_id"
+    t.boolean  "tester_bar"
   end
 
-  add_index "requests", ["app"], :name => "index_requests_on_app"
-  add_index "requests", ["controller", "action"], :name => "index_requests_on_controller_and_action"
-  add_index "requests", ["http_status"], :name => "index_requests_on_http_status"
-  add_index "requests", ["logfile"], :name => "index_requests_on_logfile"
-  add_index "requests", ["uuid"], :name => "index_requests_on_uuid", :unique => true
+  add_index "requests", ["app"], name: "index_requests_on_app", using: :btree
+  add_index "requests", ["controller", "action"], name: "index_requests_on_controller_and_action", using: :btree
+  add_index "requests", ["http_status"], name: "index_requests_on_http_status", using: :btree
+  add_index "requests", ["logfile"], name: "index_requests_on_logfile", using: :btree
+  add_index "requests", ["uuid"], name: "index_requests_on_uuid", unique: true, using: :btree
 
 end

data/lib/logeater/cli.rb

@@ -0,0 +1,81 @@
+require "thor"
+require "logeater"
+
+module Logeater
+  class CLI < Thor
+
+    desc "parse APP FILES", "parses files and writes their output to stdout"
+    def parse(app, *files)
+      if files.empty?
+        $stderr.puts "No files to parse"
+        return
+      end
+
+      started_all = Time.now
+      files.each_with_index do |file, i|
+        reader = Logeater::Reader.new(app, file, progress: true)
+
+        started_at = Time.now
+        requests = reader.parse
+        finished_at = Time.now
+
+        $stderr.puts " > \e[34mParsed \e[1m%d\e[0;34m requests in \e[1m%.2f\e[0;34m seconds (%d of %d)\e[0m\n\n" % [
+          requests,
+          finished_at - started_at,
+          i + 1,
+          files.length ]
+      end
+
+      finished_all = Time.now
+      seconds = finished_all - started_all
+      minutes = (seconds / 60).to_i
+      seconds -= (minutes * 60)
+      $stderr.puts "Total time %d minutes, %.2f seconds" % [minutes, seconds]
+    end
+
+    option :force, type: :boolean, desc: "Imports all specified files, overwiting previous imports if necessary"
+    option :progress, type: :boolean, desc: "Renders a progress bar while importing"
+    option :verbose, type: :boolean
+    desc "import APP FILES", "imports files"
+    def import(app, *files)
+      unless options[:force]
+        imported_files = Logeater::Request.where(app: app).pluck("DISTINCT logfile")
+        files.reject! { |file| imported_files.member? File.basename(files[0]) }
+      end
+
+      if files.empty?
+        $stderr.puts "No files to import"
+        return
+      end
+
+      started_all = Time.now
+      files.each_with_index do |file, i|
+        $stderr.puts " > \e[34mImporting \e[1m#{File.basename(file)}\e[0;34m (%d of %d)\e[0m\n\n" % [
+          i + 1,
+          files.length ]
+
+        reader = Logeater::Reader.new(app, file, options.slice(:progress, :verbose))
+        reader.remove_existing_entries!
+
+        started_count = Logeater::Request.count
+        started_at = Time.now
+        reader.import
+        finished_at = Time.now
+        finished_count = Logeater::Request.count
+
+        $stderr.puts " > \e[34mImported \e[1m%d\e[0;34m requests in \e[1m%.2f\e[0;34m seconds (%d of %d)\e[0m\n\n" % [
+          finished_count - started_count,
+          finished_at - started_at,
+          i + 1,
+          files.length ]
+      end
+
+      finished_all = Time.now
+      seconds = finished_all - started_all
+      minutes = (seconds / 60).to_i
+      seconds -= (minutes * 60)
+      $stderr.puts "Total time %d minutes, %.2f seconds" % [minutes, seconds]
+    end
+
+  end
+end

data/lib/logeater/params_parser.rb

@@ -40,10 +40,15 @@ module Logeater
       
       # [:@int, "10", [1, 14]]
       when :@int then sexp[1].to_i
-        
+      
       # [:@float, "10.56", [1, 14]]
       when :@float then sexp[1].to_f
       
+      # [:unary, :-@, [:@float, \\\"173.41\\\", [1, 17285]]]
+      when :unary then
+        return -identify(sexp[2]) if sexp[1] == :-@
+        raise Parser::ParserNotImplemented, "Unknown unary operator: #{sexp[1].inspect}"
+      
       # [:var_ref, [:@kw, "true", [1, 12]]]
       when :var_ref then
         return true if sexp[1][1] == "true"
@@ -54,7 +59,7 @@ module Logeater
       # [:array, [[:@int, "1", [1, 9]], [:@int, "4", [1, 12]]]]
       # [:array, nil]
       when :array then sexp[1] ? sexp[1].map { |sexp| identify(sexp) } : []
-        
+      
       #  [:hash,
       #    [:assoclist_from_args,
       #     [[:assoc_new,

data/lib/logeater/parser.rb

@@ -14,20 +14,10 @@ module Logeater
       (?<message>.*)
     $/x.freeze
     
-    TIMESTAMP_MATCHER = /
-      (?<year>\d\d\d\d)\-
-      (?<month>\d\d)\-
-      (?<day>\d\d)T
-      (?<hours>\d\d):
-      (?<minutes>\d\d):
-      (?<seconds>\d\d(?:\.\d+))
-    /x.freeze
-    
-    HTTP_VERBS = %w{DELETE GET HEAD OPTIONS PATCH POST PUT}.freeze
-    
     REQUEST_LINE_MATCHER = /^
     \[(?<subdomain>[^\]]+)\]\s
     \[(?<uuid>[\w\-]{36})\]\s+
+ (?:\[(?:guest|user\.(?<user_id>\d+)(?<tester_bar>:cph)?)\]\s+)?
       (?<message>.*)
     $/x.freeze
     
@@ -53,7 +43,7 @@ module Logeater
     REQUEST_COMPLETED_MATCHER = /^
       Completed\s
       (?<http_status>\d\d\d)\s
-      (?<http_response>.*)\sin\s
+      (?:(?<http_response>.*)\s)?in\s
       (?<duration>[\d\.]+)(?<units>ms)\b
     /x.freeze # optional: (Views: 0.1ms | ActiveRecord: 50.0ms)
     
@@ -61,20 +51,13 @@ module Logeater
       match = line.match LINE_MATCHER
       raise UnmatchedLine.new(line) unless match
       
-      timestamp = match["timestamp"]
-      time = timestamp.match TIMESTAMP_MATCHER
-      raise MalformedTimestamp.new(timestamp) unless time
-      time = Time.new(*time.captures[0...-1], BigDecimal.new(time["seconds"]))
-      
-      message = match["message"]
-      
       result = {
         type: :generic,
-        timestamp: time,
+        timestamp: match["timestamp"],
         log_level: match["log_level"],
-        message: message }
-      
-      result.merge(parse_message(message))
+        message: match["message"]
+      }.merge(
+        parse_message(match["message"]))
     end
     
     def parse_message(message)
@@ -82,71 +65,58 @@ module Logeater
       return {} unless match
       
       message = match["message"]
-      type = identify_request_line_type(message)
       
       { subdomain: match["subdomain"],
         uuid: match["uuid"],
-        type: type,
-        message: message }.merge(
-        custom_attributes_for(type, message))
-    end
-    
-    def identify_request_line_type(message)
-      return :request_started if message =~ /^Started (#{HTTP_VERBS.join("|")})/
-      return :request_controller if message.start_with? "Processing by "
-      return :request_params if message.start_with? "Parameters: "
-      return :request_completed if message =~ /^Completed \d\d\d/
-      :request_line
+        type: :request_line,
+        user_id: match["user_id"] && match["user_id"].to_i,
+        tester_bar: !!match["tester_bar"],
+        message: message
+      }.merge(
+        parse_message_extra(message))
     end
     
-    def custom_attributes_for(type, message)
-      attributes = send :"parse_#{type}_message", message
-      unless attributes
-        log "Unable to parse message identified as #{type.inspect}: #{message.inspect}"
-        return {}
-      end
-      attributes
-    end
-    
-    def parse_request_line_message(message)
+    def parse_message_extra(message)
+      match = message.match(REQUEST_STARTED_MATCHER)
+      return parse_request_started_message(match) if match
+      
+      match = message.match(REQUEST_CONTROLLER_MATCHER)
+      return parse_request_controller_message(match) if match
+      
+      match = message.match(REQUEST_PARAMETERS_MATCHER)
+      return parse_request_params_message(match) if match
+      
+      match = message.match(REQUEST_COMPLETED_MATCHER)
+      return parse_request_completed_message(match) if match
+      
       {}
     end
     
-    def parse_request_started_message(message)
-      match = message.match(REQUEST_STARTED_MATCHER)
-      return unless match
-      uri = Addressable::URI.parse(match["path"])
-      
-      { http_method: match["http_method"],
-        path: uri.path,
+    def parse_request_started_message(match)
+      { type: :request_started,
+        http_method: match["http_method"],
+        path: parsed_uri[match["path"]],
         remote_ip: match["remote_ip"] }
     end
     
-    def parse_request_controller_message(message)
-      match = message.match(REQUEST_CONTROLLER_MATCHER)
-      return unless match
-      
-      { controller: match["controller"].underscore.gsub(/_controller$/, ""),
+    def parse_request_controller_message(match)
+      { type: :request_controller,
+        controller: normalized_controller_name[match["controller"]],
         action: match["action"],
         format: match["format"] }
     end
     
-    def parse_request_params_message(message)
-      match = message.match(REQUEST_PARAMETERS_MATCHER)
-      return unless match
-      params = ParamsParser.new(match["params"])
-      
-      { params: params.parse! }
+    def parse_request_params_message(match)
+      { type: :request_params,
+        params: ParamsParser.new(match["params"]).parse! }
     rescue Logeater::Parser::MalformedParameters
       log "Unable to parse parameters: #{match["params"].inspect}"
       { params: match["params"] }
     end
     
-    def parse_request_completed_message(message)
-      match = message.match(REQUEST_COMPLETED_MATCHER)
-      return unless match
-      
-      { http_status: match["http_status"].to_i,
+    def parse_request_completed_message(match)
+      { type: :request_completed,
+        http_status: match["http_status"].to_i,
         http_response: match["http_response"],
         duration: match["duration"].to_i }
     end
@@ -157,5 +127,21 @@ module Logeater
       $stderr.puts "\e[33m#{statement}\e[0m"
     end
     
+    
+    
+    def initialize
+      @normalized_controller_name = Hash.new do |hash, controller_name|
+        hash[controller_name] = controller_name.underscore.gsub(/_controller$/, "")
+      end
+      
+      @parsed_uri = Hash.new do |hash, uri|
+        hash[uri] = Addressable::URI.parse(uri).path
+      end
+    end
+    
+  private
+    attr_reader :normalized_controller_name,
+                :parsed_uri
+    
   end
 end

data/lib/logeater/reader.rb

@@ -1,6 +1,7 @@
 require "logeater/request"
 require "zlib"
 require "ruby-progressbar"
+require "oj"
 
 module Logeater
   class Reader
@@ -24,12 +25,31 @@ module Logeater
       remove_existing_entries!
       import
     end
-      
+    
     def import
-      each_line(&method(:process_line!))
+      each_request do |attributes|
+        completed_requests.push Logeater::Request.new(attributes)
+        save! if completed_requests.length >= batch_size
+      end
       save!
     end
     
+    def parse(to: $stdout)
+      to << "["
+      first = true
+      each_request do |attributes|
+        if first
+          first = false
+        else
+          to << ",\n"
+        end
+
+        to << Oj.dump(attributes, mode: :compat)
+      end
+    ensure
+      to << "]"
+    end
+    
     def remove_existing_entries!
       Logeater::Request.where(app: app, logfile: filename).delete_all
     end
@@ -45,7 +65,7 @@ module Logeater
     def each_line
       File.open(path) do |file|
         io = File.extname(path) == ".gz" ? Zlib::GzipReader.new(file) : file
-        pbar = ProgressBar.create(title: filename, total: file.size, autofinish: false) if show_progress?
+        pbar = ProgressBar.create(title: filename, total: file.size, autofinish: false, output: $stderr) if show_progress?
         io.each_line do |line|
           yield line
           pbar.progress = file.pos if show_progress?
@@ -55,25 +75,37 @@ module Logeater
     end
     alias :scan :each_line
     
+    def each_request
+      count = 0
+      each_line do |line|
+        process_line! line do |request|
+          yield request
+          count += 1
+        end
+      end
+      count
+    end
+    
+    
     
   private
     attr_reader :parser, :requests, :completed_requests
     
-    def process_line!(line)
+    def process_line!(line, &block)
       attributes = parser.parse!(line)
       
       return if [:generic, :request_line].member? attributes[:type]
       
       if attributes[:type] == :request_started
         requests[attributes[:uuid]] = attributes
-          .slice(:uuid, :subdomain, :http_method, :path, :remote_ip)
+          .slice(:uuid, :subdomain, :http_method, :path, :remote_ip, :user_id, :tester_bar)
           .merge(started_at: attributes[:timestamp], logfile: filename, app: app)
         return
       end
       
       request_attributes = requests[attributes[:uuid]]
       unless request_attributes
-        log "Attempting to record #{attributes[:type].inspect}; but there is no request started with UUID #{attributes[:uuid].inspect}"
+        log "Attempting to record #{attributes[:type].inspect}; but there is no request started with UUID #{attributes[:uuid].inspect}" if verbose?
         return
       end
       
@@ -89,10 +121,8 @@ module Logeater
           .slice(:http_status, :http_response, :duration)
           .merge(completed_at: attributes[:timestamp])
         
-        completed_requests.push Logeater::Request.new(request_attributes)
+        yield request_attributes
         requests.delete attributes[:uuid]
-        
-        save! if completed_requests.length >= batch_size
       end
       
     rescue Logeater::Parser::UnmatchedLine

data/lib/logeater/request.rb

@@ -1,14 +1,9 @@
 require "active_record"
 require "activerecord-import"
-require "activerecord-postgres-json"
 
 module Logeater
   class Request < ActiveRecord::Base
     self.table_name = "requests"
-    
-    serialize :params, ActiveRecord::Coders::JSON
-    
-    
-    
+
   end
 end

data/lib/logeater/version.rb

@@ -1,3 +1,3 @@
 module Logeater
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/logeater.rb

@@ -5,9 +5,24 @@ require "logeater/version"
 require "yaml"
 require "erb"
 
-config_file = File.expand_path("../../db/config.yml", __FILE__)
-config = YAML.load(ERB.new(File.read(config_file)).result).with_indifferent_access
-ActiveRecord::Base.establish_connection config[ENV["RAILS_ENV"] || "development"]
+database_url = ENV["DATABASE_URL"] unless ENV["RAILS_ENV"] == "test"
+if database_url
+  uri = Addressable::URI.parse(database_url)
+  config = {
+    adapter: "postgresql",
+    encoding: "utf8",
+    min_messages: "WARNING",
+    database: uri.path[1..-1],
+    host: uri.host,
+    username: uri.user,
+    password: uri.password,
+    port: uri.port
+  }
+else
+  config_file = File.expand_path("../../db/config.yml", __FILE__)
+  config = YAML.load(ERB.new(File.read(config_file)).result).with_indifferent_access[ENV["RAILS_ENV"] || "development"]
+end
+ActiveRecord::Base.establish_connection config
 
 module Logeater
 end

data/logeater.gemspec

@@ -18,21 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 3.2.21"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activerecord", ">= 3.1.0", "< 5.0.0"
+  spec.add_dependency "activesupport", ">= 3.1.0", "< 5.0.0"
   spec.add_dependency "pg"
   spec.add_dependency "standalone_migrations"
   spec.add_dependency "addressable"
   spec.add_dependency "ruby-progressbar"
-  spec.add_dependency "activerecord-import", "~> 0.3.1"
-  spec.add_dependency "activerecord-postgres-json"
+  spec.add_dependency "activerecord-import"
+  spec.add_dependency "thor"
+  spec.add_dependency "oj"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", ">= 3.1.0", "< 5.0.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "shoulda-context"
-  spec.add_development_dependency "turn"
+  spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "database_cleaner"
 
 end

data/test/integration/logeater_test.rb

@@ -28,8 +28,8 @@ class LogeaterTest < ActiveSupport::TestCase
       assert_equal "single_request.log", request.logfile
       assert_equal "0fc5154a-c288-4bad-9c7a-de3d7e7d2496", request.uuid
       assert_equal "livingsaviorco", request.subdomain
-      assert_equal Time.new(2015, 1, 10, 15, 18, BigDecimal.new("12.064392")), request.started_at
-      assert_equal Time.new(2015, 1, 10, 15, 18, BigDecimal.new("12.262903")), request.completed_at
+      assert_equal Time.utc(2015, 1, 10, 15, 18, BigDecimal.new("12.064392")), request.started_at
+      assert_equal Time.utc(2015, 1, 10, 15, 18, BigDecimal.new("12.262903")), request.completed_at
       assert_equal 196, request.duration
       assert_equal "GET", request.http_method
       assert_equal "/people/1035826228", request.path

data/test/test_helper.rb

@@ -1,13 +1,15 @@
 ENV["RAILS_ENV"] = "test"
 require "rubygems"
-require "rails"
-require "rails/test_help"
+require "active_support/testing/autorun"
+require "active_support/test_case"
 require "pry"
 require "database_cleaner"
 require "shoulda/context"
-require "turn"
 require "logeater"
 
+require "minitest/reporters"
+Minitest::Reporters.use! [Minitest::Reporters::SpecReporter.new]
+
 load File.expand_path("../../db/schema.rb", __FILE__)
 
 DatabaseCleaner.strategy = :truncation

data/test/unit/params_parser_test.rb

@@ -16,6 +16,11 @@ class ParamsParserTest < ActiveSupport::TestCase
       assert_parses '{"person_id"=>10.56}' => {"person_id"=>10.56}
     end
     
+    should "handle negatives" do
+      assert_parses '{"person_id"=>-10}' => {"person_id"=>-10}
+      assert_parses '{"person_id"=>-10.56}' => {"person_id"=>-10.56}
+    end
+    
     should "handle booleans" do
       assert_parses '{"visible"=>true}' => {"visible"=>true}
     end

data/test/unit/parser_test.rb

@@ -33,7 +33,7 @@ class ParserTest < ActiveSupport::TestCase
     end
     
     should "identify the time, including milliseconds" do
-      assert_parses timestamp: Time.new(2015, 1, 10, 15, 18, BigDecimal.new("5.850839"))
+      assert_parses timestamp: "2015-01-10T15:18:05.850839"
     end
     
     should "identify the remainder of the log message" do
@@ -67,6 +67,56 @@ class ParserTest < ActiveSupport::TestCase
   
   
   
+  context "given a log line for a Rails request" do
+    context "that indicates the current user (who was logged in with the tester bar), it" do
+      setup do
+        @line = "I, [2015-01-10T15:18:05.850839 #18070]  INFO -- : [livingsaviorco] [2d89d962-57c4-47c9-a9e9-6a16a5f22a12] [user.902544074:cph] [gzip] Compress reponse by 42.2 KB (83.3%)  (1.4ms)"
+      end
+      
+      should "identify the user's id" do
+        assert_parses user_id: 902544074
+      end
+      
+      should "notice that the user was logged-in with the tester bar" do
+        assert_parses tester_bar: true
+      end
+    
+      should "identify the remainder of the log message" do
+        assert_parses message: "[gzip] Compress reponse by 42.2 KB (83.3%)  (1.4ms)"
+      end
+    end
+    
+    context "that indicates the current user (who was not logged in with the tester bar), it" do
+      setup do
+        @line = "I, [2015-01-10T15:18:05.850839 #18070]  INFO -- : [livingsaviorco] [2d89d962-57c4-47c9-a9e9-6a16a5f22a12] [user.902544074] [gzip] Compress reponse by 42.2 KB (83.3%)  (1.4ms)"
+      end
+      
+      should "identify the user's id" do
+        assert_parses user_id: 902544074
+      end
+      
+      should "notice that the user was not logged-in with the tester bar" do
+        assert_parses tester_bar: false
+      end
+    
+      should "identify the remainder of the log message" do
+        assert_parses message: "[gzip] Compress reponse by 42.2 KB (83.3%)  (1.4ms)"
+      end
+    end
+    
+    context "that indicates that the user is logged out, it" do
+      setup do
+        @line = "I, [2015-01-10T15:18:05.850839 #18070]  INFO -- : [livingsaviorco] [2d89d962-57c4-47c9-a9e9-6a16a5f22a12] [guest] [gzip] Compress reponse by 42.2 KB (83.3%)  (1.4ms)"
+      end
+    
+      should "identify the remainder of the log message" do
+        assert_parses message: "[gzip] Compress reponse by 42.2 KB (83.3%)  (1.4ms)"
+      end
+    end
+  end
+  
+  
+  
   context "given the \"Started\" line, it" do
     setup do
       @line = "I, [2015-01-10T15:18:12.064392 #2354]  INFO -- : [livingsaviorco] [0fc5154a-c288-4bad-9c7a-de3d7e7d2496] Started GET \"/people/1035826228?refresh_page=true\" for 71.218.222.249 at 2015-01-10 15:18:12 +0000"
@@ -155,6 +205,16 @@ class ParserTest < ActiveSupport::TestCase
     end
   end
   
+  context "when the \"Completed\" line doesn't have a textual description of the status, it" do
+    setup do
+      @line = "I, [2015-01-10T15:18:12.262903 #2354]  INFO -- : [livingsaviorco] [0fc5154a-c288-4bad-9c7a-de3d7e7d2496] Completed 307 in 0.8ms"
+    end
+    
+    should "be cool with that" do
+      assert_parses http_status: 307, http_response: nil
+    end
+  end
+  
   context "when the \"Completed\" line contains a breakdown of times, it" do
     setup do
       @line = "I, [2015-01-10T15:18:12.262903 #2354]  INFO -- : [livingsaviorco] [0fc5154a-c288-4bad-9c7a-de3d7e7d2496] Completed 200 OK in 196ms (Views: 0.1ms | ActiveRecord: 50.0ms)"

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: logeater
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.21
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -98,18 +110,18 @@ dependencies:
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-postgres-json
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,53 +135,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +205,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -244,8 +250,12 @@ files:
 - db/config.yml
 - db/migrate/20150110151439_create_requests.rb
 - db/migrate/20150122021627_change_requests_params_to_json.rb
+- db/migrate/20150207183757_change_requests_params_to_jsonb.rb
+- db/migrate/20150224021844_change_requests_path_to_text.rb
+- db/migrate/20150602022241_add_user_id_and_tester_bar_to_requests.rb
 - db/schema.rb
 - lib/logeater.rb
+- lib/logeater/cli.rb
 - lib/logeater/params_parser.rb
 - lib/logeater/parser.rb
 - lib/logeater/parser_errors.rb