clogger 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d599688759448c6bf0402ae0ffe376133f79caa
-  data.tar.gz: 87a801805a909d115597fd8fb89c839f81db9c59
+  metadata.gz: 6fad2c597e9da6f1f0799f727b478bc7eb3fda9e
+  data.tar.gz: 51d9cd99ef1d7a077a81eb781fd3b0991d431375
 SHA512:
-  metadata.gz: c77852c8b454f4e7b67c3c1de5701506d7196e6d9307a14808ba28e1c69b48032b37f03b6b9ef281821b5c35bf818214e7c5a25956e95d195c7f8ccda068c81a
-  data.tar.gz: 472bdd0b12d9d79d43ac97070c9daee1c156adf7eadb38c9d634a52cc6e72314f62dcf32d73bef4b9f6abbee387ef9603e90fd799ad1e3015023b897fbaafbaf
+  metadata.gz: a64530e68a68736f3e5793badd51a1d2564dd2d5fae68b5b86707856232a933d40266a558bb4fe59ad46abfa6ba9d450a057a0f04192d647654d0163d68954b4
+  data.tar.gz: fb4421ce77d637fc99bb8321332dc5544cb050326aa634ba6d0ec4c1367954176001bd4d370ac3134016b0ba4738a9a0d32de8df5d41392595a0e2338284b941

data/.olddoc.yml

@@ -3,7 +3,6 @@ rdoc_url: https://bogomips.org/clogger/
 cgit_url: https://bogomips.org/clogger.git
 git_url: git://bogomips.org/clogger.git
 public_email: clogger-public@bogomips.org
-private_email: clogger@bogomips.org
 ml_url:
 - https://bogomips.org/clogger-public/
 - http://ou63pmih66umazou.onion/clogger-public/

data/GIT-VERSION-GEN

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

data/clogger.gemspec

@@ -1,24 +1,23 @@
-ENV["VERSION"] or abort "VERSION= must be specified"
-manifest = File.readlines('.manifest').map! { |x| x.chomp! }
-require 'olddoc'
-extend Olddoc::Gemspec
-name, summary, title = readme_metadata
+manifest = File.exist?('.manifest') ?
+  IO.readlines('.manifest').map!(&:chomp!) : `git ls-files`.split("\n")
 
 Gem::Specification.new do |s|
   s.name = %q{clogger}
-  s.version = ENV["VERSION"].dup
-  s.homepage = Olddoc.config['rdoc_url']
+  s.version = (ENV['VERSION'] || '2.1.0').dup
+  s.homepage = 'https://bogomips.org/clogger/'
   s.authors = ["cloggers"]
-  s.description = readme_description
-  s.email = %q{clogger@bogomips.org}
-  s.extra_rdoc_files = extra_rdoc_files(manifest)
+  s.summary = 'configurable request logging for Rack'
+  s.description = File.read('README').split("\n\n")[1]
+  s.email = %q{clogger-public@bogomips.org}
+  s.extra_rdoc_files = IO.readlines('.document').map!(&:chomp!).keep_if do |f|
+    File.exist?(f)
+  end
   s.files = manifest
-  s.summary = summary
   s.test_files = %w(test/test_clogger.rb test/test_clogger_to_path.rb)
 
   # HeaderHash wasn't case-insensitive in old versions
   s.add_dependency(%q<rack>, ['>= 1.0', '< 3.0'])
+  s.add_development_dependency('test-unit', '~> 3.0')
   s.extensions = %w(ext/clogger_ext/extconf.rb)
-
   s.licenses = %w(LGPL-2.1+)
 end

data/ext/clogger_ext/clogger.c

@@ -29,6 +29,7 @@
  * under.
  */
 static clockid_t hopefully_CLOCK_MONOTONIC;
+static VALUE mark_ary;
 
 static void check_clock(void)
 {
@@ -682,6 +683,7 @@ static VALUE cwrite(struct clogger *c)
 
 	if (c->fd >= 0) {
 		write_full(c->fd, RSTRING_PTR(dst), RSTRING_LEN(dst));
+		/* no need for RB_GC_GUARD(dst) here, marked as c->log_buf */
 	} else {
 		VALUE logger = c->logger;
 
@@ -948,7 +950,7 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig)
 
 #define CONST_GLOBAL_STR2(var, val) do { \
 	g_##var = rb_obj_freeze(rb_str_new(val, sizeof(val) - 1)); \
-	rb_global_variable(&g_##var); \
+	rb_ary_push(mark_ary, g_##var); \
 } while (0)
 
 #define CONST_GLOBAL_STR(val) CONST_GLOBAL_STR2(val, #val)
@@ -961,14 +963,23 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig)
  * used to delegate +:to_path+ checks for Rack webservers that optimize
  * static file serving
  */
-static VALUE respond_to(VALUE self, VALUE method)
+static VALUE respond_to(int argc, VALUE *argv, VALUE self)
 {
 	struct clogger *c = clogger_get(self);
-	ID id = rb_to_id(method);
+	VALUE method, include_all;
+	ID id;
 
+	rb_scan_args(argc, argv, "11", &method, &include_all);
+	id = rb_to_id(method);
 	if (close_id == id)
 		return Qtrue;
-	return rb_respond_to(c->body, id);
+
+#ifdef HAVE_RB_OBJ_RESPOND_TO
+	return rb_obj_respond_to(c->body, id, RTEST(include_all));
+#endif
+	if (argc == 1)
+		return rb_respond_to(c->body, id);
+	return rb_funcallv(c->body, respond_to_id, argc, argv);
 }
 
 /*
@@ -1014,6 +1025,9 @@ void Init_clogger_ext(void)
 {
 	VALUE tmp;
 
+	mark_ary = rb_ary_new();
+	rb_global_variable(&mark_ary);
+
 	check_clock();
 
 	write_id = rb_intern("write");
@@ -1039,7 +1053,7 @@ void Init_clogger_ext(void)
 	rb_define_method(cClogger, "wrap_body?", clogger_wrap_body, 0);
 	rb_define_method(cClogger, "reentrant?", clogger_reentrant, 0);
 	rb_define_method(cClogger, "to_path", to_path, 0);
-	rb_define_method(cClogger, "respond_to?", respond_to, 1);
+	rb_define_method(cClogger, "respond_to?", respond_to, -1);
 	rb_define_method(cClogger, "body", body, 0);
 	CONST_GLOBAL_STR(REMOTE_ADDR);
 	CONST_GLOBAL_STR(HTTP_X_FORWARDED_FOR);
@@ -1059,4 +1073,6 @@ void Init_clogger_ext(void)
 	tmp = rb_const_get(rb_cObject, rb_intern("Rack"));
 	tmp = rb_const_get(tmp, rb_intern("Utils"));
 	cHeaderHash = rb_const_get(tmp, rb_intern("HeaderHash"));
+
+	rb_obj_freeze(mark_ary);
 }

data/ext/clogger_ext/extconf.rb

@@ -22,6 +22,7 @@ begin
   have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
   have_func('rb_thread_blocking_region', 'ruby.h')
   have_func('rb_thread_io_blocking_region', 'ruby.h')
+  have_func('rb_obj_respond_to', 'ruby/intern.h')
   create_makefile('clogger_ext')
 rescue Object => err
   warn "E: #{err.inspect}"

data/lib/clogger/pure.rb

@@ -77,8 +77,8 @@ class Clogger
     @logger.respond_to?(:fileno) ? @logger.fileno : nil
   end
 
-  def respond_to?(m)
-    :close == m.to_sym || @body.respond_to?(m)
+  def respond_to?(method, include_all=false)
+    :close == method.to_sym || @body.respond_to?(method, include_all)
   end
 
   def to_path

data/test/test_clogger_to_path.rb

@@ -14,6 +14,10 @@ class MyBody < Struct.new(:to_path, :closed)
   def close
     self.closed = true
   end
+
+private
+  def privtest
+  end
 end
 
 class TestCloggerToPath < Test::Unit::TestCase
@@ -59,6 +63,11 @@ class TestCloggerToPath < Test::Unit::TestCase
     status, headers, body = app.call(@req)
     assert_instance_of(Clogger, body)
     check_body(body)
+
+    assert ! body.respond_to?(:privtest)
+    assert body.respond_to?(:privtest, true)
+    assert ! body.respond_to?(:privtest, false)
+
     assert logger.string.empty?
     assert_equal tmp.path, body.to_path
     body.close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clogger
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - cloggers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -30,19 +30,30 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.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@bogomips.org
+email: clogger-public@bogomips.org
 executables: []
 extensions:
 - ext/clogger_ext/extconf.rb
 extra_rdoc_files:
 - README
 - NEWS
-- lib/clogger.rb
-- lib/clogger/format.rb
-- lib/clogger/pure.rb
 - ext/clogger_ext/clogger.c
 - LICENSE
 files:
@@ -95,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: configurable request logging for Rack