jekyll-timeago 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f57c4e0c53276d82a61f42b10703c7231c0bb6ab
-  data.tar.gz: 4a3df430759408fe8838463d1264557e9080ec66
+  metadata.gz: 6e0b337ab84b9a0877f22bf5f4c442d6f44daace
+  data.tar.gz: c26bd56160a5effaf76a2968a96d9ee127ca4b86
 SHA512:
-  metadata.gz: ed67ca75b17804ca091d0f41731cb526622653c3a9a363ce7a9d0edb507b4648fec872ff5b5effa067330b248a0e7cb5688c24d308a4de8751aea369e9606ee5
-  data.tar.gz: db9204fdae404fd4e5ebb4f90ebd357cb18621e4f8275ffd147abefd32a008200d375996da4ea6fba82f42068fffbefa2a4ee149eb662fe8c5786bb77dd48e08
+  metadata.gz: e78fdab222809a2afd8d64504418bc8e620663b7bd23adad641b6f8acab3c9c4e4e7028379a6419fae924a7b131bb44b3183262e5ae6c93d466acd07ec10953a
+  data.tar.gz: 3d7932fd4153e82fa8f47b817832d01054169c70102170e086d138d148b674fe96a493200098af41cb44c62cbf701751b561478386c1cbd1b5c8ccac7d4c9b27

data/lib/jekyll-timeago/core.rb

@@ -5,20 +5,10 @@ module Jekyll
     module Core
       extend self
 
-      DAYS_PER = {
-        days:   1,
-        weeks:  7,
-        months: 30,
-        years:  365
-      }
-
-      # Max level of detail
-      # years > months > weeks > days
-      # 1 year and 7 months and 2 weeks and 6 days
+      # Max level of detail: years > months > weeks > days
       MAX_DEPTH_LEVEL = 4
 
       # Default level of detail
-      # 1 month and 5 days, 3 weeks and 2 days, 2 years and 6 months
       DEFAULT_DEPTH_LEVEL = 2
 
       def timeago(from, to = Date.today, options = {})
@@ -46,7 +36,6 @@ module Jekyll
         (1..MAX_DEPTH_LEVEL).include?(depth) ? depth : DEFAULT_DEPTH_LEVEL
       end
 
-      # Days passed to time ago sentence
       def time_ago_to_now(from, to, depth)
         days_passed = (to - from).to_i
 
@@ -54,19 +43,14 @@ module Jekyll
         return t(:yesterday) if days_passed == 1
         return t(:tomorrow)  if days_passed == -1
 
-        future   = days_passed < 0
-        slots    = build_time_ago_slots(days_passed.abs, depth)
-        sentence = to_sentence(slots)
+        past_or_future = from < to ? :past : :future
+        slots = build_time_ago_slots(days_passed.abs, depth)
 
-        if future
-          t(:future, date_range: sentence)
-        else
-          t(:past, date_range: sentence)
-        end
+        t(past_or_future, date_range: to_sentence(slots))
       end
 
       def t(key, options = {})
-        MiniI18n.translate(key, @options.merge(options))
+        MiniI18n.t(key, @options.merge(options))
       end
 
       # Builds time ranges: ['1 month', '5 days']
@@ -76,27 +60,31 @@ module Jekyll
       def build_time_ago_slots(days_passed, depth, current_slots = [])
         return current_slots if depth == 0 || days_passed == 0
 
-        time_range = days_to_time_range(days_passed)
-        days       = DAYS_PER[time_range]
-        num_elems  = (days_passed / days).to_i
+        range     = days_to_range(days_passed)
+        days      = days_in(range)
+        num_elems = (days_passed / days).to_i
 
-        current_slots << t(time_range, count: num_elems)
+        current_slots << t(range, count: num_elems)
 
         pending_days = days_passed - (num_elems * days)
         build_time_ago_slots(pending_days, depth - 1, current_slots)
       end
 
-      # Number of days to minimum period time which can be grouped
-      def days_to_time_range(days_passed)
-        case days_passed.abs
-        when 1..6
-          :days
-        when 7..30
-          :weeks
-        when 31..365
-          :months
-        else
-          :years
+      def days_to_range(days)
+        case days.abs
+        when 1..6 then :days
+        when 7..30 then :weeks
+        when 31..365 then :months
+        else :years
+        end
+      end
+
+      def days_in(range)
+        case range
+        when :days then 1
+        when :weeks then 7
+        when :months then 30
+        when :years then 365
         end
       end
 

data/lib/jekyll-timeago/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Timeago
-    VERSION = "0.12.0"
+    VERSION = "0.12.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-timeago
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - markets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_i18n