request_recorder 0.0.8 → 0.0.9

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails2" do
+  gem "activerecord", "~>2.3.14"
+end
+
+appraise "rails3" do
+  gem "activerecord", "~>3.2.7"
+end

data/Gemfile

@@ -1,8 +1,9 @@
 source :rubygems
 gemspec
 
+gem "appraisal"
 gem "rake"
 gem "rspec", "~>2"
-gem "activerecord", "2.3.14"
+gem "activerecord"
 gem "sqlite3"
 gem "fakeredis"

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    request_recorder (0.0.8)
+    request_recorder (0.0.9)
+      activerecord
       rack
 
 GEM
@@ -10,6 +11,9 @@ GEM
     activerecord (2.3.14)
       activesupport (= 2.3.14)
     activesupport (2.3.14)
+    appraisal (0.4.1)
+      bundler
+      rake
     diff-lcs (1.1.3)
     fakeredis (0.4.0)
       redis (~> 3.0.0)
@@ -30,7 +34,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 2.3.14)
+  activerecord
+  appraisal
   fakeredis
   rake
   request_recorder!

data/Rakefile

@@ -1,9 +1,14 @@
 require "bundler/gem_tasks"
+require "appraisal"
 
-task :default do
+task :spec do
   sh "rspec spec/"
 end
 
+task :default do
+  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
+end
+
 # extracted from https://github.com/grosser/project_template
 rule /^version:bump:.*/ do |t|
   file = "lib/request_recorder/version.rb"

data/gemfiles/rails2.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "rake"
+gem "rspec", "~>2"
+gem "sqlite3"
+gem "fakeredis"
+gem "activerecord", "~>2.3.14"
+
+gemspec :path=>"../"

data/gemfiles/rails2.gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: /Users/mgrosser/code/tools/request_recorder
+  specs:
+    request_recorder (0.0.8)
+      activerecord
+      rack
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    appraisal (0.4.1)
+      bundler
+      rake
+    diff-lcs (1.1.3)
+    fakeredis (0.4.1)
+      redis (~> 3.0.0)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    redis (3.0.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    sqlite3 (1.3.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 2.3.14)
+  appraisal
+  fakeredis
+  rake
+  request_recorder!
+  rspec (~> 2)
+  sqlite3

data/gemfiles/rails3.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source :rubygems
+
+gem "appraisal"
+gem "rake"
+gem "rspec", "~>2"
+gem "sqlite3"
+gem "fakeredis"
+gem "activerecord", "~>3.2.7"
+
+gemspec :path=>"../"

data/gemfiles/rails3.gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: /Users/mgrosser/code/tools/request_recorder
+  specs:
+    request_recorder (0.0.8)
+      activerecord
+      rack
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    appraisal (0.4.1)
+      bundler
+      rake
+    arel (3.0.2)
+    builder (3.0.4)
+    diff-lcs (1.1.3)
+    fakeredis (0.4.1)
+      redis (~> 3.0.0)
+    i18n (0.6.1)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    redis (3.0.2)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.2.7)
+  appraisal
+  fakeredis
+  rake
+  request_recorder!
+  rspec (~> 2)
+  sqlite3

data/lib/request_recorder/middleware.rb

@@ -2,12 +2,14 @@ require "stringio"
 require "rack/request"
 require "rack/response"
 require "request_recorder/repeater"
+require "active_record"
 
 module RequestRecorder
   class Middleware
     MARKER = "__request_recording"
     MAX_STEPS = 100
     SEPARATOR = "|"
+    NEED_AUTOFLUSH = (ActiveRecord::VERSION::MAJOR == 2)
 
     def initialize(app, options={})
       @app = app
@@ -60,7 +62,7 @@ module RequestRecorder
     def capture_logging
       old = [
         ActiveRecord::Base.logger.instance_variable_get("@log"),
-        ActiveRecord::Base.logger.auto_flushing,
+        (ActiveRecord::Base.logger.auto_flushing if NEED_AUTOFLUSH),
         ActiveRecord::Base.logger.level
       ]
 
@@ -68,14 +70,14 @@ module RequestRecorder
       repeater = Repeater.new([recorder, old[0]])
 
       ActiveRecord::Base.logger.instance_variable_set("@log", repeater)
-      ActiveRecord::Base.logger.auto_flushing = true
+      ActiveRecord::Base.logger.auto_flushing = true if NEED_AUTOFLUSH
       ActiveRecord::Base.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]
+        ActiveRecord::Base.logger.auto_flushing = old[1] if NEED_AUTOFLUSH
         ActiveRecord::Base.logger.level = old[2]
       end
     end

data/lib/request_recorder/repeater.rb

@@ -4,8 +4,28 @@ module RequestRecorder
       @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])
+        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

data/lib/request_recorder/version.rb

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

data/request_recorder.gemspec

@@ -9,5 +9,6 @@ Gem::Specification.new name, RequestRecorder::VERSION do |s|
   s.homepage = "http://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
   s.license = "MIT"
-  s.add_dependency "rack"
+  s.add_runtime_dependency "rack"
+  s.add_runtime_dependency "activerecord"
 end

data/spec/request_recorder/redis_logger_spec.rb

@@ -5,6 +5,12 @@ describe RequestRecorder::RedisLogger do
   let(:key){ RequestRecorder::RedisLogger::KEY }
   let(:logger){ RequestRecorder::RedisLogger.new(store) }
 
+  before do
+    # TODO this should not be necessary ...
+    # but BUNDLE_GEMFILE=gemfiles/rails2.gemfile rspec spec/ fails without
+    store.flushall
+  end
+
   it_behaves_like "a logger"
 
   context "#keys" do

data/spec/request_recorder_spec.rb

@@ -14,7 +14,7 @@ describe RequestRecorder do
 
   before do
     ActiveRecord::Base.logger.instance_variable_set("@log", original_logger)
-    ActiveRecord::Base.logger.auto_flushing = 1000
+    ActiveRecord::Base.logger.auto_flushing = 1000 if RequestRecorder::Middleware::NEED_AUTOFLUSH
     ActiveRecord::Base.logger.level = Logger::ERROR
   end
 
@@ -32,10 +32,18 @@ describe RequestRecorder do
   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
+    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
@@ -95,7 +103,7 @@ describe RequestRecorder 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
+    ActiveRecord::Base.logger.auto_flushing.should == 1000 if RequestRecorder::Middleware::NEED_AUTOFLUSH
     ActiveRecord::Base.logger.level.should == Logger::ERROR
   end
 

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "request_recorder/cache_logger"
 
 require "active_record"
 require "fakeredis"
+require "tempfile"
 
 ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new("/dev/null")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: request_recorder
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: michael@grosser.it
 executables: []
@@ -34,10 +50,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .travis.yml
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
+- gemfiles/rails2.gemfile
+- gemfiles/rails2.gemfile.lock
+- gemfiles/rails3.gemfile
+- gemfiles/rails3.gemfile.lock
 - lib/request_recorder.rb
 - lib/request_recorder/cache_logger.rb
 - lib/request_recorder/middleware.rb
@@ -64,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3361379851092162190
+      hash: 1368709697939297046
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3361379851092162190
+      hash: 1368709697939297046
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24