From: Pat Allan <pat@freelancing-gods.com>
To: clogger-public@bogomips.org
Subject: [PATCH] Update respond_to? calls for second argument.
Date: Sun, 21 May 2017 14:01:30 +1000 [thread overview]
Message-ID: <D6ACA95E-0296-4CB7-9788-E5CB95291224@freelancing-gods.com> (raw)
Rack (since v2) has started explicitly listing the second (optional) argument for respond_to?, which matches the underlying Ruby spec. This patch fixes the calls in both C and Ruby approaches.
However, rb_respond_to only accepts a single argument - differing from the Ruby side of things - so perhaps this patch isn't quite perfect (and my C skills are very limited, so the whole thing could use a review).
---
ext/clogger_ext/clogger.c | 8 ++++++--
lib/clogger/pure.rb | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c
index 481dd61..622c98c 100644
--- a/ext/clogger_ext/clogger.c
+++ b/ext/clogger_ext/clogger.c
@@ -963,8 +963,12 @@ 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)
{
+ VALUE method, include_all;
+ rb_scan_args(argc, argv, "11", &method, &include_all);
+ if (NIL_P(include_all)) include_all = Qfalse;
+
struct clogger *c = clogger_get(self);
ID id = rb_to_id(method);
@@ -1044,7 +1048,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);
diff --git a/lib/clogger/pure.rb b/lib/clogger/pure.rb
index 77f81b4..fddfe79 100644
--- a/lib/clogger/pure.rb
+++ b/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
--
Pat
next reply other threads:[~2017-05-21 4:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-21 4:01 Pat Allan [this message]
2017-05-21 4:38 ` [PATCH] Update respond_to? calls for second argument Eric Wong
2017-05-21 4:54 ` Eric Wong
2017-05-21 5:10 ` Pat Allan
2017-05-21 5:47 ` [PATCH v2] " Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://yhbt.net/clogger/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D6ACA95E-0296-4CB7-9788-E5CB95291224@freelancing-gods.com \
--to=pat@freelancing-gods.com \
--cc=clogger-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhbt.net/clogger.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).