1 files changed, 5 insertions, 8 deletions
diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb
index c69e4cc77e..233e613e97 100644
--- a/actionview/lib/action_view/helpers/date_helper.rb
+++ b/actionview/lib/action_view/helpers/date_helper.rb
@@ -845,14 +845,11 @@ module ActionView
       private
         %w( sec min hour day month year ).each do |method|
           define_method(method) do
-            if @datetime
-              if @datetime.kind_of?(Hash)
-                @datetime[method.to_sym]
-              elsif @datetime.kind_of?(Numeric)
-                @datetime
-              else
-                @datetime.send(method)
-              end
+            case @datetime
+            when Hash then @datetime[method.to_sym]
+            when Numeric then @datetime
+            when nil then nil
+            else @datetime.send(method)
             end
           end
         end