theusual 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af68770c8a5f6f30a66ea5dc1288c437e82f39c
-  data.tar.gz: 15e247e1587c85d4148d73ae4b7e9fe09d1dc627
+  metadata.gz: 7dacb5e7a014566aa0c349f8d1ebf456a7668657
+  data.tar.gz: b7ef75744482e6bffd73885d698337619e130ac4
 SHA512:
-  metadata.gz: 54c0b663bbe157dc87899136c0fe69f41b048ca68ea1f1ffa069294724603542c5f4980eac736989647e1e1e8e8e4227dcccf29b472c716b9e546a3317d91727
-  data.tar.gz: 2f2954952235ae2812cb04e51d45947a48e881a2aabd4a71b0feb72b8c42f1b5f4aaee7b8a13d0a8e88bbfff61d4ca0857ef97c5d20157dfd0693ba46874867f
+  metadata.gz: dc9842b4be2725073029d4fae4c424df5ea22cf7af53fa669c36cf8ab85fde7bdff882a5f05348b9b7385912e52a9cca759989be4715ee36922732eba7e82739
+  data.tar.gz: 65cf8436c7fa60ed4b15f32267c5d5a15a8432f965a87e724cc5ed9bdd85a0f322e23c05384a8d2a1398bcfcca8eb79f925fd5ca061e13d6ac8812d975846a19

data/lib/theusual/time.rb

@@ -1,4 +1,8 @@
 class Time
+  MINUTES_IN_THREE_QUARTERS_YEAR = 394200
+  MINUTES_IN_QUARTER_YEAR = 131400
+  MINUTES_IN_YEAR = 525600
+
 
   def self.at_ms ms
     # convert an integer representing Unix time in milliseconds
@@ -10,23 +14,78 @@ class Time
     (to_f * 1_000).to_i
   end
 
+  # inspired by actionview/lib/action_view/helpers/date_helper.rb
+  def humanize(to_time = nil, options = {})
+    from_time = self.utc
+    to_time ||= Time.now.utc
+    from_time, to_time = to_time, from_time if from_time > to_time
+
+    distance_in_minutes = ((to_time.to_i - from_time.to_i) / 60.0).to_i
+    distance_in_seconds = (to_time.to_i - from_time.to_i).to_i
 
-  def humanize
-    a = (Time.now.utc - self.utc).to_i
-
-    case a
-      when 0 then 'just now'
-      when 1 then 'a second ago'
-      when 2..59 then a.to_s + ' seconds ago'
-      when 60..119 then 'a minute ago' #120 = 2 minutes
-      when 120..3540 then (a / 60).to_i.to_s + ' minutes ago'
-      when 3541..7100 then 'an hour ago' # 3600 = 1 hour
-      when 7101..82800 then ((a + 99) / 3600).to_i.to_s + ' hours ago'
-      when 82801..172000 then 'a day ago' # 86400 = 1 day
-      when 172001..518400 then ((a + 800) / (60 * 60 * 24)).to_i.to_s + ' days ago'
-      when 518400..1036800 then 'a week ago'
-      else ((a+180000)/(60*60*24*7)).to_i.to_s + ' weeks ago'
+    res = case distance_in_minutes
+    when 0
+      if options[:seconds]
+        case distance_in_seconds
+          when 1      then [ :a_second ]
+          when 2..4   then [ :less_than_x_seconds, 5 ]
+          when 5..9   then [ :less_than_x_seconds, 10 ]
+          when 10..29 then [ :less_than_x_seconds, 30 ]
+          when 30..39 then [ :half_a_minute ]
+          when 40..59 then [ :less_than_a_minute ]
+          else             [ :a_minute ]
+        end
+      else
+        if distance_in_seconds == 0
+          [ :just_now ]
+        else
+          [ :less_than_a_minute ]
+        end
+      end
+    when 1                then [ :a_minute ]
+    when 2...45           then [ :x_minutes,      distance_in_minutes ]
+    when 45...59          then [ :about_an_hour ]
+    when 60               then [ :an_hour ]
+    when 61...90          then [ :about_an_hour ]
+    # 90 mins up to 24 hours
+    when 90...1440        then [ :about_x_hours,  (distance_in_minutes.to_f / 60.0).round ]
+    # 24 hours up to  hours
+    when 1440...2160      then [ :a_day ]
+    # 36 hours up to 30 days
+    when 2160...43200     then [ :x_days,         (distance_in_minutes.to_f / 1440.0).round ]
+    # 30 days up to 60 days
+    when 43200...86400    then [ :about_x_months, (distance_in_minutes.to_f / 43200.0).round ]
+    # 60 days up to 365 days
+    when 86400...525600   then [ :x_months,       (distance_in_minutes.to_f / 43200.0).round ]
+    else
+      fyear = from_time.year
+      fyear += 1 if from_time.month >= 3
+      tyear = to_time.year
+      tyear -= 1 if to_time.month < 3
+      leap_years = (fyear > tyear) ? 0 : (fyear..tyear).count{|x| Date.leap?(x)}
+      minute_offset_for_leap_year = leap_years * 1440
+      # Discount the leap year days when calculating year distance.
+      # e.g. if there are 20 leap year days between 2 dates having the same day
+      # and month then the based on 365 days calculation
+      # the distance in years will come out to over 80 years when in written
+      # English it would read better as about 80 years.
+      minutes_with_offset = distance_in_minutes - minute_offset_for_leap_year
+      remainder                   = (minutes_with_offset % MINUTES_IN_YEAR)
+      distance_in_years           = (minutes_with_offset.div MINUTES_IN_YEAR)
+      if remainder < MINUTES_IN_QUARTER_YEAR
+        [ :about_x_years,  distance_in_years ]
+      elsif remainder < MINUTES_IN_THREE_QUARTERS_YEAR
+        [ :over_x_years,   distance_in_years ]
+      else
+        [ :almost_x_years, distance_in_years + 1 ]
+      end
     end
+
+    if res.count > 1
+      res.first.to_s.sub 'x', res.last.to_s
+    else
+      res.first.to_s
+    end.gsub '_', ' '
   end
 
 end

data/lib/theusual/version.rb

@@ -1,3 +1,3 @@
 module TheUsual
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/test_time.rb

@@ -5,26 +5,58 @@ TheUsual::load 'time'
 
 class TimeTest < Minitest::Test
 
-  def test_all
+  def test_ms
+    ts = Time.now.utc
+
+    assert(ts.to_ms.class < Integer)
+
+    assert(
+      # to_ms will truncate, so allow for small error
+      ts - Time.at_ms(ts.to_ms) <= 0.001
+    )
+  end
+
+
+  def test_humanize
     assert_equal(
       'just now',
       Time.new.humanize
     )
 
     assert_equal(
-      'a second ago',
-      (Time.new - 1).humanize
+      'less than a minute',
+      (Time.new - 50).humanize
     )
 
     assert_equal(
-      '2 seconds ago',
-      (Time.new - 2).humanize
+      'a second',
+      (Time.new - 1).humanize(nil, seconds: true)
     )
 
     assert_equal(
-      'a minute ago',
+      'a minute',
       (Time.new - 60).humanize
     )
+
+    assert_equal(
+      'an hour',
+      (Time.new - 60 * 60).humanize
+    )
+
+    assert_equal(
+      'an hour',
+      (Time.new - 60 * 60 - 5).humanize
+    )
+
+    assert_equal(
+      'about an hour',
+      (Time.new - 60 * 61).humanize
+    )
+
+    assert_equal(
+      'a day',
+      (Time.new - 60 * 60 * 24).humanize
+    )
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theusual
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake