clogger 0.1.0 → 0.2.0

data/GIT-VERSION-GEN

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

data/GNUmakefile

@@ -1,6 +1,6 @@
 all:: test
-ruby = ruby
-rake = rake
+RUBY = ruby
+RAKE = rake
 GIT_URL = git://git.bogomips.org/clogger.git
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@@ -9,11 +9,11 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 -include local.mk
 
 ifeq ($(DLEXT),) # "so" for Linux
-  DLEXT := $(shell $(ruby) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
+  DLEXT := $(shell $(RUBY) -rrbconfig -e 'puts Config::CONFIG["DLEXT"]')
 endif
 
 ext/clogger_ext/Makefile: ext/clogger_ext/clogger.c ext/clogger_ext/extconf.rb
-	cd ext/clogger_ext && $(ruby) extconf.rb
+	cd ext/clogger_ext && $(RUBY) extconf.rb
 
 ext/clogger_ext/clogger.$(DLEXT): ext/clogger_ext/Makefile
 	$(MAKE) -C ext/clogger_ext
@@ -23,10 +23,10 @@ clean:
 	$(RM) ext/clogger_ext/Makefile lib/clogger_ext.$(DLEXT)
 
 test-ext: ext/clogger_ext/clogger.$(DLEXT)
-	$(ruby) -Iext/clogger_ext:lib test/test_clogger.rb
+	$(RUBY) -Iext/clogger_ext:lib test/test_clogger.rb
 
 test-pure:
-	CLOGGER_PURE=t $(ruby) -Ilib test/test_clogger.rb
+	CLOGGER_PURE=t $(RUBY) -Ilib test/test_clogger.rb
 
 test: test-ext test-pure
 
@@ -42,8 +42,8 @@ manifest: $(pkg_extra)
 	cmp $@+ $@ || mv $@+ $@
 	$(RM) $@+
 
-NEWS: GIT-VERSION-FILE
-	$(rake) -s news_rdoc > $@+
+NEWS: GIT-VERSION-FILE .manifest
+	$(RAKE) -s news_rdoc > $@+
 	mv $@+ $@
 
 SINCE = 0.0.7
@@ -63,13 +63,13 @@ doc: .document NEWS ChangeLog
 	rdoc -Na -t "$(shell sed -ne '1s/^= //p' README)"
 	install -m644 COPYING doc/COPYING
 	install -m644 $(shell grep '^[A-Z]' .document)  doc/
-	$(ruby) -i -p -e \
+	$(RUBY) -i -p -e \
 	  '$$_.gsub!("</title>",%q{\&$(call atom,$(cgit_atom))})' \
 	  doc/ChangeLog.html
-	$(ruby) -i -p -e \
+	$(RUBY) -i -p -e \
 	  '$$_.gsub!("</title>",%q{\&$(call atom,$(news_atom))})' \
 	  doc/NEWS.html doc/README.html
-	$(rake) -s news_atom > doc/NEWS.atom.xml
+	$(RAKE) -s news_atom > doc/NEWS.atom.xml
 	cd doc && ln README.html tmp && mv tmp index.html
 
 # publishes docs to http://clogger.rubyforge.org/
@@ -79,7 +79,7 @@ publish_doc:
 	git set-file-times
 	$(RM) -r doc
 	$(MAKE) doc
-	rsync -av --delete doc/ rubyforge.org:/var/www/gforge-projects/clogger/
+	rsync -av doc/ rubyforge.org:/var/www/gforge-projects/clogger/
 	git ls-files | xargs touch
 
 ifneq ($(VERSION),)
@@ -93,10 +93,10 @@ release_changes := release_changes-$(VERSION)
 release-notes: $(release_notes)
 release-changes: $(release_changes)
 $(release_changes):
-	$(rake) -s release_changes > $@+
+	$(RAKE) -s release_changes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes):
-	GIT_URL=$(GIT_URL) $(rake) -s release_notes > $@+
+	GIT_URL=$(GIT_URL) $(RUBY) -s release_notes > $@+
 	$(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 
 # ensures we're actually on the tagged $(VERSION), only used for release
@@ -135,9 +135,10 @@ package: $(pkgtgz) $(pkggem)
 
 release: verify package $(release_notes) $(release_changes)
 	rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
-	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
-	rubyforge add_file \
 	  $(rfproject) $(rfpackage) $(VERSION) $(pkgtgz)
+	gem push $(pkggem)
+	rubyforge add_file \
+	  $(rfproject) $(rfpackage) $(VERSION) $(pkggem)
 else
 gem install-gem: GIT-VERSION-FILE
 	$(MAKE) $@ VERSION=$(GIT_VERSION)

data/README

@@ -31,7 +31,7 @@ Clogger may be loaded as Rack middleware in your config.ru:
   require "clogger"
   use Clogger,
       :format => Clogger::Format::Combined,
-      :logger => File.open("/path/to/log", "ab")
+      :logger => ::File.open("/path/to/log", "ab")
   run YourApplication.new
 
 If you're using Rails 2.3.x or later, in your config/environment.rb
@@ -39,7 +39,7 @@ somewhere inside the "Rails::Initializer.run do |config|" block:
 
   config.middleware.use 'Clogger',
       :format => Clogger::Format::Combined,
-      :logger => File.open("/path/to/log", "ab")
+      :logger => ::File.open("/path/to/log", "ab")
 
 == VARIABLES
 

data/Rakefile

@@ -117,3 +117,41 @@ task :release_notes do
   print "\nChanges:\n\n"
   puts body
 end
+
+desc "post to RAA"
+task :raa_update do
+  require 'rubygems'
+  require 'net/http'
+  require 'net/netrc'
+  rc = Net::Netrc.locate('clogger-raa') or abort "~/.netrc not found"
+  password = rc.password
+
+  s = Gem::Specification.load('clogger.gemspec')
+  desc = [ s.description.strip ]
+  desc << ""
+  desc << "* #{s.email}"
+  desc << "* #{git_url}"
+  desc << "* #{cgit_url}"
+  desc = desc.join("\n")
+  uri = URI.parse('http://raa.ruby-lang.org/regist.rhtml')
+  form = {
+    :name => s.name,
+    :short_description => s.summary,
+    :version => s.version.to_s,
+    :status => 'experimental',
+    :owner => s.authors.first,
+    :email => s.email,
+    :category_major => 'Library',
+    :category_minor => 'Rack',
+    :url => s.homepage,
+    :download => 'http://rubyforge.org/frs/?group_id=8896',
+    :license => 'LGPLv3',
+    :description_style => 'Plain',
+    :description => desc,
+    :pass => password,
+    :submit => 'Update',
+  }
+  res = Net::HTTP.post_form(uri, form)
+  p res
+  puts res.body
+end

data/clogger.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
     s.required_rubygems_version = Gem::Requirement.new(">= 0")
   end
   s.homepage = 'http://clogger.rubyforge.org/'
-  s.authors = ["Eric Wong"]
+  s.authors = ["cloggers"]
   s.date = Time.now.utc.strftime('%Y-%m-%d')
   s.description = %q{
 Clogger is Rack middleware for logging HTTP requests.  The log format

data/ext/clogger_ext/clogger.c

@@ -689,10 +689,9 @@ static VALUE ccall(struct clogger *c, VALUE env)
 		c->headers = tmp[1];
 		c->body = tmp[2];
 
+		rv = rb_ary_new4(3, tmp);
 		if (c->need_resp && cHeaderHash != rb_obj_class(c->headers)) {
 			c->headers = rb_funcall(cHeaderHash, new_id, 1, tmp[1]);
-			if (OBJ_FROZEN(rv))
-				rv = rb_ary_dup(rv);
 			rb_ary_store(rv, 1, c->headers);
 		}
 	} else {
@@ -732,8 +731,7 @@ static VALUE clogger_call(VALUE self, VALUE env)
 		}
 
 		rv = ccall(c, env);
-		if (OBJ_FROZEN(rv))
-			rv = rb_ary_dup(rv);
+		assert(!OBJ_FROZEN(rv) && "frozen response array");
 		rb_ary_store(rv, 2, self);
 
 		return rv;

data/lib/clogger.rb

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

data/lib/clogger/pure.rb

@@ -27,10 +27,10 @@ class Clogger
     end
     status, headers, body = resp
     headers = Rack::Utils::HeaderHash.new(headers) if @need_resp
-    if wrap_body?
+    if @wrap_body
       @reentrant = env['rack.multithread']
       @env, @status, @headers, @body = env, status, headers, body
-      return [ status, headers, reentrant? ? self.dup : self ]
+      return [ status, headers, @reentrant ? self.dup : self ]
     end
     log(env, status, headers)
     [ status, headers, body ]
@@ -39,7 +39,7 @@ class Clogger
   def each
     @body_bytes_sent = 0
     @body.each do |part|
-      @body_bytes_sent += part.size
+      @body_bytes_sent += Rack::Utils.bytesize(part)
       yield part
     end
     ensure

data/test/test_clogger.rb

@@ -517,6 +517,22 @@ class TestClogger < Test::Unit::TestCase
     assert_nil body.close
   end
 
+  def test_clogger_response_frozen
+    response = [ 200, { "AAAA" => "AAAA"}.freeze, [].freeze ].freeze
+    s = StringIO.new("")
+    app = Rack::Builder.new do
+      use Clogger, :logger => s, :format => "$request_time $http_host"
+      run lambda { |env| response }
+    end
+    assert_nothing_raised do
+      3.times do
+        resp = app.call(@req)
+        assert ! resp.frozen?
+        resp.last.each { |x| }
+      end
+    end
+  end
+
   def test_clogger_body_close_return_value
     s = ''
     body = []

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: clogger
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
-- Eric Wong
+- cloggers
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -07:00
+date: 2010-01-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency