kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity
ruby--ruby/ChangeLog
nobu 986fb55961 Forwardable: Fix delegating to 'args' and 'block' 
* lib/forwardable.rb (def_instance_delegator) fix delegating to
  'args' and 'block', clashing with local variables in generated
  methods.  [ruby-core:72579] [Bug #11916]

* lib/forwardable.rb (def_single_delegator): ditto.

If you have a class that uses Forwardable to delegate a method to
another object, and the method that returns the delegate object is
called `args` or `block`, then Forwardable will fail to work.

Here's a simple example:

    class ModelCreator
      extend Forwardable

      attr_reader :args

      def_delegator :args, :model_name

      def initialize(args)
        @args = args
      end
    end

    ModelCreator.new.model_name

If you run the last line above, then you'll get:

    NoMethodError: undefined method `model_name' for []:Array

This error occurs because `def_delegator` -- as it is written in Ruby --
uses metaprogramming to add methods to the class that will then delegate
to the delegate object. So it's as if we had written:

    class ModelCreator
      extend Forwardable

      attr_reader :args

      def model_name(*args, &block)
        args.model_name(*args, &block)
      end

      def initialize(args)
        @args = args
      end
    end

As you can see, `def_delegator` will not only forward the method call
onto the delegate object, it will also forward any arguments provided as
well. It is here that the bug arises: it splats all of the arguments
into a variable which is called `args`, and because of how variable
scope works in Ruby, it then attempts to call `model_name` on *this*
variable and *not* our delegate object method.

The fix is to call the delegate object method manually using `__send__`.
(This assumes, of course, that the given receiver is, in fact, the name
of a method and not the name of an instance variable, which is also a
possibility.) We use `__send__` because the delegate object method could
be private.

So, that looks like this:

    def model_name(*args, &block)
      __send__(:args).model_name(*args, &block)
    end

Because `def_delegators` and `delegate` use `def_delegator` internally,
they also get this fix as well.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-30 02:18:44 +00:00

244 lines
8.1 KiB
Text
Raw Blame History

Wed Dec 30 11:18:42 2015 Elliot Winkler <elliot.winkler@gmail.com>
* lib/forwardable.rb (def_instance_delegator) fix delegating to
'args' and 'block', clashing with local variables in generated
methods. [ruby-core:72579] [Bug #11916]
* lib/forwardable.rb (def_single_delegator): ditto.
Wed Dec 30 09:58:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_class_inherited_p): search the corresponding
ancestor to prepended module from prepending class itself.
[ruby-core:72493] [Bug #11878]
Wed Dec 30 09:20:00 2015 Yuki Kurihara <co000ri@gmail.com>
* test/stringio/test_io.rb (test_flag): add assertion for error when
text and binary mode are mixed.
[ruby-dev:49465] [Feature #11921]
Wed Dec 30 08:43:59 2015 Yuki Kurihara <co000ri@gmail.com>
* test/stringio/test_stringio.rb (test_initialize): add test for
StringIO#initialize. [ruby-core:72585] [Feature #11920]
Wed Dec 30 05:19:24 2015 Eric Wong <e@80x24.org>
* class.c (struct clone_const_arg): adjust for id_table
(clone_const): ditto
(clone_const_i): ditto
(rb_mod_init_copy): ditto
(rb_singleton_class_clone_and_attach): ditto
(rb_include_class_new): ditto
(include_modules_at): ditto
* constant.h (rb_free_const_table): ditto
* gc.c (free_const_entry_i): ditto
(rb_free_const_table): ditto
(obj_memsize_of): ditto
(mark_const_entry_i): ditto
(mark_const_tbl): ditto
* internal.h (struct rb_classext_struct): ditto
* object.c (rb_mod_const_set): resolve class name on assignment
* variable.c (const_update): replace with const_tbl_update
(const_tbl_update): new function
(fc_i): adjust for id_table
(find_class_path): ditto
(autoload_const_set): st_update => const_tbl_update
(rb_const_remove): adjust for id_table
(sv_i): ditto
(rb_local_constants_i): ditto
(rb_local_constants): ditto
(rb_mod_const_at): ditto
(rb_mod_const_set): ditto
(rb_const_lookup): ditto
[ruby-core:72112] [Feature #11614]
Wed Dec 30 04:10:13 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* thread_pthread.c (rb_thread_create_timer_thread): destroy attr even
if pthread_create() failed.
Wed Dec 30 02:55:09 2015 Eric Wong <e@80x24.org>
* thread_pthread.c (setup_communication_pipe): delay setting owner
(rb_thread_create_timer_thread): until thread creation succeeds
[ruby-core:72590] [Bug #11922]
Tue Dec 29 19:12:46 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (proc_options): -W command line option should be able to
override -w in RUBYOPT environment variable.
Tue Dec 29 17:54:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ignored_block): warn if a block is given to `using`,
which is probably for `Module.new`.
Tue Dec 29 12:48:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/ostruct.rb (OpenStruct): make respond_to? working on
just-allocated objects for workaround of Psych.
[ruby-core:72501] [Bug #11884]
Tue Dec 29 10:35:00 2015 Kenta Murata <mrkn@mrkn.jp>
* test/mkmf/test_have_func.rb (test_have_func):
Add assertion to examine the existence of HAVE_RUBY_INIT.
* test/mkmf/test_have_func.rb (test_not_have_func):
Add assertion to examine the absence of HAVE_RUBY_INIT.
Tue Dec 29 06:50:42 2015 Eric Wong <e@80x24.org>
* thread_sync.c: static classes
Tue Dec 29 05:30:30 2015 Eric Wong <e@80x24.org>
* lib/resolv.rb (Resolv::IPv6.create): avoid modifying frozen
* test/resolv/test_dns.rb (test_ipv6_create): test for above
[Bug #11910] [ruby-core:72559]
Mon Dec 28 14:55:57 2015 Kuniaki IGARASHI <igaiga@gmail.com>
* test/ruby/test_string.rb (TestString#test_rstrip_bang): Add test
for String#rstrip!. [Fix GH-1176]
Mon Dec 28 09:18:53 2015 Kuniaki IGARASHI <igaiga@gmail.com>
* test/ruby/test_string.rb (TestString#test_lstrip_bang): Add test
for String#lstrip!. [Fix GH-1176]
Sun Dec 27 23:32:26 2015 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_variant2val): refactoring.
Sun Dec 27 21:14:42 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (rb_execarg_parent_start1): need to convert the encoding to
ospath's one.
Sun Dec 27 20:54:22 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
reported by naruse via twitter.
* process.c (rb_execarg_addopt): need to convert the encoding to
ospath's one.
Sun Dec 27 20:00:31 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* enc/x_emoji.h: fix dead-link.
Sun Dec 27 19:55:55 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* doc/NEWS-2.3.0: fix a typo.
Sun Dec 27 18:08:15 2015 Kuniaki IGARASHI <igaiga@gmail.com>
* string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): [DOC] Fix
ruby-doc comments for String#rstrip! and lstrip!. It looks like
dropped bang. [Fix GH-1175]
Sun Dec 27 15:14:20 2015 Eric Wong <e@80x24.org>
* io.c (io_getpartial): remove unused kwarg from template
* test/ruby/test_io.rb (test_readpartial_bad_args): new
[Bug #11885]
Sun Dec 27 11:50:53 2015 Kuniaki IGARASHI <igaiga@gmail.com>
* test/ruby/test_string.rb (test_rstrip, test_lstrip): Add tests
for String#lstrip and rstrip. The test cases are used from
string.c ruby-doc comments. [Fix GH-1174]
Sun Dec 27 11:47:46 2015 Kuniaki IGARASHI <igaiga@gmail.com>
* test/ruby/test_string.rb (test_insert): Add test for
String#insert. The test cases are written in string.c
comments as a reference. [Fix GH-1173]
Sun Dec 27 11:03:33 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (show_bitstack): trace stack_type value if yydebug.
Sun Dec 27 10:03:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enc/depend (enc, trans): fix version dependency, shared object
files depend on the RUBY_SO_NAME value for runtime link.
Sun Dec 27 09:47:20 2015 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_vstr2wc, ole_variant2val): fix blank
string conversion.
[Bug #11880]
Thanks Akio Tajima for the patch!
Sun Dec 27 09:34:53 2015 craft4coder <yooobuntu@163.com>
* doc/extension.rdoc: [DOC] `nul` should be uppercase.
change 'nul' => 'NUL'. [Fix GH-1172]
Sat Dec 26 18:29:01 2015 Kouhei Sutou <kou@cozmixng.org>
* lib/xmlrpc/client.rb: Support SSL options in async methods of
XMLRPC::Client.
[Bug #11489]
Reported by Aleksandar Kostadinov. Thanks!!!
Sat Dec 26 11:26:38 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* miniinit.c (Init_enc): add some common aliases of built-in
encodings. [ruby-core:72481] [Bug #11872]
Sat Dec 26 01:24:40 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, version.h (RUBY_PROGRAM_VERSION): extract version
numbers from API version in include/ruby/version.h except for
TEENY, to save matz job next year.
* win32/setup.mak (-version-): use program version.
Fri Dec 25 22:43:26 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in: extract RUBY_RELEASE_DAY at generating Makefile.
* version.h (RUBY_RELEASE_DATE): construct from RUBY_RELEASE_YEAR,
RUBY_RELEASE_MONTH, and RUBY_RELEASE_DAY.
Fri Dec 25 21:33:06 2015 Yukihiro Matsumoto <matz@ruby-lang.org>
* version.h (RUBY_VERSION): 2.4.0 development has started.
Fri Dec 25 14:12:12 2015 Martin Duerst <duerst@it.aoyama.ac.jp>
* doc/ChangeLog-2.3.0, ext/tk/lib/tkextlib/SUPPORT_STATUS,
include/ruby/version.h: minor grammar fixes [ci skip]
Fri Dec 25 08:23:22 2015 Tadashi Saito <tadashi_saito@dwango.co.jp>
* compile.c, cont.c, doc, man: fix common misspelling.
[ruby-core:72466] [Bug #11870]
For the changes before 2.3.0, see doc/ChangeLog-2.3.0
For the changes before 2.2.0, see doc/ChangeLog-2.2.0
For the changes before 2.1.0, see doc/ChangeLog-2.1.0
For the changes before 2.0.0, see doc/ChangeLog-2.0.0
For the changes before 1.9.3, see doc/ChangeLog-1.9.3
For the changes before 1.8.0, see doc/ChangeLog-1.8.0
Local variables:
coding: us-ascii
add-log-time-format: (lambda ()
(let* ((time (current-time))
(system-time-locale "C")
(diff (+ (cadr time) 32400))
(lo (% diff 65536))
(hi (+ (car time) (/ diff 65536))))
(format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
indent-tabs-mode: t
tab-width: 8
change-log-indent-text: 2
end:
vim: tabstop=8 shiftwidth=2
View git blame Copy permalink