request_recorder 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    request_recorder (0.0.7)
+    request_recorder (0.0.8)
       rack
 
 GEM

data/lib/request_recorder/middleware.rb

@@ -1,6 +1,7 @@
 require "stringio"
 require "rack/request"
 require "rack/response"
+require "request_recorder/repeater"
 
 module RequestRecorder
   class Middleware
@@ -16,7 +17,7 @@ module RequestRecorder
     def call(env)
       # keep this part as fast as possible, since 99.99999% of requests will not need it
       return @app.call(env) unless (
-      (env["QUERY_STRING"] && env["QUERY_STRING"].include?(MARKER)) or
+        (env["QUERY_STRING"] && env["QUERY_STRING"].include?(MARKER)) or
         (env["HTTP_COOKIE"] && env["HTTP_COOKIE"].include?(MARKER))
       )
 
@@ -57,13 +58,16 @@ module RequestRecorder
     end
 
     def capture_logging
-      recorder = StringIO.new
       old = [
         ActiveRecord::Base.logger.instance_variable_get("@log"),
         ActiveRecord::Base.logger.auto_flushing,
         ActiveRecord::Base.logger.level
       ]
-      ActiveRecord::Base.logger.instance_variable_set("@log", recorder)
+
+      recorder = StringIO.new
+      repeater = Repeater.new([recorder, old[0]])
+
+      ActiveRecord::Base.logger.instance_variable_set("@log", repeater)
       ActiveRecord::Base.logger.auto_flushing = true
       ActiveRecord::Base.logger.level = Logger::DEBUG
       yield

data/lib/request_recorder/repeater.rb

@@ -0,0 +1,11 @@
+module RequestRecorder
+  class Repeater
+    def initialize(targets)
+      @targets = targets
+    end
+
+    def write(*args)
+      @targets.each{|t| t.write(*args) }
+    end
+  end
+end

data/lib/request_recorder/version.rb

@@ -1,3 +1,3 @@
 module RequestRecorder
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/request_recorder_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe RequestRecorder do
-  let(:original_logger){ ActiveSupport::BufferedLogger.new("/dev/null") }
+  let(:original_logger){ ActiveSupport::BufferedLogger.new("/dev/null").instance_variable_get("@log") }
   let(:activate_logger){ {"QUERY_STRING" => "__request_recording=10"} }
   let(:inner_app){ lambda{|env|
     Car.first
@@ -31,6 +31,13 @@ describe RequestRecorder do
     stored.values.last.should include "SELECT"
   end
 
+  it "still writes to the old log to keep us compliant with 'logging all requests'" do
+    recorder = StringIO.new
+    ActiveRecord::Base.logger.instance_variable_set("@log", recorder)
+    middleware.call(activate_logger)
+    recorder.string.should == stored.values.last
+  end
+
   it "starts with a given key" do
     middleware.call({"QUERY_STRING" => "__request_recording=10|abcdefg"})
     redis.hget(redis_key, "abcdefg").should include "SELECT"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_recorder
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -42,6 +42,7 @@ files:
 - lib/request_recorder/cache_logger.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
@@ -63,7 +64,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3121116752566984075
+      hash: 3361379851092162190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -72,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3121116752566984075
+      hash: 3361379851092162190
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24