From b3eac823006eb6a346f88793aabef28a6d4f928c Mon Sep 17 00:00:00 2001
From: Andrew White <andrew.white@unboxedconsulting.com>
Date: Mon, 21 Sep 2015 12:59:00 +0100
Subject: Short-circuit `blank?` on date and time values

The concept of a blank date or time doesn't make sense so we can short
circuit the calls for `blank?` on these classes to gain small speed boost.

Fixes #21657
---
 activesupport/CHANGELOG.md                                   |  6 ++++++
 activesupport/lib/active_support/core_ext/date.rb            |  2 +-
 activesupport/lib/active_support/core_ext/date/blank.rb      | 12 ++++++++++++
 activesupport/lib/active_support/core_ext/date_time.rb       |  1 +
 activesupport/lib/active_support/core_ext/date_time/blank.rb | 12 ++++++++++++
 activesupport/lib/active_support/core_ext/object/blank.rb    | 11 +++++++++++
 activesupport/lib/active_support/time_with_zone.rb           |  5 +++++
 7 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 activesupport/lib/active_support/core_ext/date/blank.rb
 create mode 100644 activesupport/lib/active_support/core_ext/date_time/blank.rb

(limited to 'activesupport')

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 7d090eca02..69413fef47 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Short-circuit `blank?` on date and time values since they are never blank.
+
+    Fixes #21657
+
+    *Andrew White*
+
 *   Replaced deprecated `ThreadSafe::Cache` with its successor `Concurrent::Map` now that
     the thread_safe gem has been merged into concurrent-ruby.
 
diff --git a/activesupport/lib/active_support/core_ext/date.rb b/activesupport/lib/active_support/core_ext/date.rb
index 465fedda80..7f0f4639a2 100644
--- a/activesupport/lib/active_support/core_ext/date.rb
+++ b/activesupport/lib/active_support/core_ext/date.rb
@@ -1,5 +1,5 @@
 require 'active_support/core_ext/date/acts_like'
+require 'active_support/core_ext/date/blank'
 require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/date/conversions'
 require 'active_support/core_ext/date/zones'
-
diff --git a/activesupport/lib/active_support/core_ext/date/blank.rb b/activesupport/lib/active_support/core_ext/date/blank.rb
new file mode 100644
index 0000000000..71627b6a6f
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date/blank.rb
@@ -0,0 +1,12 @@
+require 'date'
+
+class Date #:nodoc:
+  # No Date is blank:
+  #
+  #   Date.today.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb
index e8a27b9f38..bcb228b09a 100644
--- a/activesupport/lib/active_support/core_ext/date_time.rb
+++ b/activesupport/lib/active_support/core_ext/date_time.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/date_time/acts_like'
+require 'active_support/core_ext/date_time/blank'
 require 'active_support/core_ext/date_time/calculations'
 require 'active_support/core_ext/date_time/conversions'
 require 'active_support/core_ext/date_time/zones'
diff --git a/activesupport/lib/active_support/core_ext/date_time/blank.rb b/activesupport/lib/active_support/core_ext/date_time/blank.rb
new file mode 100644
index 0000000000..56981b75fb
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/date_time/blank.rb
@@ -0,0 +1,12 @@
+require 'date'
+
+class DateTime #:nodoc:
+  # No DateTime is ever blank:
+  #
+  #   DateTime.now.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/object/blank.rb b/activesupport/lib/active_support/core_ext/object/blank.rb
index a294228979..039c50a4a2 100644
--- a/activesupport/lib/active_support/core_ext/object/blank.rb
+++ b/activesupport/lib/active_support/core_ext/object/blank.rb
@@ -127,3 +127,14 @@ class Numeric #:nodoc:
     false
   end
 end
+
+class Time #:nodoc:
+  # No Time is blank:
+  #
+  #   Time.now.blank? # => false
+  #
+  # @return [false]
+  def blank?
+    false
+  end
+end
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 07fc787550..eb26eb5ee5 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -388,6 +388,11 @@ module ActiveSupport
     end
     alias_method :kind_of?, :is_a?
 
+    # An instance of ActiveSupport::TimeWithZone is never blank
+    def blank?
+      false
+    end
+
     def freeze
       period; utc; time # preload instance variables before freezing
       super
-- 
cgit v1.2.3