Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Refactor Time and DateTime #to_formatted_s: use ternary instead of ne…

…sted if/else

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8699 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit fc71a07edb214a7f8c08ef69b6e6f4284761de5d 1 parent abb24b4
@gbuesing gbuesing authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Refactor Time and DateTime #to_formatted_s: use ternary instead of nested if/else [Geoff Buesing]
+
* Adding Time and DateTime #formatted_offset, for outputting +HH:MM utc offset strings with cross-platform consistency [Geoff Buesing]
* Adding alternate_utc_string option to TimeZone#formatted_offset. Removing unneeded TimeZone#offset. [Geoff Buesing]
View
11 activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -41,15 +41,8 @@ def self.included(base) #:nodoc:
# Time::DATE_FORMATS[:month_and_year] = "%B %Y"
# Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
def to_formatted_s(format = :default)
- if formatter = ::Time::DATE_FORMATS[format]
- if formatter.respond_to?(:call)
- formatter.call(self).to_s
- else
- strftime(formatter)
- end
- else
- to_datetime_default_s
- end
+ return to_default_s unless formatter = ::Time::DATE_FORMATS[format]
+ formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
end
# Returns the utc_offset as an +HH:MM formatted string. Examples:
View
11 activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -45,15 +45,8 @@ def self.included(base) #:nodoc:
# Time::DATE_FORMATS[:month_and_year] = "%B %Y"
# Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
def to_formatted_s(format = :default)
- if formatter = DATE_FORMATS[format]
- if formatter.respond_to?(:call)
- formatter.call(self).to_s
- else
- strftime(formatter)
- end
- else
- to_default_s
- end
+ return to_default_s unless formatter = DATE_FORMATS[format]
+ formatter.respond_to?(:call) ? formatter.call(self).to_s : strftime(formatter)
end
# Returns the utc_offset as an +HH:MM formatted string. Examples:
Please sign in to comment.
Something went wrong with that request. Please try again.