clogger 1.1.0 → 1.2.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.0.GIT
+DEF_VER=v1.2.0
 
 LF='
 '

data/README

@@ -24,7 +24,7 @@ is customizable so you can specify exactly which fields to log.
 
 * Pure Ruby version for non-MRI versions of Ruby (or via CLOGGER_PURE=1
   in the environment).  The optional C extension is loaded by default
-  and supported under MRI 1.8.7, 1.9.1, 1.9.2 and Rubinius.
+  and supported under MRI 1.8.7, 1.9, 2.0 and Rubinius.
 
 == SYNOPSIS
 
@@ -33,7 +33,7 @@ is customizable so you can specify exactly which fields to log.
   # ENV['CLOGGER_PURE'] = '1' # uncomment to disable C extension
   require "clogger"
   use Clogger,
-      :format => Clogger::Format::Combined,
+      :format => :Combined,
       :path => "/path/to/log",
       :reentrant => true
   run YourApplication.new
@@ -42,7 +42,7 @@ If you're using Rails 2.3.x or later, in your config/environment.rb
 somewhere inside the "Rails::Initializer.run do |config|" block:
 
   config.middleware.use 'Clogger',
-      :format => Clogger::Format::Combined,
+      :format => :Combined,
       :path => "/path/to/log",
       :reentrant => false
 

data/ext/clogger_ext/clogger.c

@@ -119,6 +119,7 @@ struct clogger {
 	int reentrant; /* tri-state, -1:auto, 1/0 true/false */
 };
 
+static ID write_id;
 static ID ltlt_id;
 static ID call_id;
 static ID each_id;
@@ -687,9 +688,12 @@ static VALUE cwrite(struct clogger *c)
 	} else {
 		VALUE logger = c->logger;
 
-		if (NIL_P(logger))
+		if (NIL_P(logger)) {
 			logger = rb_hash_aref(c->env, g_rack_errors);
-		rb_funcall(logger, ltlt_id, 1, dst);
+                        rb_funcall(logger, write_id, 1, dst);
+                } else {
+			rb_funcall(logger, ltlt_id, 1, dst);
+		}
 	}
 
 	return Qnil;
@@ -1036,6 +1040,7 @@ void Init_clogger_ext(void)
 
 	check_clock();
 
+	write_id = rb_intern("write");
 	ltlt_id = rb_intern("<<");
 	call_id = rb_intern("call");
 	each_id = rb_intern("each");

data/ext/clogger_ext/extconf.rb

@@ -2,11 +2,6 @@ begin
   require 'mkmf'
   $CPPFLAGS += " -D_BSD_SOURCE=1 "
 
-  # XXX let me know if this works for you...
-  if ! defined?(RUBY_VERSION) || RUBY_VERSION !~ /\A1\.[89]\./
-    raise "Invalid RUBY_VERSION for C extension"
-  end
-
   have_header('ruby.h') or raise "ruby.h header not found!"
 
   if have_header('fcntl.h')

data/lib/clogger/pure.rb

@@ -161,7 +161,7 @@ private
   end
 
   def log(env, status, headers)
-    (@logger || env['rack.errors']) << @fmt_ops.map { |op|
+    str = @fmt_ops.map { |op|
       case op[0]
       when OP_LITERAL; op[1]
       when OP_REQUEST; byte_xs(env[op[1]] || "-")
@@ -182,5 +182,13 @@ private
         raise "EDOOFUS #{op.inspect}"
       end
     }.join('')
+
+    l = @logger
+    if l
+      l << str
+    else
+      env['rack.errors'].write(str)
+    end
+    nil
   end
 end

data/pkg.mk

@@ -69,7 +69,7 @@ doc:: .document .wrongdoc.yml $(pkg_extra)
 	$(RM) -r doc
 	$(WRONGDOC) all
 	install -m644 COPYING doc/COPYING
-	install -m644 $(shell grep '^[A-Z]' .document) doc/
+	install -m644 $(shell LC_ALL=C grep '^[A-Z]' .document) doc/
 
 ifneq ($(VERSION),)
 pkggem := pkg/$(rfpackage)-$(VERSION).gem
@@ -167,5 +167,9 @@ doc_gz: docs = $(shell find doc -type f ! -regex '^.*\.\(gif\|jpg\|png\|gz\)$$')
 doc_gz:
 	for i in $(docs); do \
 	  gzip --rsyncable -9 < $$i > $$i.gz; touch -r $$i $$i.gz; done
+check-warnings:
+	@(for i in $$(git ls-files '*.rb'| grep -v '^setup\.rb$$'); \
+	  do $(RUBY) -d -W2 -c $$i; done) | grep -v '^Syntax OK$$' || :
 
 .PHONY: all .FORCE-GIT-VERSION-FILE doc test $(test_units) manifest
+.PHONY: check-warnings

data/test/test_clogger.rb

@@ -481,6 +481,26 @@ class TestClogger < Test::Unit::TestCase
     assert r.object_id != body.object_id
   end
 
+  # Rack::BodyProxy does this thing with method_missing
+  # This test fails under MRI 1.9.1 and 1.9.2, but works under 1.9.3
+  def test_each_with_external_block
+    foo = Object.new
+    foo.instance_variable_set(:@body, ["BodyProxy"])
+    def foo.method_missing(*args, &block)
+      @body.__send__(*args, &block)
+    end
+    app = lambda { |env| [302, [], foo] }
+    str = StringIO.new
+    cl = Clogger.new(app, :logger => str, :format => '$body_bytes_sent')
+    r = nil
+    assert_nothing_raised { r = cl.call(@req) }
+    body = []
+    r[2].each { |x| body << x }
+    r[2].close
+    assert_equal %w(BodyProxy), body
+    assert_equal "9\n", str.string
+  end
+
   def test_http_09_request
     str = StringIO.new
     app = lambda { |env| [302, [ %w(a) ], []] }
@@ -817,4 +837,21 @@ class TestClogger < Test::Unit::TestCase
     expect = "\"GET http://example.com/hello?goodbye=true HTTP/1.0\"\n"
     assert_equal [ expect ], s
   end
+
+  def test_lint_error_wrapper
+    require 'rack/lobster'
+    @req["SERVER_NAME"] = "FOO"
+    @req["SERVER_PORT"] = "666"
+    @req["rack.version"] = [1,1]
+    @req["rack.multithread"] = true
+    @req["rack.multiprocess"] = true
+    @req["rack.run_once"] = false
+    app = Rack::ContentLength.new(Rack::ContentType.new(Rack::Lobster.new))
+    cl = Clogger.new(app, :format => :Combined)
+    @req["rack.errors"] = err = StringIO.new
+    status, headers, body = r = Rack::Lint.new(cl).call(@req)
+    body.each { |x| assert_kind_of String, x.to_str }
+    body.close # might raise here
+    assert_match(%r{GET /hello}, err.string)
+  end
 end

metadata

@@ -1,61 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: clogger
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.2.0
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - cloggers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: wrongdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: wrongdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id002
-description: |-
-  \Clogger is Rack middleware for logging HTTP requests.  The log format
-  is customizable so you can specify exactly which fields to log.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: ! '\Clogger is Rack middleware for logging HTTP requests.  The log format
+
+  is customizable so you can specify exactly which fields to log.'
 email: clogger@librelist.org
 executables: []
-
-extensions: 
+extensions:
 - ext/clogger_ext/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
 - NEWS
 - ChangeLog
@@ -65,7 +60,7 @@ extra_rdoc_files:
 - ext/clogger_ext/clogger.c
 - LICENSE
 - LATEST
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -95,41 +90,33 @@ files:
 - test/test_clogger_to_path.rb
 homepage: http://clogger.rubyforge.org/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - \Clogger - configurable request logging for Rack
 - -W
 - http://bogomips.org/clogger.git/tree/%s
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: clogger
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: configurable request logging for Rack
-test_files: 
+test_files:
 - test/test_clogger.rb
 - test/test_clogger_to_path.rb