tago 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a8085667f0c9d1b553d18f75411810fba9ab348490947c28a07b1cd0a95db0
-  data.tar.gz: 3d67c0480ea190f4c46b0a9c7265a76ea1bec56ef5c11ccf2b4b4aad7fa999a7
+  metadata.gz: 7c58f911880a7e18c878c6d586393e785b4552205d5c9d489dcbf72e7aaab455
+  data.tar.gz: de65be56f9a1df5f45343644b50f27496c2daebdb423c4788b085803d8c17bd3
 SHA512:
-  metadata.gz: f6bf77ea1cd83604f6b3a4103657f9b3c91aa063f68c90f6c1f4152f58e305fb19614b1f989b21311be8d1605e71ee111d9469635251c43eb484bfb4176a395e
-  data.tar.gz: b67c0ac6171f76b0a3a18303bc61f5ec0cccdff7b51ee986c46fd0e5c3e7afa40e9ace61e31bdd3fa1fc0325f24c26f62dbc8ac98909c3daac28cc118ccd9247
+  metadata.gz: c797174c8dc2d002dffc12422f33e70d979fdc73c98150ea52e563cc0581f757444fca01fb492024736bc06c2edce67c6a0db136d57b410322770aae90dae7ff
+  data.tar.gz: cd6a4c966a36c85c7e1a8ac0f6cef233070b13e91c60375b543b44a431e55cb466d5d38b680a943a8426e62dae1599f0dd5f50824d847e0ff0237c5244f2d018

data/Gemfile.lock

@@ -8,21 +8,21 @@ GEM
   specs:
     ast (2.4.3)
     docile (1.4.1)
-    json (2.13.2)
+    json (2.15.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    minitest (5.25.5)
+    minitest (5.26.2)
     parallel (1.27.0)
-    parser (3.3.9.0)
+    parser (3.3.10.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.7)
       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.26.0)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
@@ -57,10 +57,10 @@ 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)
-    yard (0.9.37)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    yard (0.9.38)
 
 PLATFORMS
   arm64-darwin-22

data/Rakefile

@@ -31,6 +31,7 @@ require 'yard'
 desc 'Build Yard documentation'
 YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb']
+  t.options = ['--fail-on-warning']
 end
 
 require 'rubocop/rake_task'

data/lib/tago.rb

@@ -11,16 +11,61 @@ require 'time'
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class Float
-  def seconds(format = nil)
+  def seconds(*args)
     s = self
     s = -s if s.negative?
+    if args.include?(: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] },
+          short_units: {
+            microsecond: 'μs', millisecond: 'ms', second: 'sec', minute: 'min', hour: 'hr', day: 'd', week: 'wk'
+          }
+        }
+      }.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
+      short = args.include?(:short)
+      number_to_words = val <= 10 ? locales[:en][:numbers][val] : val.to_s
+      num = short ? val : number_to_words
+      names = locales[:en][:units][unit]
+      unit_symbol = val == 1 ? names[0] : names[1]
+      unit_name = short ? locales[:en][:short_units][unit] : unit_symbol
+      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
-      if format == :round || ms.zero?
+      if args.include?(:round) || args.include?(:short) || ms.zero?
         format('%ds', s)
       else
         format('%<s>ds%<ms>dms', s:, ms:)
@@ -30,7 +75,7 @@ class Float
     elsif s < 60 * 60
       mins = (s / 60).to_i
       secs = (s % 60).to_i
-      if format == :round || secs.zero?
+      if args.include?(:round) || args.include?(:short) || secs.zero?
         format('%dm', mins)
       else
         format('%<mins>dm%<secs>ds', mins:, secs:)
@@ -38,7 +83,7 @@ class Float
     elsif s < 24 * 60 * 60
       hours = (s / (60 * 60)).to_i
       mins = ((s % (60 * 60)) / 60).to_i
-      if format == :round || mins.zero?
+      if args.include?(:round) || args.include?(:short) || mins.zero?
         format('%dh', hours)
       else
         format('%<hours>dh%<mins>dm', hours:, mins:)
@@ -46,7 +91,7 @@ class Float
     elsif s < 7 * 24 * 60 * 60
       days = (s / (24 * 60 * 60)).to_i
       hours = ((s % (24 * 60 * 60)) / (60 * 60)).to_i
-      if format == :round || hours.zero?
+      if args.include?(:round) || args.include?(:short) || hours.zero?
         format('%dd', days)
       else
         format('%<days>dd%<hours>dh', days:, hours:)
@@ -54,7 +99,7 @@ class Float
     else
       weeks = (s / (7 * 24 * 60 * 60)).to_i
       days = (s / (24 * 60 * 60) % 7).to_i
-      if format == :round || days.zero?
+      if args.include?(:round) || args.include?(:short) || days.zero?
         format('%dw', weeks)
       else
         format('%<weeks>dw%<days>dd', weeks:, days:)
@@ -69,7 +114,13 @@ 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, *options)
+    if arg.is_a?(Time)
+      now = arg
+    else
+      now = Time.now
+      options = [arg] + options
+    end
+    (now - self).seconds(*options)
   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.3.0'
+  s.version = '0.5.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.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Yegor Bugayenko