Move date helpers to DateTimeHelper

5 files changed, 120 insertions, 109 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 33525cb3d..45b042354 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -13,6 +13,9 @@ module ApplicationHelper
     # all of all.
     include LinkToHelper
 
+    # Some extra date and time formatters
+    include DateTimeHelper
+
     # Site-wide access to configuration settings
     include ConfigHelper
 
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
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index e5ef2ca39..3709469cf 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -279,68 +279,6 @@ module LinkToHelper
         end
     end
 
-    # 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
-
     #I18n locale switcher
 
     def locale_switcher(locale, params)
diff --git a/spec/helpers/date_time_helper_spec.rb b/spec/helpers/date_time_helper_spec.rb
new file mode 100644
index 000000000..aa047052c
--- /dev/null
+++ b/spec/helpers/date_time_helper_spec.rb
@@ -0,0 +1,54 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe DateTimeHelper do
+
+    include DateTimeHelper
+
+    describe 'simple_date' do
+
+        it 'formats a date in html by default' do
+            time = Time.utc(2012, 11, 07, 21, 30, 26)
+            self.should_receive(:simple_date_html).with(time)
+            simple_date(time)
+        end
+
+        it 'formats a date in the specified format' do
+            time = Time.utc(2012, 11, 07, 21, 30, 26)
+            self.should_receive(:simple_date_text).with(time)
+            simple_date(time, :format => :text)
+        end
+
+        it 'raises an argument error if given an unrecognized format' do
+            time = Time.utc(2012, 11, 07, 21, 30, 26)
+            expect { simple_date(time, :format => :unknown) }.to raise_error(ArgumentError)
+        end
+
+    end
+
+    describe 'simple_date_html' do
+
+        it 'formats a date in a time tag' do
+            Time.use_zone('London') do
+                time = Time.utc(2012, 11, 07, 21, 30, 26)
+                expected = "<time datetime=\"2012-11-07T21:30:26+00:00\" title=\"2012-11-07 21:30:26 +0000\">November 07, 2012</time>"
+                simple_date_html(time).should == expected
+            end
+        end
+
+    end
+
+    describe 'simple_date_text' do
+
+        it 'should respect time zones' do
+            Time.use_zone('Australia/Sydney') do
+                simple_date_text(Time.utc(2012, 11, 07, 21, 30, 26)).should == 'November 08, 2012'
+            end
+        end
+
+        it 'should handle Date objects' do
+            simple_date_text(Date.new(2012, 11, 21)).should == 'November 21, 2012'
+        end
+
+    end
+
+end
diff --git a/spec/helpers/link_to_helper_spec.rb b/spec/helpers/link_to_helper_spec.rb
index f7be9eab0..b11c35056 100644
--- a/spec/helpers/link_to_helper_spec.rb
+++ b/spec/helpers/link_to_helper_spec.rb
@@ -145,51 +145,4 @@ describe LinkToHelper do
 
     end
 
-    describe 'simple_date' do
-
-        it 'formats a date in html by default' do
-            time = Time.utc(2012, 11, 07, 21, 30, 26)
-            self.should_receive(:simple_date_html).with(time)
-            simple_date(time)
-        end
-
-        it 'formats a date in the specified format' do
-            time = Time.utc(2012, 11, 07, 21, 30, 26)
-            self.should_receive(:simple_date_text).with(time)
-            simple_date(time, :format => :text)
-        end
-
-        it 'raises an argument error if given an unrecognized format' do
-            time = Time.utc(2012, 11, 07, 21, 30, 26)
-            expect { simple_date(time, :format => :unknown) }.to raise_error(ArgumentError)
-        end
-
-    end
-
-    describe 'simple_date_html' do
-
-        it 'formats a date in a time tag' do
-            Time.use_zone('London') do
-                time = Time.utc(2012, 11, 07, 21, 30, 26)
-                expected = "<time datetime=\"2012-11-07T21:30:26+00:00\" title=\"2012-11-07 21:30:26 +0000\">November 07, 2012</time>"
-                simple_date_html(time).should == expected
-            end
-        end
-
-    end
-
-    describe 'simple_date_text' do
-
-        it 'should respect time zones' do
-            Time.use_zone('Australia/Sydney') do
-                simple_date_text(Time.utc(2012, 11, 07, 21, 30, 26)).should == 'November 08, 2012'
-            end
-        end
-
-        it 'should handle Date objects' do
-            simple_date_text(Date.new(2012, 11, 21)).should == 'November 21, 2012'
-        end
-
-    end
-
 end