kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Avoid raising a NameError on FreeBSD using Date

Browse source 
The Date object has a xmlschema method starting with Ruby 1.9 so we were
assuming that we could safely remove this method and redefine it later
but the call to remove_method throws a NameError on FreeBSD so we should
rely on remove_possible_method instead.

This call is actually needed to avoid warnings when running the test
suite.

Fixes #11723
This commit is contained in:
Robin Dupret 2014-01-01 15:24:54 +01:00
parent 97ddfb48db
commit afc98eadb8
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
activesupport/CHANGELOG.md
View file

@ -1,3 +1,8 @@
* Use `remove_possible_method` instead of `remove_method` to avoid
a `NameError` to be thrown on FreeBSD with the `Date` object.
*Rafael Mendonça França*, *Robin Dupret*
* `blank?` and `present?` commit to return singletons. * `blank?` and `present?` commit to return singletons.
*Xavier Noria*, *Pavel Pravosud* *Xavier Noria*, *Pavel Pravosud*

7
activesupport/lib/active_support/core_ext/date/conversions.rb
View file

@ -1,6 +1,7 @@
require 'date' require 'date'
require 'active_support/inflector/methods' require 'active_support/inflector/methods'
require 'active_support/core_ext/date/zones' require 'active_support/core_ext/date/zones'
require 'active_support/core_ext/module/remove_method'
class Date class Date
DATE_FORMATS = { DATE_FORMATS = {
@ -19,8 +20,10 @@ class Date
# Ruby 1.9 has Date#to_time which converts to localtime only. # Ruby 1.9 has Date#to_time which converts to localtime only.
remove_method :to_time remove_method :to_time
# Ruby 1.9 has Date#xmlschema which converts to a string without the time component. # Ruby 1.9 has Date#xmlschema which converts to a string without the time
remove_method :xmlschema # component. This removal may generate an issue on FreeBSD, that's why we
# need to use remove_possible_method here
remove_possible_method :xmlschema
# Convert to a formatted string. See DATE_FORMATS for predefined formats. # Convert to a formatted string. See DATE_FORMATS for predefined formats.
# #