diff options
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/delegation.rb | 4 | ||||
| -rw-r--r-- | activesupport/test/core_ext/module_test.rb | 2 | ||||
| -rw-r--r-- | guides/source/4_0_release_notes.md | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb index 3dde87ac2e..9d4b78e242 100644 --- a/activesupport/lib/active_support/core_ext/module/delegation.rb +++ b/activesupport/lib/active_support/core_ext/module/delegation.rb @@ -176,7 +176,7 @@ class Module end # end EOS else - exception = %(raise "#{self}##{method_prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}") + exception = %(raise DelegationError, "#{self}##{method_prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}") module_eval(<<-EOS, file, line - 2) def #{method_prefix}#{method}(#{definition}) # def customer_name(*args, &block) @@ -194,3 +194,5 @@ class Module end end end + +class DelegationError < StandardError ; end diff --git a/activesupport/test/core_ext/module_test.rb b/activesupport/test/core_ext/module_test.rb index 8872611fb1..ecef7754aa 100644 --- a/activesupport/test/core_ext/module_test.rb +++ b/activesupport/test/core_ext/module_test.rb @@ -207,7 +207,7 @@ class ModuleTest < ActiveSupport::TestCase def test_delegation_without_allow_nil_and_nil_value david = Someone.new("David") - assert_raise(RuntimeError) { david.street } + assert_raise(DelegationError) { david.street } end def test_delegation_to_method_that_exists_on_nil diff --git a/guides/source/4_0_release_notes.md b/guides/source/4_0_release_notes.md index 6ebeeed0bf..66e26c63cb 100644 --- a/guides/source/4_0_release_notes.md +++ b/guides/source/4_0_release_notes.md @@ -52,7 +52,7 @@ Major Features TODO. Give a list and then talk about each of them briefly. We can point to relevant code commits or documentation from these sections. - +[](http://guides.rubyonrails.org/images/rails4_features.png) Extraction of features to gems --------------------------- @@ -89,6 +89,10 @@ Please refer to the [Changelog](https://github.com/rails/rails/blob/master/railt * Threadsafe on by default +* Ability to use a custom builder by passing `--builder` (or `-b`) to + `rails new` has been removed. Consider using application templates + instead. ([Pull Request](https://github.com/rails/rails/pull/9401)) + ### Deprecations * `config.threadsafe!` is deprecated in favor of `config.eager_load` which provides a more fine grained control on what is eager loaded. |