clogger 0.4.0 → 0.5.0

data/test/test_clogger.rb

@@ -55,6 +55,7 @@ class TestClogger < Test::Unit::TestCase
     assert_equal("302 Found", status)
     assert_equal({}, headers)
     body.each { |part| assert false }
+    body.close
     str = str.string
     r = %r{\Ahome - - \[[^\]]+\] "GET /hello\?goodbye=true HTTP/1.0" 302 -\n\z}
     assert_match r, str
@@ -134,7 +135,9 @@ class TestClogger < Test::Unit::TestCase
       'HTTP_COOKIE' => cookie,
     }
     req = @req.merge(req)
-    cl.call(req).last.each { |part| part }
+    body = cl.call(req).last
+    body.each { |part| part }
+    body.close
     str = str.string
     assert(str.size > 128)
     assert_match %r["echo and socat \\o/" "#{cookie}" \d+\.\d{3}], str
@@ -221,6 +224,7 @@ class TestClogger < Test::Unit::TestCase
     status, headers, body = cl.call(@req)
     tmp = []
     body.each { |s| tmp << s }
+    body.close
     assert_equal %w(a b c), tmp
     str = str.string
     assert_match %r[" 200 3 \d+\.\d{4}\n\z], str
@@ -279,6 +283,7 @@ class TestClogger < Test::Unit::TestCase
     cl = Clogger.new(app, :logger => str, :format => '$response_length')
     status, header, bodies = cl.call(@req)
     bodies.each { |part| part }
+    bodies.close
     assert_equal "-\n", str.string
   end
 
@@ -290,6 +295,7 @@ class TestClogger < Test::Unit::TestCase
     status, headers, body = cl.call(@req)
     tmp = []
     body.each { |s| tmp << s }
+    body.close
     assert_equal %w(a b c), tmp
     str = str.string
     assert_match %r[" 200 3 "-" "echo and socat \\o/"\n\z], str
@@ -402,7 +408,7 @@ class TestClogger < Test::Unit::TestCase
     req = Rack::Utils::HeaderHash.new(@req)
     app = lambda { |env| [302, [ %w(a) ], []] }
     cl = Clogger.new(app, :logger => str, :format => Rack_1_0)
-    assert_nothing_raised { cl.call(req).last.each {} }
+    assert_nothing_raised { cl.call(req).last.each {}.close }
     assert str.size > 0
   end
 
@@ -415,7 +421,7 @@ class TestClogger < Test::Unit::TestCase
     }
     app = lambda { |env| [302, [ %w(a) ], []] }
     cl = Clogger.new(app, :logger => str, :format => Rack_1_0)
-    assert_nothing_raised { cl.call(req).last.each {} }
+    assert_nothing_raised { cl.call(req).last.each {}.close }
     assert str.size > 0
   end
 
@@ -425,7 +431,7 @@ class TestClogger < Test::Unit::TestCase
     r = nil
     app = lambda { |env| [302, [ %w(a) ], [FooString.new(body)]] }
     cl = Clogger.new(app, :logger => str, :format => '$body_bytes_sent')
-    assert_nothing_raised { cl.call(@req).last.each { |x| r = x } }
+    assert_nothing_raised { cl.call(@req).last.each { |x| r = x }.close }
     assert str.size > 0
     assert_equal body.size.to_s << "\n", str.string
     assert_equal r, body

data/test/test_clogger_to_path.rb

@@ -0,0 +1,140 @@
+# -*- encoding: binary -*-
+$stderr.sync = $stdout.sync = true
+require "test/unit"
+require "date"
+require "stringio"
+require "rack"
+require "clogger"
+
+class MyBody < Struct.new(:to_path, :closed)
+  def each(&block)
+    raise RuntimeError, "each should never get called"
+  end
+
+  def close
+    self.closed = true
+  end
+end
+
+class TestCloggerToPath < Test::Unit::TestCase
+
+  def setup
+    @req = {
+      "REQUEST_METHOD" => "GET",
+      "HTTP_VERSION" => "HTTP/1.0",
+      "HTTP_USER_AGENT" => 'echo and socat \o/',
+      "PATH_INFO" => "/",
+      "QUERY_STRING" => "",
+      "rack.errors" => $stderr,
+      "rack.input" => File.open('/dev/null', 'rb'),
+      "REMOTE_ADDR" => '127.0.0.1',
+    }
+  end
+
+  def test_wraps_to_path
+    logger = StringIO.new
+    tmp = Tempfile.new('')
+    b = nil
+    app = Rack::Builder.new do
+      tmp.syswrite(' ' * 365)
+      h = {
+        'Content-Length' => '0',
+        'Content-Type' => 'text/plain',
+      }
+      use Clogger,
+        :logger => logger,
+        :reentrant => true,
+        :format => '$body_bytes_sent $status'
+      run lambda { |env| [ 200, h, b = MyBody.new(tmp.path) ] }
+    end.to_app
+
+    status, headers, body = app.call(@req)
+    assert_instance_of(Clogger::ToPath, body)
+    assert logger.string.empty?
+    assert_equal tmp.path, body.to_path
+    body.close
+    assert b.closed, "close passed through"
+    assert_equal "365 200\n", logger.string
+  end
+
+  def test_wraps_to_path_dev_fd
+    logger = StringIO.new
+    tmp = Tempfile.new('')
+    b = nil
+    app = Rack::Builder.new do
+      tmp.syswrite(' ' * 365)
+      h = {
+        'Content-Length' => '0',
+        'Content-Type' => 'text/plain',
+      }
+      use Clogger,
+        :logger => logger,
+        :reentrant => true,
+        :format => '$body_bytes_sent $status'
+      run lambda { |env| [ 200, h, b = MyBody.new("/dev/fd/#{tmp.fileno}") ] }
+    end.to_app
+
+    status, headers, body = app.call(@req)
+    assert_instance_of(Clogger::ToPath, body)
+    assert logger.string.empty?
+    assert_equal "/dev/fd/#{tmp.fileno}", body.to_path
+    body.close
+    assert b.closed
+    assert_equal "365 200\n", logger.string
+  end
+
+  def test_wraps_to_path_to_io
+    logger = StringIO.new
+    tmp = Tempfile.new('')
+    def tmp.to_io
+      @to_io_called = super
+    end
+    def tmp.to_path
+      path
+    end
+    app = Rack::Builder.new do
+      tmp.syswrite(' ' * 365)
+      tmp.sysseek(0)
+      h = {
+        'Content-Length' => '0',
+        'Content-Type' => 'text/plain',
+      }
+      use Clogger,
+        :logger => logger,
+        :reentrant => true,
+        :format => '$body_bytes_sent $status'
+      run lambda { |env| [ 200, h, tmp ] }
+    end.to_app
+
+    status, headers, body = app.call(@req)
+    assert_instance_of(Clogger::ToPath, body)
+    body.to_path
+    assert_kind_of IO, tmp.instance_variable_get(:@to_io_called)
+    assert logger.string.empty?
+    assert ! tmp.closed?
+    body.close
+    assert tmp.closed?
+    assert_equal "365 200\n", logger.string
+  end
+
+  def test_does_not_wrap_to_path
+    logger = StringIO.new
+    app = Rack::Builder.new do
+      h = {
+        'Content-Length' => '3',
+        'Content-Type' => 'text/plain',
+      }
+      use Clogger,
+        :logger => logger,
+        :reentrant => true,
+        :format => '$body_bytes_sent $status'
+      run lambda { |env| [ 200, h, [ "hi\n" ] ] }
+    end.to_app
+    status, headers, body = app.call(@req)
+    assert_instance_of(Clogger, body)
+    assert logger.string.empty?
+    body.close
+    assert ! logger.string.empty?
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - cloggers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +00:00
+date: 2010-06-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ extra_rdoc_files:
 - lib/clogger/format.rb
 - lib/clogger/pure.rb
 - ext/clogger_ext/clogger.c
+- LICENSE
 files: 
 - .document
 - .gitignore
@@ -47,6 +48,7 @@ files:
 - GIT-VERSION-FILE
 - GIT-VERSION-GEN
 - GNUmakefile
+- LICENSE
 - NEWS
 - README
 - Rakefile
@@ -59,6 +61,7 @@ files:
 - lib/clogger/pure.rb
 - setup.rb
 - test/test_clogger.rb
+- test/test_clogger_to_path.rb
 has_rdoc: true
 homepage: http://clogger.rubyforge.org/
 licenses: []
@@ -92,3 +95,4 @@ specification_version: 3
 summary: configurable request logging for Rack
 test_files: 
 - test/test_clogger.rb
+- test/test_clogger_to_path.rb