From 77ce9b795c62d8241b22878cf60ca688fa4b44a1 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 11:35:55 +0100
Subject: Move date helpers to DateTimeHelper

---
 app/helpers/date_time_helper.rb | 63 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 app/helpers/date_time_helper.rb

(limited to 'app/helpers/date_time_helper.rb')

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
new file mode 100644
index 000000000..831006e29
--- /dev/null
+++ b/app/helpers/date_time_helper.rb
@@ -0,0 +1,63 @@
+module DateTimeHelper
+    # Public: Usually-correct format for a DateTime-ish object
+    # To define a new new format define the `simple_date_{FORMAT}` method
+    #
+    # date - a DateTime, Date or Time
+    # opts - a Hash of options (default: { format: :html})
+    #        :format - :html returns a HTML <time> tag
+    #                  :text returns a plain String
+    #
+    # Examples
+    #
+    #   simple_date(Time.now)
+    #   # => "<time>..."
+    #
+    #   simple_date(Time.now, :format => :text)
+    #   # => "March 10, 2014"
+    #
+    # Returns a String
+    # Raises ArgumentError if the format is unrecognized
+    def simple_date(date, opts = {})
+        opts = { :format => :html }.merge(opts)
+        date_formatter = "simple_date_#{ opts[:format] }"
+
+        if respond_to?(date_formatter)
+            send(date_formatter, date)
+        else
+            raise ArgumentError, "Unrecognised format :#{ opts[:format] }"
+        end
+    end
+
+    # Usually-correct HTML formatting of a DateTime-ish object
+    # Use LinkToHelper#simple_date with desired formatting options
+    #
+    # date - a DateTime, Date or Time
+    #
+    # Returns a String
+    def simple_date_html(date)
+        date = date.in_time_zone unless date.is_a? Date
+        time_tag date, simple_date_text(date), :title => date.to_s
+    end
+
+    # Usually-correct plain text formatting of a DateTime-ish object
+    # Use LinkToHelper#simple_date with desired formatting options
+    #
+    # date - a DateTime, Date or Time
+    #
+    # Returns a String
+    def simple_date_text(date)
+        date = date.in_time_zone.to_date unless date.is_a? Date
+
+        date_format = _("simple_date_format")
+        date_format = :long if date_format == "simple_date_format"
+        I18n.l(date, :format => date_format)
+    end
+
+    def simple_time(date)
+        return date.strftime("%H:%M:%S").strip
+    end
+
+    def year_from_date(date)
+        return date.strftime("%Y").strip
+    end
+end
-- 
cgit v1.2.3


From dbeecf59d62bf878fc6f4fe8a976f66f19cde415 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 11:45:18 +0100
Subject: Add specs for DateTimeHelper#year_from_date

---
 app/helpers/date_time_helper.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'app/helpers/date_time_helper.rb')

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index 831006e29..c96265006 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -57,7 +57,17 @@ module DateTimeHelper
         return date.strftime("%H:%M:%S").strip
     end
 
+    # Return the year component from a date
+    #
+    # date - a DateTime, Date or Time
+    #
+    # Examples
+    #
+    #   year_from_date(Date.new(2012, 11, 21))
+    #   # => "2012"
+    #
+    # Returns a String
     def year_from_date(date)
-        return date.strftime("%Y").strip
+        date.strftime("%Y").strip
     end
 end
-- 
cgit v1.2.3


From ce262c7c4291533468f57fb209131828d7e08462 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 11:56:56 +0100
Subject: Add specs for DateTimeHelper#simple_time

---
 app/helpers/date_time_helper.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'app/helpers/date_time_helper.rb')

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index c96265006..5fcec5a87 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -53,8 +53,18 @@ module DateTimeHelper
         I18n.l(date, :format => date_format)
     end
 
+    # Strips the date from a DateTime
+    #
+    # date - a DateTime, Date or Time
+    #
+    # Examples
+    #
+    #   simple_time(Time.now)
+    #   # => "10:46:54"
+    #
+    # Returns a String
     def simple_time(date)
-        return date.strftime("%H:%M:%S").strip
+        date.strftime("%H:%M:%S").strip
     end
 
     # Return the year component from a date
-- 
cgit v1.2.3


From d5b1587b378c73354b1677fb17e96f39c76f2ec3 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Tue, 3 Jun 2014 11:59:54 +0100
Subject: Minor tidying of DateTimeHelper and specs

---
 app/helpers/date_time_helper.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'app/helpers/date_time_helper.rb')

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index 5fcec5a87..f8d4b3611 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -24,7 +24,7 @@ module DateTimeHelper
         if respond_to?(date_formatter)
             send(date_formatter, date)
         else
-            raise ArgumentError, "Unrecognised format :#{ opts[:format] }"
+            raise ArgumentError, "Unrecognized format :#{ opts[:format] }"
         end
     end
 
@@ -35,7 +35,7 @@ module DateTimeHelper
     #
     # Returns a String
     def simple_date_html(date)
-        date = date.in_time_zone unless date.is_a? Date
+        date = date.in_time_zone unless date.is_a?(Date)
         time_tag date, simple_date_text(date), :title => date.to_s
     end
 
@@ -48,8 +48,8 @@ module DateTimeHelper
     def simple_date_text(date)
         date = date.in_time_zone.to_date unless date.is_a? Date
 
-        date_format = _("simple_date_format")
-        date_format = :long if date_format == "simple_date_format"
+        date_format = _('simple_date_format')
+        date_format = :long if date_format == 'simple_date_format'
         I18n.l(date, :format => date_format)
     end
 
-- 
cgit v1.2.3


From 07556cd8d6e48f5ca54eb2e8b09fba179f7579a3 Mon Sep 17 00:00:00 2001
From: Gareth Rees <gareth@mysociety.org>
Date: Wed, 4 Jun 2014 15:45:52 +0100
Subject: Remove DateTimeHelper#year_from_date

DateTime, Date and Time all have #year methods
---
 app/helpers/date_time_helper.rb | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'app/helpers/date_time_helper.rb')

diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb
index f8d4b3611..5f129e590 100644
--- a/app/helpers/date_time_helper.rb
+++ b/app/helpers/date_time_helper.rb
@@ -66,18 +66,4 @@ module DateTimeHelper
     def simple_time(date)
         date.strftime("%H:%M:%S").strip
     end
-
-    # Return the year component from a date
-    #
-    # date - a DateTime, Date or Time
-    #
-    # Examples
-    #
-    #   year_from_date(Date.new(2012, 11, 21))
-    #   # => "2012"
-    #
-    # Returns a String
-    def year_from_date(date)
-        date.strftime("%Y").strip
-    end
 end
-- 
cgit v1.2.3