Merge pull request #14 from duke-libraries/approximate-interval-fix

Display approximate prefix for "to" date in interval; Fixes #13
corylown · Sep 28, 2016 · 79f3f97 · 79f3f97
2 parents dea0b01 + 84ddeee
commit 79f3f97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/edtf/humanize/interval.rb b/lib/edtf/humanize/interval.rb
@@ -5,7 +5,11 @@ module Interval
       include Edtf::Humanize::Formats
 
       def humanize
-        "#{apply_if_approximate(self.from)}#{simple_date_format(self.from)}#{Edtf::Humanize.configuration.interval_connector}#{simple_date_format(self.to)}"
+        "#{apply_if_approximate(self.from)}"\
+        "#{simple_date_format(self.from)}"\
+        "#{Edtf::Humanize.configuration.interval_connector}"\
+        "#{apply_if_approximate(self.to)}"\
+        "#{simple_date_format(self.to)}"\
       end
 
       private

diff --git a/test/edtf_humanize_test.rb b/test/edtf_humanize_test.rb
@@ -30,7 +30,7 @@ class HumanizeIntervalTest < ActiveSupport::TestCase
 class HumanizeApproximateIntervalTest < ActiveSupport::TestCase
   test "should return a humanized approximate interval string" do
     d = Date.edtf('1970~/1980~')
-    assert_equal "circa 1970 to 1980", d.humanize
+    assert_equal "circa 1970 to circa 1980", d.humanize
   end
 end