request_recorder 0.2.4 → 0.3.0

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    request_recorder (0.2.4)
+    request_recorder (0.3.0)
       activerecord
+      logcast (>= 0.1.4)
       multi_json
       rack
 
@@ -31,6 +32,7 @@ GEM
       redis (~> 3.0.0)
     i18n (0.6.1)
     json (1.7.7)
+    logcast (0.1.4)
     multi_json (1.7.2)
     rack (1.5.2)
     rake (10.0.4)

data/gemfiles/rails2.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mgrosser/code/tools/request_recorder
   specs:
-    request_recorder (0.2.3)
+    request_recorder (0.2.4)
       activerecord
+      logcast (>= 0.1.4)
       multi_json
       rack
 
@@ -20,6 +21,7 @@ GEM
     fakeredis (0.4.2)
       redis (~> 3.0.0)
     json (1.7.7)
+    logcast (0.1.4)
     multi_json (1.7.2)
     rack (1.1.6)
     rake (10.0.4)

data/gemfiles/rails3.gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: /Users/mgrosser/code/tools/request_recorder
   specs:
-    request_recorder (0.2.3)
+    request_recorder (0.2.4)
       activerecord
+      logcast (>= 0.1.4)
       multi_json
       rack
 
@@ -31,6 +32,7 @@ GEM
       redis (~> 3.0.0)
     i18n (0.6.1)
     json (1.7.7)
+    logcast (0.1.4)
     multi_json (1.7.2)
     rack (1.5.2)
     rake (10.0.4)

data/lib/request_recorder/middleware.rb

@@ -1,20 +1,19 @@
 require "stringio"
 require "rack/request"
 require "rack/response"
-require "request_recorder/repeater"
 require "request_recorder/frontend"
 require "active_record"
 require "rack"
 require "rack/body_proxy" if defined?(Rack.release) && Rack.release >= "1.5"
 require "base64"
 require "multi_json"
+require "logcast/rails"
 
 module RequestRecorder
   class Middleware
     MARKER = "request_recorder"
     MAX_STEPS = 100
     SEPARATOR = "-"
-    NEED_AUTOFLUSH = (ActiveRecord::VERSION::MAJOR == 2)
     AUTH = :frontend_auth
 
     def initialize(app, options={})
@@ -154,27 +153,18 @@ module RequestRecorder
       string.gsub(/\e\[[\d;]+m/, "")
     end
 
-    def capture_logging
-      old = [
-        ActiveRecord::Base.logger.instance_variable_get("@log"),
-        (ActiveRecord::Base.logger.auto_flushing if NEED_AUTOFLUSH),
-        ActiveRecord::Base.logger.level
-      ]
-
+    def capture_logging(&block)
+      logger = ActiveRecord::Base.logger
       recorder = StringIO.new
-      repeater = Repeater.new([recorder, old[0]])
+      debug_level(logger){ logger.subscribe(Logger.new(recorder), &block) }
+      recorder.string
+    end
 
-      ActiveRecord::Base.logger.instance_variable_set("@log", repeater)
-      ActiveRecord::Base.logger.auto_flushing = true if NEED_AUTOFLUSH
-      ActiveRecord::Base.logger.level = Logger::DEBUG
+    def debug_level(logger)
+      old, logger.level = logger.level, Logger::DEBUG
       yield
-      recorder.string
     ensure
-      if old
-        ActiveRecord::Base.logger.instance_variable_set("@log", old[0])
-        ActiveRecord::Base.logger.auto_flushing = old[1] if NEED_AUTOFLUSH
-        ActiveRecord::Base.logger.level = old[2]
-      end
+      logger.level = old
     end
   end
 end

data/lib/request_recorder/version.rb

@@ -1,3 +1,3 @@
 module RequestRecorder
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/request_recorder.gemspec

@@ -12,4 +12,5 @@ Gem::Specification.new name, RequestRecorder::VERSION do |s|
   s.add_runtime_dependency "rack"
   s.add_runtime_dependency "multi_json"
   s.add_runtime_dependency "activerecord"
+  s.add_runtime_dependency "logcast", ">= 0.1.4"
 end

data/spec/request_recorder_spec.rb

@@ -3,28 +3,27 @@ require "spec_helper"
 describe RequestRecorder do
   class FooError < RuntimeError;end
 
-  let(:original_logger){ ActiveSupport::BufferedLogger.new("/dev/null").instance_variable_get("@log") }
-  let(:activate_logger){ {"QUERY_STRING" => "request_recorder=10"} }
-  let(:inner_app){ lambda{|env|
-    Car.first
-
-    (env["log"] || []).each { |line| ActiveRecord::Base.logger.info(line) }
-
-    if env["raise"]
-      # rails also logs errors
-      ActiveRecord::Base.logger.error(env["raise"])
-      raise FooError.new(env["raise"])
+  let(:activate_logger){{ "QUERY_STRING" => "request_recorder=10" }}
+  let(:middleware) { RequestRecorder::Middleware.new(inner_app, :store => RequestRecorder::RedisLogger.new(redis)) }
+  let(:inner_app) do
+    lambda do |env|
+      Car.first
+
+      (env["log"] || []).each { |line| ActiveRecord::Base.logger.info(line) }
+
+      if env["raise"]
+        # rails also logs errors
+        ActiveRecord::Base.logger.error(env["raise"])
+        raise FooError.new(env["raise"])
+      end
+      [200, {}, "assadasd"]
     end
-    [200, {}, "assadasd"]
-  } }
-  let(:middleware){ RequestRecorder::Middleware.new(inner_app, :store => RequestRecorder::RedisLogger.new(redis)) }
+  end
   let(:redis){ FakeRedis::Redis.new }
   let(:redis_key){ RequestRecorder::RedisLogger::KEY }
   let(:existing_request_id){ redis.hset(redis_key, "123_456", "BEFORE") ; "123_456"}
 
   before do
-    ActiveRecord::Base.logger.instance_variable_set("@log", original_logger)
-    ActiveRecord::Base.logger.auto_flushing = 1000 if RequestRecorder::Middleware::NEED_AUTOFLUSH
     ActiveRecord::Base.logger.level = Logger::ERROR
   end
 
@@ -50,21 +49,6 @@ describe RequestRecorder do
     stored.values.last.should include "FooBarError"
   end
 
-  it "still writes to the old log to keep us compliant with 'logging all requests'" do
-    if ActiveRecord::VERSION::MAJOR == 2
-      recorder = StringIO.new
-      ActiveRecord::Base.logger.instance_variable_set("@log", recorder)
-      middleware.call(activate_logger)
-      recorder.string.should == stored.values.last
-    else
-      Tempfile.open("xx") do |f|
-        ActiveRecord::Base.logger.instance_variable_set("@log", Logger.new(f.path))
-        middleware.call(activate_logger)
-        File.read(f.path).strip.should == stored.values.last.strip
-      end
-    end
-  end
-
   it "starts with a given key" do
     middleware.call({"QUERY_STRING" => "request_recorder=10-abcdefg"})
     redis.hget(redis_key, "abcdefg").should include "SELECT"
@@ -120,9 +104,6 @@ describe RequestRecorder do
 
   it "restores the AR logger after executing" do
     middleware.call(activate_logger)
-
-    ActiveRecord::Base.logger.instance_variable_get("@log").object_id.should == original_logger.object_id
-    ActiveRecord::Base.logger.auto_flushing.should == 1000 if RequestRecorder::Middleware::NEED_AUTOFLUSH
     ActiveRecord::Base.logger.level.should == Logger::ERROR
   end
 
@@ -194,16 +175,6 @@ describe RequestRecorder do
         }
       end
 
-      it "removes header length above max" do
-        status, headers, body = middleware.call(
-          "QUERY_STRING" => "request_recorder=10-xxx",
-          "success" => true,
-          "log" => Array.new(20).fill(("a" * 100))
-        )
-        headers["X-ChromeLogger-Data"].size.should be_within(200).of(1700)
-        decode(headers)["rows"].inspect.should include '"Removed:", "12", "lines"' # tells users that something was removed
-      end
-
       it "does not log without frontend_auth" do
         status, headers, body = middleware.call("QUERY_STRING" => "request_recorder=10-xxx")
         headers["X-ChromeLogger-Data"].should == nil

data/spec/spec_helper.rb

@@ -1,13 +1,13 @@
-require "request_recorder"
-require "request_recorder/redis_logger"
-require "request_recorder/cache_logger"
-
 require "active_record"
 require "fakeredis"
 require "tempfile"
 
 ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new("/dev/null")
 
+require "request_recorder"
+require "request_recorder/redis_logger"
+require "request_recorder/cache_logger"
+
 # connect
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_recorder
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logcast
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 description: 
 email: michael@grosser.it
 executables: []
@@ -80,7 +96,6 @@ files:
 - lib/request_recorder/frontend.rb
 - lib/request_recorder/middleware.rb
 - lib/request_recorder/redis_logger.rb
-- lib/request_recorder/repeater.rb
 - lib/request_recorder/version.rb
 - request_recorder.gemspec
 - spec/request_recorder/cache_logger_spec.rb
@@ -104,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2258445014574956169
+      hash: 1116155128447744450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2258445014574956169
+      hash: 1116155128447744450
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/request_recorder/repeater.rb

@@ -1,31 +0,0 @@
-module RequestRecorder
-  class Repeater
-    def initialize(targets)
-      @targets = targets
-    end
-
-    # Rails 2
-    def write(*args)
-      @targets.each{|t| t.write(*args) }
-    end
-
-    # Rails 3
-    def add(*args)
-      @targets.each do |t|
-        if t.respond_to?(:add)
-          t.add(*args)
-        else
-          t.write("#{args[1]}\n")
-        end
-      end
-    end
-
-    def level=(x)
-      @targets.each{|t| t.level = x if t.respond_to?(:level=) }
-    end
-
-    def level
-      @targets.detect{|t| t.respond_to?(:level) }.level
-    end
-  end
-end