tago 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca493bba45fba480f54ec89dd4a4d231007d280b51638c114781b8813d524796
-  data.tar.gz: d51d2b4626ad2582256e389b760644487f15fa812dac456ae394a3e1fb8061e7
+  metadata.gz: 6ce49c7e11433395a7963fd3b8ae9a7bfc10dbb00e10fb0a2791b13fb432cf35
+  data.tar.gz: 861df150e33bcdc48e0d8ec3a34c2a33a5c455be7b19b7b6ebad11e166772b1c
 SHA512:
-  metadata.gz: 94b64b5ef1d881edf4245c57175949bba7ae452f288e6a2fa9590dba9c1de53f88650618c9d7a137d37f01391ecc5ef42346ef785cb6ff150b16f7529f0f188c
-  data.tar.gz: 969c82c7573afee0bdaf16503e0a955d25753e682e65f4a6a9151a3de709e7547da4d4f5076af9d34e0b07d54ce71949cb8b5e9b512ddf3d85b75421c54c78db
+  metadata.gz: afdfb3de82966a409d8d59498788eaf623d5251f1bd0561e5025662d12a28d705ac96e236014c539fe1e0e4c6270367687d4000f540cd46a5afd1d73c09ddf18
+  data.tar.gz: ddd745356b376ec6254cf5bfec47b5a388c5d3e595d30ed99d7729bcb91ff678e03a6b3722a891fb569582937b9b0d0078931bde34861efb83dc1f9c5829c2e8

data/Gemfile.lock

@@ -8,21 +8,21 @@ GEM
   specs:
     ast (2.4.3)
     docile (1.4.1)
-    json (2.13.2)
+    json (2.15.1)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    minitest (5.25.5)
+    minitest (5.26.0)
     parallel (1.27.0)
     parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    prism (1.4.0)
+    prism (1.5.2)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.0)
-    regexp_parser (2.11.2)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
     rexml (3.4.2)
-    rubocop (1.80.2)
+    rubocop (1.81.6)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -30,20 +30,20 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.46.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.46.0)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-minitest (0.38.2)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-performance (1.25.0)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
@@ -57,9 +57,9 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (3.1.5)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     yard (0.9.37)
 
 PLATFORMS

data/lib/tago.rb

@@ -11,34 +11,94 @@ require 'time'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Float
-  def seconds
+  def seconds(format = nil)
     s = self
     s = -s if s.negative?
+    if format == :pretty
+      locales = {
+        en: {
+          numbers: { 0 => 'zero', 1 => 'one', 2 => 'two', 3 => 'three', 4 => 'four', 5 => 'five', 6 => 'six',
+                     7 => 'seven', 8 => 'eight', 9 => 'nine', 10 => 'ten' },
+          units: { microsecond: %w[microsecond microseconds], millisecond: %w[millisecond milliseconds],
+                   second: %w[second seconds], minute: %w[minute minutes], hour: %w[hour hours], day: %w[day days],
+                   week: %w[week weeks] }
+        }
+      }.freeze
+
+      if s < 0.001
+        val = (s * 1_000_000).to_i
+        unit = :microsecond
+      elsif s < 1
+        val = (s * 1000).to_i
+        unit = :millisecond
+      elsif s < 60
+        val = s.to_i
+        unit = :second
+      elsif s < 60 * 60
+        val = (s / 60).to_i
+        unit = :minute
+      elsif s < 24 * 60 * 60
+        val = (s / (60 * 60)).to_i
+        unit = :hour
+      elsif s < 7 * 24 * 60 * 60
+        val = (s / (24 * 60 * 60)).to_i
+        unit = :day
+      else
+        val = (s / (7 * 24 * 60 * 60)).to_i
+        unit = :week
+      end
+
+      num = val < 10 ? locales[:en][:numbers][val] : val.to_s
+      names = locales[:en][:units].fetch(unit)
+      unit_name = val == 1 ? names[0] : names[1]
+      return format('%<num>s %<unit_name>s', num:, unit_name:)
+    end
+
     if s < 0.001
       format('%dμs', s * 1000 * 1000)
     elsif s < 1
       format('%dms', s * 1000)
     elsif s < 10
       ms = (s * 1000 % 1000).to_i
-      ms.zero? ? format('%ds', s) : format('%<s>ds%<ms>dms', s:, ms:)
+      if format == :round || ms.zero?
+        format('%ds', s)
+      else
+        format('%<s>ds%<ms>dms', s:, ms:)
+      end
     elsif s < 100
       format('%ds', s)
     elsif s < 60 * 60
       mins = (s / 60).to_i
       secs = (s % 60).to_i
-      secs.zero? ? format('%dm', mins) : format('%<mins>dm%<secs>ds', mins:, secs:)
+      if format == :round || secs.zero?
+        format('%dm', mins)
+      else
+        format('%<mins>dm%<secs>ds', mins:, secs:)
+      end
     elsif s < 24 * 60 * 60
       hours = (s / (60 * 60)).to_i
       mins = ((s % (60 * 60)) / 60).to_i
-      mins.zero? ? format('%dh', hours) : format('%<hours>dh%<mins>dm', hours:, mins:)
+      if format == :round || mins.zero?
+        format('%dh', hours)
+      else
+        format('%<hours>dh%<mins>dm', hours:, mins:)
+      end
     elsif s < 7 * 24 * 60 * 60
       days = (s / (24 * 60 * 60)).to_i
       hours = ((s % (24 * 60 * 60)) / (60 * 60)).to_i
-      hours.zero? ? format('%dd', days) : format('%<days>dd%<hours>dh', days:, hours:)
+      if format == :round || hours.zero?
+        format('%dd', days)
+      else
+        format('%<days>dd%<hours>dh', days:, hours:)
+      end
     else
       weeks = (s / (7 * 24 * 60 * 60)).to_i
       days = (s / (24 * 60 * 60) % 7).to_i
-      days.zero? ? format('%dw', weeks) : format('%<weeks>dw%<days>dd', weeks:, days:)
+      if format == :round || days.zero?
+        format('%dw', weeks)
+      else
+        format('%<weeks>dw%<days>dd', weeks:, days:)
+      end
     end
   end
 end
@@ -49,7 +109,15 @@ end
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Time
-  def ago(now = Time.now)
-    (now - self).seconds
+  def ago(arg = Time.now, pretty = nil)
+    if arg.is_a?(Symbol) || arg.nil?
+      format = arg
+      now = pretty || Time.now
+    else
+      now = arg
+      format = pretty
+    end
+
+    (now - self).seconds(format)
   end
 end

data/tago.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=3.0'
   s.name = 'tago'
-  s.version = '0.2.0'
+  s.version = '0.4.0'
   s.license = 'MIT'
   s.summary = 'A new .ago() method for the Time class'
   s.description =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tago
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Yegor Bugayenko