jekyll-timeago 0.15.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53219f64cf2f2296edacdf4a4404de70b5e046031266f00838b0913d69371c29
-  data.tar.gz: 8bba488eeb3a2498c03beb31c282300764392b3d392f7d5ec176682fd41847e8
+  metadata.gz: 2f8ae690f6686791715f0397fd0c38f6284c5857e78d9cc7669d437d402ce838
+  data.tar.gz: '083e7d05d403c01c22dac5f5f2bc5b832279dd5a7fb65a049e497939078ed0e9'
 SHA512:
-  metadata.gz: 516cbd739e3c8c8824b441be6e83e079d9ea1009dfb59157b4d5dfbb35a56f352da704bfd10696ae17b6b957d308229c2553ef2e86cc0e2e14bf22c6ab18efcb
-  data.tar.gz: 57dfdd94cd19b7f7395ee73346d78766d376439673b665774c7befed2fe9cee19008ed3929744d6abcaf5699dc9afe57610e358cfa7e277e34153b2cab09f0e4
+  metadata.gz: c1184731bf638031b1ab559e9fc26c0e98a641d33a4e71b5ae7fb88c5a6c6982975de6f6d0c311daf88f76de4c1fdb6931acc54241cb8b860b4bb4b8621e45ed
+  data.tar.gz: 3c03eebcd1100a75059fc96f11987204c7fe08acf6879da4ea35d4a451f9902952b3932915e3a79d8ee532b2bd21dd1a6f7fa64db984d91af2ca57fa8261b649

data/.github/workflows/ci.yml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
   test:
@@ -11,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', 'head']
+        ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', 'head']
         gemfile: ['jekyll_v3', 'jekyll_v4']
     steps:
       - uses: actions/checkout@v3

data/.gitignore

@@ -4,4 +4,6 @@ Gemfile.lock
 spec/_site
 .rpsec
 *.gemfile.lock
-.byebug_history
+.byebug_history
+.bundle
+vendor/

data/README.md

@@ -8,15 +8,16 @@
 
 Main features:
 
-- Compute distance of dates, in words, ie: `1 week and 2 days ago`, `5 months ago`, `in 1 year`
-- Future times
+- Compute distance of dates, in words: `1 week and 2 days ago`, `5 months ago`
+- Future times: `in 1 year`
+- Alternative formats: short (`2y and 1mo ago`), array (`['2 years', '1 month']`), and hash (`{years: 2, months: 1}`)
 - Out of the box support for `Jekyll` projects, available as a Liquid Filter and as a Liquid Tag
-- Localization
+- Localization: `hace 3 semanas`, `3週間前`, `il y a environ 3 semaines`
 - Level of detail customization
-- Command line utility
-- Approximate distance, with customizable threshold, ie: `366 days` becomes `1 year ago` instead of `1 year and 1 day ago`
+- CLI
+- Approximate distance, with customizable threshold: `366 days` becomes `1 year ago` instead of `1 year and 1 day ago`
 
-In fact, `jekyll-timeago` started as an extension for the [Liquid](https://github.com/Shopify/liquid) template engine, to be used in Jekyll and Octopress backed sites. But actually, you can use it easily on any Ruby project and even as a tool from the [terminal](#cli)!
+In fact, `jekyll-timeago` started as an extension for the [Liquid](https://github.com/Shopify/liquid) template engine, to be used in Jekyll backed sites. But actually, you can use it easily on any Ruby project and even as a tool from the [terminal](#cli)!
 
 Read more about the `Jekyll` integration [in this section](#jekyll-integration).
 
@@ -73,7 +74,7 @@ Examples:
 => "in 2 years and 8 months"
 ```
 
-**NOTE** If you have the gem installed in your system globally, and you're not using Bundler (probably because you're are writing a basic script), don't forget to require the library first:
+**NOTE** If you have the gem installed in your system globally, and you're not using Bundler (probably because you're are writing a small script), don't forget to require the library first:
 
 ```ruby
 require 'jekyll-timeago'
@@ -84,7 +85,7 @@ puts timeago('2030-1-1')
 
 ### Options
 
-* `locale`
+#### `locale`
 
 To use a different language:
 
@@ -97,7 +98,7 @@ To use a different language:
 
 Read more about the localization options [here](#localization).
 
-* `depth`
+#### `depth`
 
 You are able to change the level of detail (from 1 up to 4, 2 by default) to get higher or lower granularity:
 
@@ -108,7 +109,7 @@ You are able to change the level of detail (from 1 up to 4, 2 by default) to get
 => "5 years, 5 months, 3 weeks and 4 days ago"
 ```
 
-- `threshold`
+#### `threshold`
 
 The next component in the time must at least match this threshold to be picked. Set to 0 by default, so you don't get any approximations. Can be used to drop "straggling" values which are too low to be of any use (`in 7 months and 2 days` is as good as saying `in 7 months`).
 
@@ -117,6 +118,62 @@ The next component in the time must at least match this threshold to be picked.
 => "1 year ago"
 ```
 
+#### `style`
+
+Use `:short` style for abbreviated time formats:
+
+```ruby
+>> timeago(Date.today.prev_day(365), style: :short)
+=> "1y ago"
+>> timeago(Date.today.prev_day(30), style: :short)
+=> "1mo ago"
+>> timeago(Date.today.prev_day(7), style: :short)
+=> "1w ago"
+```
+
+Use `:array` style for structured data:
+
+```ruby
+>> timeago(Date.today.prev_day(365), style: :array)
+=> ["1 year"]
+>> timeago(Date.today.prev_day(160), style: :array)
+=> ["5 months", "1 week"]
+>> timeago(Date.today.prev_day(160), style: :array, locale: :es)
+=> ["5 meses", "1 semana"]
+```
+
+Use `:hash` style for structured hash data:
+
+```ruby
+>> timeago(Date.today.prev_day(365), style: :hash)
+=> {:years=>1}
+>> timeago(Date.today.prev_day(160), style: :hash)
+=> {:months=>5, :weeks=>1}
+>> timeago(Date.today.prev_day(160), style: :hash, locale: :es)
+=> {:meses=>5, :semanas=>1}
+```
+
+#### `only`
+
+Use the `only` option to accumulate all time into a single unit. Supported values are `:years`, `:months`, `:weeks`, and `:days`:
+
+```ruby
+>> timeago(Date.today.prev_day(365), only: :weeks)
+=> "52 weeks ago"
+>> timeago(Date.today.prev_day(365), only: :months)
+=> "12 months ago"
+>> timeago(Date.today.prev_day(100), only: :weeks)
+=> "14 weeks ago"
+>> timeago(Date.today.prev_day(500), only: :days)
+=> "500 days ago"
+>> timeago(Date.today.prev_day(365), only: :weeks, style: :short)
+=> "52w ago"
+>> timeago(Date.today.prev_day(365), only: :months, locale: :es)
+=> "hace 12 meses"
+>> timeago(Date.today.prev_day(365), only: :months, style: :hash)
+=> {:months=>12}
+```
+
 ## Localization
 
 By default, `jekyll-timego` already provides translations for some languages. You can check the list [here](lib/locales/). However, you are able to provide your own translations, or even override the originals, easily.
@@ -137,11 +194,21 @@ If you want to contribute and support more default languages, please feel free t
 You can also use `jekyll-timeago` from the command line:
 
 ```
-> jekyll-timeago --help
-> jekyll-timeago 2016-1-1
+> timeago --help
+> timeago 2016-1-1
 2 years and 6 months ago
-> jekyll-timeago 2016-1-1 --locale fr
+> timeago 2016-1-1 --locale fr
 il y a environ 2 années et 6 mois
+> timeago 2016-1-1 2018-1-1 --style short
+2y ago
+> timeago 2016-1-1 2018-1-1 -l es -s short
+hace 2a y 1d
+> timeago 2016-1-1 2018-1-1 --style hash
+{:years=>2, :days=>1}
+> timeago 2016-1-1 2018-1-1 --only weeks
+104 weeks ago
+> timeago 2016-1-1 2018-1-1 --only months -s short
+24mo ago
 ```
 
 ### Console
@@ -149,7 +216,7 @@ il y a environ 2 années et 6 mois
 Starts a custom IRB session with the `timeago` method included:
 
 ```
-> jekyll-timeago --console
+> timeago --console
 >> timeago(Date.today)
 => "today"
 ```

data/bin/timeago

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/jekyll-timeago"
+require "optparse"
+
+options = {}
+show_help = false
+show_version = false
+start_console = false
+
+parser = OptionParser.new do |opts|
+  opts.banner = <<~HELP_MESSAGE
+    Usage:
+
+        timeago <from_date> [to_date]
+
+    Notes:
+        [to_date] Optional, defaults to current date
+
+    Options:
+  HELP_MESSAGE
+
+  opts.on("-h", "--help", "Prints this message") do
+    show_help = true
+  end
+
+  opts.on("-v", "--version", "Prints the current version") do
+    show_version = true
+  end
+
+  opts.on("-c", "--console", "Starts an interactive IRB session with jekyll-timeago included") do
+    start_console = true
+  end
+
+  opts.on("-l", "--locale LOCALE", "Uses the provided locale") do |locale|
+    options[:locale] = locale
+  end
+
+  opts.on("-s", "--style STYLE", "Uses the provided style (short, array, hash)") do |style|
+    options[:style] = style
+  end
+
+  opts.on("-o", "--only UNIT", "Accumulates time in specified unit (years, months, weeks, days)") do |unit|
+    options[:only] = unit
+  end
+end
+
+begin
+  parser.parse!
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+  puts "Error! #{e}"
+  puts parser
+  exit 1
+end
+
+if show_help
+  puts parser
+elsif show_version
+  puts "v#{Jekyll::Timeago::VERSION}"
+elsif start_console
+  require "irb"
+  include Jekyll::Timeago
+  IRB.start
+elsif ARGV.empty?
+  puts parser
+else
+  ARGV << options if !options.empty?
+
+  begin
+    puts Jekyll::Timeago.timeago *ARGV
+  rescue ArgumentError => e
+    puts "Error! #{e}"
+  end
+end

data/lib/jekyll-timeago/core.rb

@@ -14,6 +14,12 @@ module Jekyll
       # Default threshold
       DEFAULT_THRESHOLD = 0
 
+      # Available styles
+      STYLES = %w(short array hash)
+
+      # Available "only" options
+      ONLY_OPTIONS = %w(years months weeks days)
+
       def timeago(from, to = Date.today, options = {})
         if to.is_a?(Hash)
           options = to
@@ -22,12 +28,14 @@ module Jekyll
 
         @options = options
 
-        from      = validate_date(from)
-        to        = validate_date(to)
-        depth     = validate_depth(@options[:depth] || @options["depth"])
-        threshold = validate_threshold(@options[:threshold] || @options["threshold"])
+        @from      = validate_date(from)
+        @to        = validate_date(to)
+        @depth     = validate_depth(@options[:depth] || @options["depth"])
+        @style     = validate_style(@options[:style] || @options["style"])
+        @threshold = validate_threshold(@options[:threshold] || @options["threshold"])
+        @only      = validate_only(@options[:only] || @options["only"])
 
-        time_ago_to_now(from, to, depth, threshold)
+        time_ago_to_now
       end
 
       private
@@ -44,52 +52,181 @@ module Jekyll
         (1..MAX_DEPTH_LEVEL).include?(depth) ? depth : DEFAULT_DEPTH_LEVEL
       end
 
-      def time_ago_to_now(from, to, depth, threshold)
-        days_passed = (to - from).to_i
+      def validate_style(style)
+        style = style.to_s
+        STYLES.include?(style) ? style : nil
+      end
+
+      def validate_only(only)
+        only = only.to_s
+        ONLY_OPTIONS.include?(only) ? only : nil
+      end
 
-        return t(:today)     if days_passed == 0
-        return t(:yesterday) if days_passed == 1
-        return t(:tomorrow)  if days_passed == -1
+      def time_ago_to_now
+        days_passed = (@to - @from).to_i
+
+        if @style == "hash"
+          return { localized_unit_name(:days) => 0 }  if days_passed == 0
+          return { localized_unit_name(:days) => 1 }  if days_passed == 1
+          return { localized_unit_name(:days) => -1 } if days_passed == -1
+        elsif @style == "array"
+          return [t(:today)]     if days_passed == 0
+          return [t(:yesterday)] if days_passed == 1
+          return [t(:tomorrow)]  if days_passed == -1
+        else
+          return t(:today)     if days_passed == 0
+          return t(:yesterday) if days_passed == 1
+          return t(:tomorrow)  if days_passed == -1
+        end
 
-        past_or_future = from < to ? :past : :future
-        slots = build_time_ago_slots(days_passed.abs, depth, threshold)
+        past_or_future = @from < @to ? :past : :future
+        slots = build_time_ago_slots(days_passed.abs)
 
-        t(past_or_future, date_range: to_sentence(slots))
+        if @style == "array" || @style == "hash"
+          slots
+        else
+          t(past_or_future, date_range: to_sentence(slots))
+        end
       end
 
       def t(key, options = {})
         MiniI18n.t(key, @options.merge(options))
       end
 
-      # Builds time ranges: ['1 month', '5 days']
-      # - days_passed: integer in absolute
-      # - depth: level of detail
-      # - threshold: minimum fractional difference to keep for next slot
-      # - current_slots: built time slots
-      def build_time_ago_slots(days_passed, depth, threshold, current_slots = [])
-        return current_slots if depth == 0 || days_passed == 0
-
-        range     = days_to_range(days_passed)
-        days      = days_in(range)
-        num_elems = (days_passed / days).to_i
+      # Translate a time unit, using short form if style is :short
+      def translate_unit(unit, count)
+        if @style == "short"
+          t("#{unit}_short", count: count)
+        else
+          t(unit, count: count)
+        end
+      end
 
-        current_slots << t(range, count: num_elems)
+      # Get localized unit name for hash keys (always plural form)
+      def localized_unit_name(unit)
+        # Extract the unit name from the plural form translation
+        translated = t(unit, count: 2)
+        # Remove any count prefix (e.g. "2 años" -> "años")
+        translated.gsub(/^\d+\s+/, '').to_sym
+      end
 
-        pending_days = days_passed - (num_elems * days)
+      # Builds time ranges with natural unit conversions: ['1 month', '5 days'] or {:months => 1, :days => 5}
+      def build_time_ago_slots(days_passed)
+        # If "only" option is specified, calculate total time in that unit
+        return build_only_slots(days_passed) if @only
+        
+        # Calculate components with natural unit conversions
+        components = calculate_natural_components(days_passed)
+        
+        # Select components based on depth and threshold  
+        selected = select_components(components, days_passed)
+        
+        # Format output based on current style
+        if @style == "hash"
+          result = {}
+          selected.each { |unit, count| result[localized_unit_name(unit)] = count }
+          result
+        else
+          selected.map { |unit, count| translate_unit(unit, count) }
+        end
+      end
 
-        if pending_days >= (days_passed * threshold).floor
-          build_time_ago_slots(pending_days, depth - 1, threshold, current_slots)
+      # Build time slots when "only" option is specified
+      def build_only_slots(days_passed)
+        unit = @only.to_sym
+        count = calculate_total_in_unit(days_passed, unit)
+        
+        if @style == "hash"
+          { localized_unit_name(unit) => count }
         else
-          current_slots
+          [translate_unit(unit, count)]
+        end
+      end
+
+      # Calculate total time in specified unit
+      def calculate_total_in_unit(days_passed, unit)        
+        case unit
+        when :days
+          days_passed
+        when :weeks
+          # Ensure minimum of 1 week if days_passed > 0
+          return 1 if days_passed > 0 && days_passed < 7
+          (days_passed / 7.0).round
+        when :months
+          # Ensure minimum of 1 month if days_passed > 0
+          return 1 if days_passed > 0 && days_passed < 30
+          (days_passed / 30.0).round
+        when :years
+          # Ensure minimum of 1 year if days_passed > 0
+          return 1 if days_passed > 0 && days_passed < 365
+          (days_passed / 365.0).round
         end
       end
 
-      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
+      def calculate_natural_components(days_passed)
+        years = days_passed / 365
+        remaining_days = days_passed % 365
+        
+        months = remaining_days / 30
+        remaining_days = remaining_days % 30
+        
+        weeks = remaining_days / 7
+        days = remaining_days % 7
+        
+        normalize_units({ years: years, months: months, weeks: weeks, days: days })
+      end
+
+      def normalize_units(components)
+        # Convert 12+ months to years (handles any multiple: 12 → 1yr, 24 → 2yr, 36 → 3yr, etc.)
+        if components[:months] >= 12
+          additional_years = components[:months] / 12
+          components[:years] += additional_years
+          components[:months] = components[:months] % 12
+        end
+        
+        # Convert 4+ weeks to months (proportional conversion)
+        if components[:weeks] >= 4
+          additional_months = components[:weeks] / 4
+          components[:months] += additional_months  
+          components[:weeks] = components[:weeks] % 4
+        end
+        
+        # After adding months, check again for year conversion (handles cascading)
+        if components[:months] >= 12
+          additional_years = components[:months] / 12
+          components[:years] += additional_years
+          components[:months] = components[:months] % 12
+        end
+        
+        components
+      end
+
+      # Select components based on depth and apply threshold filtering
+      def select_components(components, total_days)
+        result = []
+        
+        [:years, :months, :weeks, :days].each do |unit|
+          count = components[unit]
+          if count > 0 && result.length < @depth
+            result << [unit, count]
+          end
+        end
+        
+        apply_threshold_filtering(result, total_days)
+      end
+
+      # Filter out components that don't meet the threshold
+      def apply_threshold_filtering(components, total_days)
+        return components if @threshold == 0 || components.length <= 1
+        
+        # Calculate if smallest component meets threshold
+        last_unit, last_count = components.last
+        last_unit_days = last_count * days_in(last_unit)
+        
+        if last_unit_days < (total_days * @threshold).floor
+          components[0...-1] # Remove last component
+        else
+          components
         end
       end
 
@@ -112,4 +249,4 @@ module Jekyll
       end
     end
   end
-end
+end

data/lib/jekyll-timeago/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Timeago
-    VERSION = "0.15.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/locales/ca.yml

@@ -9,12 +9,16 @@ ca:
   years:
     one: '1 any'
     other: '%{count} anys'
+  years_short: '%{count}a'
   months:
     one: '1 mes'
     other: '%{count} mesos'
+  months_short: '%{count}m'
   weeks:
     one: '1 setmana'
     other: '%{count} setmanes'
+  weeks_short: '%{count}s'
   days:
     one: '1 dia'
     other: '%{count} dies'
+  days_short: '%{count}d'

data/lib/locales/de.yml

@@ -9,12 +9,16 @@ de:
   years:
     one: '1 Jahr'
     other: '%{count} Jahren'
+  years_short: '%{count}j'
   months:
     one: '1 Monat'
     other: '%{count} Monaten'
+  months_short: '%{count}mo'
   weeks:
     one: '1 Woche'
     other: '%{count} Wochen'
+  weeks_short: '%{count}w'
   days:
     one: '1 Tag'
     other: '%{count} Tage'
+  days_short: '%{count}d'

data/lib/locales/en.yml

@@ -9,12 +9,16 @@ en:
   years:
     one: '1 year'
     other: '%{count} years'
+  years_short: '%{count}y'
   months:
     one: '1 month'
     other: '%{count} months'
+  months_short: '%{count}mo'
   weeks:
     one: '1 week'
     other: '%{count} weeks'
+  weeks_short: '%{count}w'
   days:
     one: '1 day'
     other: '%{count} days'
+  days_short: '%{count}d'

data/lib/locales/es.yml

@@ -9,12 +9,16 @@ es:
   years:
     one: '1 año'
     other: '%{count} años'
+  years_short: '%{count}a'
   months:
     one: '1 mes'
     other: '%{count} meses'
+  months_short: '%{count}m'
   weeks:
     one: '1 semana'
     other: '%{count} semanas'
+  weeks_short: '%{count}s'
   days:
     one: '1 día'
     other: '%{count} días'
+  days_short: '%{count}d'

data/lib/locales/fr.yml

@@ -9,12 +9,16 @@ fr:
   years:
     one: '1 année'
     other: '%{count} années'
+  years_short: '%{count}a'
   months:
     one: '1 mois'
     other: '%{count} mois'
+  months_short: '%{count}mo'
   weeks:
     one: '1 semaine'
     other: '%{count} semaines'
+  weeks_short: '%{count}s'
   days:
     one: '1 jour'
     other: '%{count} jours'
+  days_short: '%{count}j'

data/lib/locales/it.yml

@@ -9,12 +9,16 @@ it:
   years:
     one: '1 anno'
     other: '%{count} anni'
+  years_short: '%{count}a'
   months:
     one: '1 mese'
     other: '%{count} mesi'
+  months_short: '%{count}m'
   weeks:
     one: '1 settimana'
     other: '%{count} settimane'
+  weeks_short: '%{count}s'
   days:
     one: '1 giorno'
     other: '%{count} giorni'
+  days_short: '%{count}g'

data/lib/locales/{ja.yaml → ja.yml}

@@ -9,12 +9,16 @@ ja:
   years:
     one: '1年'
     other: '%{count}年'
+  years_short: '%{count}年'
   months:
     one: '1ヶ月'
-    other: '%{count}个月'
+    other: '%{count}ヵ月'
+  months_short: '%{count}月'
   weeks:
     one: '1週間'
     other: '%{count}週間'
+  weeks_short: '%{count}週'
   days:
     one: '1日'
     other: '%{count}日'
+  days_short: '%{count}日'

data/lib/locales/pt.yml

@@ -9,12 +9,16 @@ pt:
   years:
     one: '1 ano'
     other: '%{count} anos'
+  years_short: '%{count}a'
   months:
     one: '1 mês'
     other: '%{count} meses'
+  months_short: '%{count}m'
   weeks:
     one: '1 semana'
     other: '%{count} semanas'
+  weeks_short: '%{count}s'
   days:
     one: '1 dia'
     other: '%{count} dias'
+  days_short: '%{count}d'

data/lib/locales/ru.yml

@@ -10,15 +10,19 @@ ru:
     one: 'год'
     few: '%{count} года'
     other: '%{count} лет'
+  years_short: '%{count}г'
   months:
     one: 'месяц'
     few: '%{count} месяца'
     other: '%{count} месяцев'
+  months_short: '%{count}м'
   weeks:
     one: 'неделю'
     few: '%{count} недели'
     other: '%{count} недель'
+  weeks_short: '%{count}н'
   days:
     one: 'день'
     few: '%{count} дня'
     other: '%{count} дней'
+  days_short: '%{count}д'

data/lib/locales/tr.yml

@@ -0,0 +1,24 @@
+tr:
+  today: 'bugün'
+  yesterday: 'dün'
+  tomorrow: 'yarın'
+  past: '%{date_range} önce'
+  future: '%{date_range} içinde'
+  last_word_connector: ', '
+  words_connector: ', '
+  years:
+    one: '1 yıl'
+    other: '%{count} yıl'
+  years_short: '%{count}y'
+  months:
+    one: '1 ay'
+    other: '%{count} ay'
+  months_short: '%{count}a'
+  weeks:
+    one: '1 hafta'
+    other: '%{count} hafta'
+  weeks_short: '%{count}h'
+  days:
+    one: '1 gün'
+    other: '%{count} gün'
+  days_short: '%{count}g'

data/lib/locales/zh_hans.yml

@@ -9,12 +9,16 @@ zh_hans:
   years:
     one: '1年'
     other: '%{count}年'
+  years_short: '%{count}年'
   months:
     one: '1个月'
     other: '%{count}个月'
+  months_short: '%{count}月'
   weeks:
     one: '1周'
     other: '%{count}周'
+  weeks_short: '%{count}周'
   days:
     one: '1天'
     other: '%{count}天'
+  days_short: '%{count}天'

data/spec/jekyll-timeago_spec.rb

@@ -23,8 +23,8 @@ describe Jekyll::Timeago do
 
       expected =
         "<p>2 años</p>\n"\
-        "<p>12 meses</p>\n"\
-        "<p>12 meses</p>\n"\
+        "<p>1 año</p>\n"\
+        "<p>1 año</p>\n"\
         "<p>2 años</p>\n"\
         "<p>en 1 año</p>\n"
 
@@ -36,6 +36,11 @@ describe Jekyll::Timeago do
     let (:sample_date) { Date.new(2014, 7, 30) }
     let (:today) { Date.today }
 
+    before(:all) do
+      # Reset original translations
+      MiniI18n.configure { |config| config.load_translations(Pathname(__dir__).join("../lib/locales/*.yml")) }
+    end
+
     it 'yesterday, today and tomorrow' do
       expect(timeago(today.prev_day)).to eq("yesterday")
       expect(timeago(today)).to eq("today")
@@ -55,7 +60,7 @@ describe Jekyll::Timeago do
       expect(timeago(sample_date.next_day(1000), sample_date, locale: :ru)).to eq('через 2 года и 9 месяцев')
     end
 
-    it 'allow different date formats' do
+    it 'allows different date formats' do
       expect(timeago('2010-1-1', '2012-1-1')).to eq('2 years ago')
       expect(timeago('2010/1/1', '2012/1/1')).to eq('2 years ago')
       expect(timeago('Jan 2010, 1', 'Jan 2012, 1')).to eq('2 years ago')
@@ -63,7 +68,7 @@ describe Jekyll::Timeago do
       expect(timeago('2014-10-06 20:00:00', '2014-10-07 20:00:00')).to eq('yesterday')
     end
 
-    it 'allow to change level of detail' do
+    it 'allows to change level of detail' do
       expect(timeago(sample_date.prev_day(500), sample_date, depth: 1)).to eq('1 year ago')
       expect(timeago(sample_date.prev_day(500), sample_date, "depth" => 1)).to eq('1 year ago')
       expect(timeago(sample_date.prev_day(500), sample_date, depth: 2)).to eq('1 year and 4 months ago')
@@ -72,39 +77,170 @@ describe Jekyll::Timeago do
       expect(timeago(sample_date.prev_day(500), sample_date, depth: 5)).to eq('1 year and 4 months ago')
     end
 
-    it 'allow threshold configuration' do
-      expect(timeago(sample_date.prev_day(366), sample_date, threshold: 0.05)).to eq('1 year ago')
+    it 'allows threshold configuration' do
+      expect(timeago(sample_date.prev_day(366), sample_date, threshold: 0.1)).to eq('1 year ago')
+    end
+
+    it 'applies rounding rules for natural language' do
+      expect(timeago(sample_date.prev_day(58), sample_date)).to eq('2 months ago')
+      expect(timeago(sample_date.prev_day(360), sample_date)).to eq('1 year ago')
+      expect(timeago(sample_date.prev_day(725), sample_date)).to eq('2 years ago')
+      expect(timeago(sample_date.next_day(58), sample_date)).to eq('in 2 months')
+      expect(timeago(sample_date.next_day(360), sample_date)).to eq('in 1 year')
+      expect(timeago(sample_date.next_day(725), sample_date)).to eq('in 2 years')
+      
+      # Test cases that should NOT round up
+      expect(timeago(sample_date.prev_day(44), sample_date)).to eq('1 month and 2 weeks ago')
+      expect(timeago(sample_date.prev_day(545), sample_date)).to eq('1 year and 6 months ago')
     end
 
-    it 'allow localization' do
+    it 'allows localization' do
       expect(timeago(sample_date.prev_day(100), sample_date, locale: :fr)).to eq('il y a environ 3 mois et 1 semaine')
       expect(timeago(sample_date.prev_day(100), sample_date, locale: :ru)).to eq('3 месяца и неделю назад')
+      expect(timeago(sample_date.prev_day(100), sample_date, locale: :it)).to eq('3 mesi e 1 settimana fa')
+      expect(timeago(sample_date.prev_day(100), sample_date, locale: :pt)).to eq('3 meses e 1 semana atrás')
+    end
+
+    it 'allows short style formatting' do
+      expect(timeago(sample_date.prev_day(365), sample_date, style: :short)).to eq('1y ago')
+      expect(timeago(sample_date.prev_day(365), sample_date, "style" => "short")).to eq('1y ago')
+      expect(timeago(sample_date.prev_day(730), sample_date, style: :short)).to eq('2y ago')
+      expect(timeago(sample_date.prev_day(30), sample_date, style: :short)).to eq('1mo ago')
+      expect(timeago(sample_date.prev_day(60), sample_date, style: :short)).to eq('2mo ago')
+      expect(timeago(sample_date.prev_day(7), sample_date, style: :short)).to eq('1w ago')
+      expect(timeago(sample_date.prev_day(14), sample_date, style: :short)).to eq('2w ago')
+      expect(timeago(sample_date.prev_day(1), sample_date, style: :short)).to eq('yesterday')
+      expect(timeago(sample_date.prev_day(2), sample_date, style: :short)).to eq('2d ago')
+    end
+
+    it 'allows short style with different locales' do
+      expect(timeago(sample_date.prev_day(365), sample_date, locale: :fr, style: :short)).to eq('il y a environ 1a')
+      expect(timeago(sample_date.prev_day(365), sample_date, locale: :ru, style: :short)).to eq('1г назад')
+      expect(timeago(sample_date.prev_day(365), sample_date, locale: :es, style: :short)).to eq('hace 1a')
+      expect(timeago(sample_date.prev_day(30), sample_date, locale: :de, style: :short)).to eq('vor 1mo')
+      expect(timeago(sample_date.prev_day(120), sample_date, locale: :ca, style: :short)).to eq('fa 4m')
+      expect(timeago(sample_date.prev_day(120), sample_date, locale: :ja, style: :short)).to eq('4月前')
+    end
+
+    it 'allows complex combinations with short style' do
+      expect(timeago(sample_date.prev_day(400), sample_date, style: :short)).to eq('1y and 1mo ago')
+      expect(timeago(sample_date.prev_day(100), sample_date, style: :short, depth: 1)).to eq('3mo ago')
+      expect(timeago(sample_date.prev_day(100), sample_date, style: :short, depth: 3)).to eq('3mo, 1w and 3d ago')
+    end
+
+    it 'allows array style formatting' do
+      expect(timeago(sample_date, sample_date, style: :array)).to eq(['today'])
+      expect(timeago(sample_date.prev_day(365), sample_date, style: :array)).to eq(['1 year'])
+      expect(timeago(sample_date.prev_day(365), sample_date, "style" => "array")).to eq(['1 year'])
+      expect(timeago(sample_date.prev_day(160), sample_date, style: :array)).to eq(['5 months', '1 week'])
+      expect(timeago(sample_date.prev_day(160), sample_date, style: :array, locale: :es)).to eq(['5 meses', '1 semana'])
+    end
+
+    it 'allows hash style formatting' do
+      expect(timeago(sample_date, sample_date, style: :hash)).to eq({days: 0})
+      expect(timeago(sample_date, sample_date, style: :hash, locale: :es)).to eq({días: 0})
+      expect(timeago(sample_date.prev_day(365), sample_date, style: :hash)).to eq({years: 1})
+      expect(timeago(sample_date.prev_day(365), sample_date, "style" => "hash")).to eq({years: 1})
+      expect(timeago(sample_date.prev_day(160), sample_date, style: :hash)).to eq({months: 5, weeks: 1})
+      expect(timeago(sample_date.prev_day(500), sample_date, style: :hash)).to eq({years: 1, months: 4})
+      expect(timeago(sample_date.prev_day(10), sample_date, style: :hash)).to eq({weeks: 1, days: 3})
+      expect(timeago(sample_date.prev_day(160), sample_date, style: :hash, locale: :es)).to eq({meses: 5, semanas: 1})
+      expect(timeago(sample_date.prev_day(500), sample_date, style: :hash, locale: :fr)).to eq({années: 1, mois: 4})
+      expect(timeago(sample_date.prev_day(500), sample_date, style: :hash, depth: 4)).to eq({years: 1, months: 4, weeks: 2, days: 1})
+    end
+
+    it 'allows "only" option to accumulate time into single unit' do
+      # Test "only: :days"
+      expect(timeago(sample_date.prev_day(7), sample_date, only: :days)).to eq('7 days ago')
+      expect(timeago(sample_date.prev_day(7), sample_date, "only" => "days")).to eq('7 days ago')
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :days)).to eq('30 days ago')
+      
+      # Test "only: :weeks"
+      expect(timeago(sample_date.prev_day(7), sample_date, only: :weeks)).to eq('1 week ago')
+      expect(timeago(sample_date.prev_day(14), sample_date, only: :weeks)).to eq('2 weeks ago')
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :weeks)).to eq('4 weeks ago')
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :weeks)).to eq('52 weeks ago')
+      
+      # Test "only: :months"
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :months)).to eq('1 month ago')
+      expect(timeago(sample_date.prev_day(60), sample_date, only: :months)).to eq('2 months ago')
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :months)).to eq('12 months ago')
+      
+      # Test "only: :years"
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :years)).to eq('1 year ago')
+      expect(timeago(sample_date.prev_day(730), sample_date, only: :years)).to eq('2 years ago')
+      expect(timeago(sample_date.prev_day(1000), sample_date, only: :years)).to eq('3 years ago')
+    end
+
+    it 'allows "only" option with different styles' do
+      # Test with short style
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :weeks, style: :short)).to eq('52w ago')
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :months, style: :short)).to eq('1mo ago')
+      
+      # Test with array style
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :weeks, style: :array)).to eq(['52 weeks'])
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :months, style: :array)).to eq(['1 month'])
+      
+      # Test with hash style
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :weeks, style: :hash)).to eq({weeks: 52})
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :months, style: :hash)).to eq({months: 1})
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :days, style: :hash)).to eq({days: 365})
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :years, style: :hash)).to eq({years: 1})
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :weeks, style: :hash, locale: :es)).to eq({semanas: 52})
+    end
+
+    it 'allows "only" option with different locales' do
+      expect(timeago(sample_date.prev_day(30), sample_date, only: :weeks, locale: :es)).to eq('hace 4 semanas')
+      expect(timeago(sample_date.prev_day(365), sample_date, only: :months, locale: :fr)).to eq('il y a environ 12 mois')
     end
   end
 
   context 'CLI' do
     it 'prints help message if called with no params or --help' do
-      expect(`bin/jekyll-timeago`).to match("Usage")
-      expect(`bin/jekyll-timeago --help`).to match("Usage")
+      expect(`bin/timeago`).to match("Usage")
+      expect(`bin/timeago --help`).to match("Usage")
     end
 
     it 'prints current version' do
-      expect(`bin/jekyll-timeago -v`).to match("v#{Jekyll::Timeago::VERSION}")
-      expect(`bin/jekyll-timeago --version`).to match("v#{Jekyll::Timeago::VERSION}")
+      expect(`bin/timeago -v`).to match("v#{Jekyll::Timeago::VERSION}")
+      expect(`bin/timeago --version`).to match("v#{Jekyll::Timeago::VERSION}")
     end
 
     it 'computes distance of dates' do
-      expect(`bin/jekyll-timeago 2016-1-1 2016-1-5`).to match("4 days ago")
+      expect(`bin/timeago 2016-1-1 2016-1-5`).to match("4 days ago")
     end
 
     it 'prints error with invalid date' do
-      expect(`bin/jekyll-timeago 0`).to match("Error!")
+      expect(`bin/timeago 0`).to match("Error!")
     end
 
     it 'with custom locale' do
-      expect(`bin/jekyll-timeago 2016-1-1 2016-1-5 -l fr`).to match("il y a environ 4 jours")
-      expect(`bin/jekyll-timeago 2016-1-1 2016-1-5 --locale fr`).to match("il y a environ 4 jours")
-      expect(`bin/jekyll-timeago 2016-1-1 2016-1-5 --locale ru`).to match("4 дня назад")
+      expect(`bin/timeago 2016-1-1 2016-1-5 -l fr`).to match("il y a environ 4 jours")
+      expect(`bin/timeago 2016-1-1 2016-1-5 --locale fr`).to match("il y a environ 4 jours")
+      expect(`bin/timeago 2016-1-1 2016-1-5 --locale ru`).to match("4 дня назад")
+    end
+
+    it 'with short style' do
+      expect(`bin/timeago 2016-1-1 2018-1-1 -s short`).to match("2y and 1d ago")
+      expect(`bin/timeago 2016-1-1 2018-1-1 --style short`).to match("2y and 1d ago")
+      expect(`bin/timeago 2016-1-1 2016-2-1 -s short`).to match("1mo and 1d ago")
+      expect(`bin/timeago 2016-1-1 2018-1-1 -l fr -s short`).to match("il y a environ 2a")
+      expect(`bin/timeago 2016-1-1 2018-1-1 --locale ru --style short`).to match("2г и 1д назад")
+    end
+
+    it 'with hash style' do
+      expect(`bin/timeago 2016-1-1 2018-1-1 --style hash`).to match("{:years=>2, :days=>1}")
+      expect(`bin/timeago 2016-1-1 2018-1-1 -s hash`).to match("{:years=>2, :days=>1}")
+      expect(`bin/timeago 2016-1-1 2016-2-1 --style hash`).to match("{:months=>1, :days=>1}")
+    end
+
+    it 'with only option' do
+      expect(`bin/timeago 2016-1-1 2018-1-1 --only weeks`).to match("104 weeks ago")
+      expect(`bin/timeago 2016-1-1 2018-1-1 -o months`).to match("24 months ago")
+      expect(`bin/timeago 2016-1-1 2016-2-1 --only days`).to match("31 days ago")
+      expect(`bin/timeago 2016-1-1 2018-1-1 -l fr --only months`).to match("il y a environ 24 mois")
+      expect(`bin/timeago 2016-1-1 2018-1-1 --only weeks -s short`).to match("104w ago")
+      expect(`bin/timeago 2016-1-1 2018-1-1 --only weeks --style hash`).to match("{:weeks=>104}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-timeago
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 1.1.0
 platform: ruby
 authors:
 - markets
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-11 00:00:00.000000000 Z
+date: 2025-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_i18n
@@ -85,7 +85,7 @@ description: A Ruby library to compute distance of dates in words. Originally bu
 email:
 - srmarc.ai@gmail.com
 executables:
-- jekyll-timeago
+- timeago
 extensions: []
 extra_rdoc_files: []
 files:
@@ -96,7 +96,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/jekyll-timeago
+- bin/timeago
 - gemfiles/jekyll_v3.gemfile
 - gemfiles/jekyll_v4.gemfile
 - jekyll-timeago.gemspec
@@ -110,9 +110,10 @@ files:
 - lib/locales/es.yml
 - lib/locales/fr.yml
 - lib/locales/it.yml
-- lib/locales/ja.yaml
+- lib/locales/ja.yml
 - lib/locales/pt.yml
 - lib/locales/ru.yml
+- lib/locales/tr.yml
 - lib/locales/zh_hans.yml
 - spec/jekyll-timeago_spec.rb
 - spec/source/_config.yml
@@ -123,7 +124,7 @@ homepage: https://github.com/markets/jekyll-timeago
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: A date helper to compute distance of dates in words.
 test_files:

data/bin/jekyll-timeago

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative "../lib/jekyll-timeago"
-
-help_message = <<~HELP_MESSAGE
-  Usage:
-
-    jekyll-timeago <from_date> [to_date]
-
-  Notes:
-          [to_date] Optional, defaults to current date
-
-  Options:
-          --help, -h      Prints this message
-          --version, -v   Prints the current version
-          --console, -c   Starts an interactive IRB session with jekyll-timeago included
-          --locale, -l    Uses the provided locale
-HELP_MESSAGE
-
-if ARGV.empty? || ARGV.include?("--help") || ARGV.include?("-h")
-  puts help_message
-elsif ARGV.include?("--version") || ARGV.include?("-v")
-  puts "v#{Jekyll::Timeago::VERSION}"
-elsif ARGV.include?("--console") || ARGV.include?("-c")
-  require "irb"
-  include Jekyll::Timeago
-
-  ARGV.clear
-  IRB.start
-else
-  custom_locale = "--locale" if ARGV.include?("--locale")
-  custom_locale = "-l" if ARGV.include?("-l")
-
-  if custom_locale
-    index = ARGV.index(custom_locale)
-    locale = ARGV.delete_at(index + 1)
-    ARGV.delete_at(index)
-
-    options = { locale: locale }
-    ARGV << options
-  end
-
-  begin
-    puts Jekyll::Timeago.timeago *ARGV
-  rescue ArgumentError => e
-    puts "Error! #{e}"
-  end
-end