clogger 0.0.6 → 0.0.7

data/GNUmakefile

@@ -39,8 +39,8 @@ VERSION := $(shell git describe 2>/dev/null | sed 's/^v//')
 ifneq ($(VERSION),)
 v := /^v$(VERSION)$$/
 vPREV := $(shell git tag -l 2>/dev/null | sed -n -e '$(v)!h' -e '$(v){x;p;q}')
-release_notes := release_notes-$(VERSION).txt
-release_changes := release_changes-$(VERSION).txt
+release_notes := release_notes-$(VERSION)
+release_changes := release_changes-$(VERSION)
 release-notes: $(release_notes)
 release-changes: $(release_changes)
 $(release_changes): verify
@@ -48,8 +48,15 @@ $(release_changes): verify
 	echo >> $@+
 	git log $(vPREV)..v$(VERSION) >> $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
+$(release_notes): pkggem = pkg/clogger-$(VERSION).gem
 $(release_notes): verify package
-	gem spec pkg/clogger-$(VERSION).gem description | sed -ne '/\w/p' > $@+
+	gem spec $(pkggem) description | sed -ne '/\w/p' > $@+
+	echo >> $@+
+	gem spec $(pkggem) homepage | sed -ne 's/^--- /* /p' >> $@+
+	gem spec $(pkggem) email | sed -ne 's/^--- /* /p' >> $@+
+	echo '* git://git.bogomips.org/clogger.git' >> $@+
+	echo >> $@+
+	echo Changes: >> $@+
 	echo >> $@+
 	git cat-file tag v$(VERSION) | awk 'p>1{print $$0}/^$$/{++p}' >> $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@

data/README

@@ -71,6 +71,7 @@ somewhere inside the "Rails::Initializer.run do |config|" block:
 * $response_length - body_bytes_sent, except "-" instead of "0" (Apache: %b)
 * $remote_user - HTTP-authenticated user
 * $remote_addr - IP of the requesting client socket
+* $status - three-digit HTTP status code (e.g. 200, 404, 302)
 * $ip - X-Forwarded-For request header if available, $remote_addr if not
 * $pid - process ID of the current process
 * $e{Thread.current} - Thread processing the request
@@ -109,20 +110,20 @@ Homepage: http://clogger.rubyforge.org/
 
 == INSTALL
 
-For all Rubygems users:
+For Rubygems users:
 
   gem install clogger
 
-If you do not use Rubygems, you may also use setup.rb from tarballs from
-the Rubyforge project page:
+If you do not use Rubygems, you may also use setup.rb from the tarballs
+on the Rubyforge project page:
 
 * http://rubyforge.org/frs/?group_id=8896
 
 There is an optional C extension that should be compatible with MRI
 1.8/1.9.  The extensions should automatically be disabled for users of
 other Ruby implementations, but be sure to let us know if that's not the
-case.  No pre-built currently distributed, let us know if you're
-interested in helping with the release/support effort.
+case.  No pre-built binaries are currently distributed, let us know if
+you're interested in helping with the release/support effort.
 
 == LICENSE
 

data/Rakefile

@@ -10,12 +10,12 @@ task :history do
   tags = `git tag -l`.split(/\n/).grep(/^v/).reverse
   timefmt = '%Y-%m-%d %H:%M UTC'
   tags.each do |tag|
-    header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/)
+    header, subject, body = `git cat-file tag #{tag}`.split(/\n\n/, 3)
     tagger = header.split(/\n/).grep(/^tagger /).first.split(/\s/)
     time = Time.at(tagger[-2].to_i).utc
     puts "=== #{tag.sub(/^v/, '')} / #{time.strftime(timefmt)}"
     puts ""
-    puts body
+    puts body.gsub(/^/sm, "  ")
     puts ""
   end
 end

data/clogger.gemspec

@@ -28,5 +28,5 @@ is customizable so you can specify exactly which fields to log.
   # HeaderHash wasn't case-insensitive in old versions
   s.add_dependency(%q<rack>, ["> 0.9"])
   s.extensions = %w(ext/clogger_ext/extconf.rb)
-
+  s.license = "LGPLv3"
 end

data/ext/clogger_ext/clogger.c

@@ -656,7 +656,9 @@ static VALUE clogger_close(VALUE self)
 {
 	struct clogger *c = clogger_get(self);
 
-	return rb_funcall(c->body, close_id, 0);
+	if (rb_respond_to(c->body, close_id))
+		return rb_funcall(c->body, close_id, 0);
+	return Qnil;
 }
 
 /* :nodoc: */

data/lib/clogger.rb

@@ -1,6 +1,6 @@
 # -*- encoding: binary -*-
 class Clogger
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   OP_LITERAL = 0
   OP_REQUEST = 1

data/lib/clogger/pure.rb

@@ -47,7 +47,7 @@ class Clogger
   end
 
   def close
-    @body.close
+    @body.close if @body.respond_to?(:close)
   end
 
   def reentrant?

data/test/test_clogger.rb

@@ -469,4 +469,24 @@ class TestClogger < Test::Unit::TestCase
     assert_equal "<GET /hello?goodbye=true HTTP/1.0>", s
   end
 
+  def test_clogger_body_not_closeable
+    s = ''
+    app = lambda { |env| [302, [ %w(a) ], []] }
+    cl = Clogger.new(app, :logger => s)
+    status, headers, body = cl.call(@req)
+    assert_nil body.close
+  end
+
+  def test_clogger_body_close_return_value
+    s = ''
+    body = []
+    def body.close
+      :foo
+    end
+    app = lambda { |env| [302, [ %w(a) ], body ] }
+    cl = Clogger.new(app, :logger => s)
+    status, headers, body = cl.call(@req)
+    assert_equal :foo, body.close
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Eric Wong
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -07:00
+date: 2009-09-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,8 +53,8 @@ files:
 - test/test_clogger.rb
 has_rdoc: true
 homepage: http://clogger.rubyforge.org/
-licenses: []
-
+licenses: 
+- LGPLv3
 post_install_message: 
 rdoc_options: 
 - -Na