dotiw 5.3.2 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bbd17f6b2f3af46a5255fa9eb900aa7bb734ead661088a2936739aa2f2bef63
-  data.tar.gz: 2870eadd1e540d51e6ff73210024fbcb87de8c01cca2549d7fb80e30b4390d93
+  metadata.gz: 32864f97b3b06dc77f8c793e11a5b17b1d2af506bdfac0c559354f3e4eef7998
+  data.tar.gz: 20efed42fb0802a836f078f2791d78e7b863005b73780243ad4867bbf653103e
 SHA512:
-  metadata.gz: a89bfcad7275d64474969ac9200f43d6b5b3fb922c6cfa9e4bc05550361f43dc3d1eb37c27771116dc51cfba6adfa844232fbc062592dfa2874ff0e355797c3b
-  data.tar.gz: 8379db832851f15302fa364103671c3d805c0f367d8c8c0be4d746e81a473ab4b7d49c29a248fd353410a14e22ed04db79a1bfb05b83f4fd52403781460712fa
+  metadata.gz: 6bb97a0d7bc860b57432dc81cb3d8a7921c6364c5271db648d30984164f26d6f4003e21de28252f958294960df1b0270cc4fbf83ae7602be23096829404ee2fe
+  data.tar.gz: e2d4f70428937b7e5c409666612dd7aefbe63e71d884a3738b240c222fc2f36a8df7a66b83fa4d52fef96cd27e7edd3a9fdecb15e497fa46853e9b3922f83663

data/.github/workflows/ruby.yml

@@ -1,12 +1,6 @@
 name: Ruby
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+on: [push, pull_request]
 
 jobs:
   build:
@@ -15,19 +9,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby-version: 2.5
-          - ruby-version: 2.6
-          - ruby-version: 2.4
-            bundler-version: 1.17.3
-            gemfile: gemfiles/rails_4.gemfile
-          - ruby-version: 2.6
+          - ruby-version: 3.4
+          - ruby-version: 3.3
+          - ruby-version: 3.2
+          - ruby-version: 3.1
+          - ruby-version: 3.0
+          - ruby-version: 2.7
+          - ruby-version: 2.7
             gemfile: gemfiles/rails_5.0.gemfile
-          - ruby-version: 2.6
+          - ruby-version: 2.7
             gemfile: gemfiles/rails_5.1.gemfile
-          - ruby-version: 2.6
+          - ruby-version: 2.7
             gemfile: gemfiles/rails_5.2.gemfile
-          - ruby-version: 2.6
+          - ruby-version: 3.4
             gemfile: gemfiles/rails_6.0.gemfile
+          - ruby-version: 3.4
+            gemfile: gemfiles/rails_7.0.gemfile
+          - ruby-version: 3.4
+            gemfile: gemfiles/rails_7.1.gemfile
+          - ruby-version: 3.4
+            gemfile: gemfiles/rails_7.2.gemfile
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails_4' do
-  gem 'rails', '~> 4.0'
-end
-
 appraise 'rails_5.0' do
   gem 'rails', '~> 5.0.0'
 end
@@ -17,3 +13,15 @@ end
 appraise 'rails_6.0' do
   gem 'rails', '~> 6.0.0'
 end
+
+appraise 'rails_7.0' do
+  gem 'rails', '~> 7.0.0'
+end
+
+appraise 'rails_7.1' do
+  gem 'rails', '~> 7.1.0'
+end
+
+appraise 'rails_7.2' do
+  gem 'rails', '~> 7.2.0'
+end

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 5.4.0 (Next)
+
+* [#131](https://github.com/radar/distance_of_time_in_words/pull/131): Deprecates `highest_measure_only`. Adds alternate form of `highest_measures` option to permit rounding up whatever part of the duration was previously silently discarded - [@seansfkelley](https://github.com/seansfkelley).
+* [#133](https://github.com/radar/distance_of_time_in_words/pull/133): Test on Ruby 3.0 and 3.1 - [@dblock](https://github.com/dblock).
+* [#134](https://github.com/radar/distance_of_time_in_words/pull/134): Add support for Dzongkha, the National language of Bhutan - [@KinWang-2013](https://github.com/KinWang-2013).
+* [#135](https://github.com/radar/distance_of_time_in_words/pull/135): Add support for Ruby 2.7 and 3.2, removed support for ruby 2.4, 2.5, 2.6 and Rails 4 - [@KinWang-2013](https://github.com/KinWang-2013).
+* [#136](https://github.com/radar/distance_of_time_in_words/pull/136): Add support for Rails 7 - [@KinWang-2013](https://github.com/KinWang-2013).
+* [#139](https://github.com/radar/distance_of_time_in_words/pull/139): Fix bug with pluralization of Russian translations for numbers ending in 1 - [bitberry-dev](https://github.com/bitberry-dev).
+* Your contribution here.
+
+## 5.3.3 (2022/04/25)
+
+* [#128](https://github.com/radar/distance_of_time_in_words/pull/128): Adds support for numeric values for both the `from_time` and `to_time` arguments in the `#distance_of_time_in_words` helper - [@bjedrocha](https://github.com/bjedrocha).
+
 ## 5.3.2 (2021/11/08)
 
 * [#126](https://github.com/radar/distance_of_time_in_words/pull/126): Fixes `#distance_of_time_in_words_to_now` with `vague: true` when supplied without `include_seconds` argument - [@mozcomp](https://github.com/mozcomp).

data/CODEOWNERS

@@ -0,0 +1,2 @@
+@radar  
+*.gemspec @radar

data/README.markdown

@@ -58,6 +58,22 @@ Better than "about 1 year", am I right? Of course I am.
 => "1 second"
 ```
 
+It also supports numeric arguments like the original Rails version:
+
+```ruby
+>> distance_of_time_in_words(0, 150)
+=> "2 minutes and 30 seconds"
+```
+
+as an alternative to:
+
+```ruby
+>> distance_of_time_in_words(Time.now, Time.now + 2.5.minutes)
+=> "2 minutes and 30 seconds"
+```
+
+This is useful if you're just interested in "stringifying" the length of time. Alternatively, you can use the `#distance_of_time` helper as described [below](#distance\_of\_time).
+
 The third argument for this method is whether or not to include seconds. By default this is `false` (because in Rails' `distance_of_time_in_words` it is), you can turn it on though by passing `true` as the third argument:
 
 ```ruby
@@ -148,6 +164,8 @@ Culling a whole group of measurements of time:
 
 #### :highest\_measure\_only
 
+> **Deprecated**. Use `highest_measures: 1` instead.
+
 For times when Rails `distance_of_time_in_words` is not precise enough and `DOTIW` is too precise. For instance, if you only want to know the highest time part (measure) that elapsed between two dates.
 
 ```ruby
@@ -173,6 +191,24 @@ When you want variable precision from `DOTIW`:
 => "1 hour and 1 minute"
 ```
 
+You can also specify what to do with the extra time with the `remainder` option:
+
+```ruby
+>> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute + 1.second, true, highest_measures: { max: 2, remainder: :ceiling })
+=> "1 hour and 2 minutes"
+```
+
+Valid options for `remainder` are `:floor` (default), `:ceiling` and `:round`. Note that `:round` is best-effort and makes some simplifying assumptions:
+
+```ruby
+# Only the next-largest unit is examined, which can unexpectedly round down in some situations.
+>> distance_of_time_in_words(Time.now, Time.now + 1.week + 3.days + 23.hours, true, highest_measures: { remainder: :round })
+=> "1 week"
+# The variability of some measures (like months) is ignored and the shortest duration of that measure is used.
+>> distance_of_time_in_words(Time.now, Time.now + 1.month + 14.days, true, highest_measures: { remainder: :round })
+=> "2 months"
+```
+
 #### :words_connector
 
 This is an option for `to_sentence`, defaults to ', '.

data/dotiw.gemspec

@@ -27,6 +27,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'tzinfo', '~> 1.2.7'
+  s.add_development_dependency 'mutex_m'
+  s.add_development_dependency 'base64'
+  s.add_development_dependency 'bigdecimal'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/{rails_4.gemfile → rails_7.0.gemfile}

@@ -4,6 +4,7 @@
 
 source 'http://rubygems.org'
 
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 7.0.0'
+gem 'tzinfo', '~> 2.0'
 
 gemspec path: '../'

data/gemfiles/rails_7.1.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 7.1.0'
+gem 'tzinfo', '~> 2.0'
+
+
+gemspec path: '../'

data/gemfiles/rails_7.2.gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 7.2.0'
+gem 'tzinfo', '~> 2.0'
+
+
+gemspec path: '../'

data/lib/dotiw/locale/dz.yml

@@ -0,0 +1,60 @@
+dz:
+  datetime:
+    dotiw:
+      seconds:
+        one: སྐར་ཆ་ ༡
+        other: "སྐར་ཆ་ %{count}"
+      minutes:
+        one: སྐར་མ་ ༡
+        other: "སྐར་མ་ %{count}"
+      hours:
+        one: ཆུ་ཚོད་ ༡
+        other: "ཆུ་ཚོད་ %{count}"
+      days:
+        one: ཉིནམ་ ༡
+        other: "ཉིནམ་ %{count}"
+      weeks:
+        one: བདུན༌ཕྲག་ ༡
+        other: "བདུན༌ཕྲག་ %{count}"
+      months:
+        one: ཟླཝ་ ༡
+        other: "ཟླཝ་ %{count}"
+      years:
+        one: ལོ་ ༡
+        other: "ལོ་ %{count}"
+      less_than_x: "%{distance} ་ལས་ཉུངམ་"
+    dotiw_compact:
+      seconds:
+        one: སྐར་ཆ་ ༡
+        other: "སྐར་ཆ་ %{count}"
+      minutes:
+        one: སྐར་མ་ ༡
+        other: "སྐར་མ་ %{count}"
+      hours:
+        one: ཆུ་ཚོད་ ༡
+        other: "ཆུ་ཚོད་ %{count}"
+      days:
+        one: ཉིནམ་ ༡
+        other: "ཉིནམ་ %{count}"
+      weeks:
+        one: བདུན༌ཕྲག་ ༡
+        other: "བདུན༌ཕྲག་ %{count}"
+      months:
+        one: ཟླཝ་ ༡
+        other: "ཟླཝ་ %{count}"
+      years:
+        one: ལོ་ ༡
+        other: "ལོ་ %{count}"
+      less_than_x: "%{distance} ་ལས་ཉུངམ"
+      words_connector: ""
+      two_words_connector: " དང་ "
+      last_word_connector: " དང་ "
+      about_x_years:
+        one: ལོ་ ༡ ་དེ་ཅིག
+        any: "ལོ་ %{count} ་དེ་ཅིག"
+      over_x_years:
+        one: "ལོ་ ༡ ་ལས་ལྷགཔ་ཅིག"
+        other: "ལོ་ %{count} ་ལས་ལྷགཔ་ཅིག"
+      almost_x_years:
+        one: ལོ་ ༡ ་མ་ལྷགཔ་ཅིག
+        any: "ལོ་ %{count} ་མ་ལྷགཔ་ཅིག"

data/lib/dotiw/locale/ru.yml

@@ -39,22 +39,22 @@ ru:
       less_than_x: "меньше, чем %{distance}"
     dotiw_compact:
       seconds:
-        one: 1с
+        one: "%{count}с"
         other: "%{count}с"
       minutes:
-        one: 1м
+        one: "%{count}м"
         other: "%{count}м"
       hours:
-        one: 1ч
+        one: "%{count}ч"
         other: "%{count}ч"
       days:
-        one: 1д
+        one: "%{count}д"
         other: "%{count}д"
       weeks:
-        one: 1н
+        one: "%{count}н"
         other: "%{count}н"
       months:
-        one: 1ме
+        one: "%{count}ме"
         other: "%{count}ме"
       years:
         one:   "%{count}г"
@@ -66,11 +66,11 @@ ru:
       two_words_connector: ""
       last_word_connector: ""
       about_x_years:
-        one: ~1г
+        one: "~%{count}г"
         any: "~%{count}г"
       over_x_years:
-        one: ">1г"
+        one: ">%{count}г"
         other: ">%{count}г"
       almost_x_years:
-        one: ~1г
+        one: "~%{count}г"
         any: "~%{count}г"

data/lib/dotiw/methods.rb

@@ -20,7 +20,9 @@ module DOTIW
     end
 
     def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {})
-      raise ArgumentError, "nil can't be converted to a Time value" if from_time.nil? || to_time.nil?
+      from_time = normalize_distance_of_time_argument_to_time(from_time)
+      to_time = normalize_distance_of_time_argument_to_time(to_time)
+      from_time, to_time = to_time, from_time if from_time > to_time
 
       if include_seconds_or_options.is_a?(Hash)
         options = include_seconds_or_options
@@ -28,7 +30,8 @@ module DOTIW
         options = options.dup
         options[:include_seconds] ||= !!include_seconds_or_options
       end
-      return distance_of_time(from_time, options) if to_time == 0
+
+      return distance_of_time(to_time.to_i, options) if from_time.to_i == 0
 
       options = options_with_scope(options)
       hash = distance_of_time_in_words_hash(from_time, to_time, options)
@@ -41,6 +44,41 @@ module DOTIW
 
     private
 
+    # How many of each measure is necessary to round up to one of the next-largest measure. Note
+    # that for simplicity of implementation, we only check one measure when seeing if we should
+    # round up. This means that rounding up days to weeks, for instance, cannot draw the line at 3
+    # days and 12 hours, but instead either 3 or 4 (whole) days. Let's not even talk about weeks
+    # rounding up to months.
+    ROUNDING_THRESHOLDS = {
+      seconds: 30,
+      minutes: 30,
+      hours: 12,
+      days: 4,
+      weeks: 2,
+      months: 6,
+      years: Float::INFINITY,
+    }
+
+    ROLLUP_THRESHOLDS = {
+      seconds: 60,
+      minutes: 60,
+      hours: 24,
+      days: 7,
+      weeks: 4, # !!!
+      months: 12,
+      years: Float::INFINITY,
+    }
+
+    def normalize_distance_of_time_argument_to_time(value)
+      if value.is_a?(Numeric)
+        Time.at(value)
+      elsif value.respond_to?(:to_time)
+        value.to_time
+      else
+        raise ArgumentError, "#{value.inspect} can't be converted to a Time value"
+      end
+    end
+
     def options_with_scope(options)
       if options.key?(:compact)
         options.merge(scope: DOTIW::DEFAULT_I18N_SCOPE_COMPACT)
@@ -50,23 +88,29 @@ module DOTIW
     end
 
     def _display_time_in_words(hash, options = {})
+      hash = hash.dup
+
       options = options.reverse_merge(
         include_seconds: false
       ).symbolize_keys!
 
+      discarded_hash = {}
+
       include_seconds = options.delete(:include_seconds)
-      hash.delete(:seconds) if !include_seconds && hash[:minutes]
+      discarded_hash[:seconds] = hash.delete(:seconds) if !include_seconds && hash[:minutes]
 
       options[:except] = Array.wrap(options[:except]).map!(&:to_sym) if options[:except]
       options[:only] = Array.wrap(options[:only]).map!(&:to_sym) if options[:only]
 
-      # Remove all the values that are nil or excluded. Keep the required ones.
-      hash.delete_if do |key, value|
-        value.nil? || value.zero? ||
-          options[:except]&.include?(key) ||
-          (options[:only] && !options[:only].include?(key))
+      DOTIW::TimeHash::TIME_FRACTIONS.each do |fraction|
+        if options[:except]&.include?(fraction) || (options[:only] && !options[:only].include?(fraction))
+          discarded_hash[fraction] = hash.delete fraction
+        end
       end
 
+      hash.delete_if { |key, value| value.nil? || value.zero? }
+      discarded_hash.delete_if { |key, value| value.nil? || value.zero? }
+
       i18n_scope = options.delete(:scope) || DOTIW::DEFAULT_I18N_SCOPE
       if hash.empty?
         fractions = DOTIW::TimeHash::TIME_FRACTIONS
@@ -81,16 +125,22 @@ module DOTIW
         end
       end
 
-      output = []
-      I18n.with_options locale: options[:locale], scope: i18n_scope do |locale|
-        output = hash.map { |key, value| locale.t(key, count: value) }
-      end
-
       options.delete(:except)
       options.delete(:only)
-      highest_measures = options.delete(:highest_measures)
-      highest_measures = 1 if options.delete(:highest_measure_only)
-      output = output[0...highest_measures] if highest_measures
+
+      highest_measures = _compute_highest_measures! options
+      if highest_measures
+        high_entries, low_entries = hash.to_a.partition.with_index { |_, index| index < highest_measures[:max] }
+        hash = high_entries.to_h
+        discarded_hash.merge! low_entries.to_h
+
+        _maybe_round! hash, discarded_hash, highest_measures[:remainder]
+      end
+
+      phrases = []
+      I18n.with_options locale: options[:locale], scope: i18n_scope do |locale|
+        phrases = hash.map { |key, value| locale.t(key, count: value) }
+      end
 
       options[:words_connector] ||= I18n.translate :"#{i18n_scope}.words_connector",
                                                    default: :'support.array.words_connector',
@@ -102,7 +152,56 @@ module DOTIW
                                                        default: :'support.array.last_word_connector',
                                                        locale: options[:locale]
 
-      output.to_sentence(options.except(:accumulate_on, :compact))
+      phrases.to_sentence(options.except(:accumulate_on, :compact))
+    end
+
+    def _compute_highest_measures!(options)
+      highest_measures = options.delete(:highest_measures)
+      highest_measures = 1 if options.delete(:highest_measure_only)
+      highest_measures = { max: highest_measures } if highest_measures.is_a?(Integer)
+      highest_measures = highest_measures.reverse_merge(max: 1, remainder: :floor) if highest_measures
+
+      highest_measures
+    end
+
+    def _maybe_round!(hash, discarded_hash, remainder)
+      smallest_measure_index = DOTIW::TimeHash::TIME_FRACTIONS.index hash.to_a.last[0]
+      smallest_measure = DOTIW::TimeHash::TIME_FRACTIONS[smallest_measure_index]
+
+      case remainder
+      when :floor
+        # Nothing to do.
+      when :ceiling
+        # We already filtered out zeroes, so non-empty also means non-zero.
+        if !discarded_hash.empty?
+          hash[smallest_measure] += 1
+          _rollup! hash, smallest_measure_index
+        end
+      when :round
+        # If our smallest measure is already the smallest possible measure, there is no next
+        # smallest measure to inspect to see if we need to round up.
+        return if smallest_measure_index == 0
+
+        next_smallest_measure = DOTIW::TimeHash::TIME_FRACTIONS[smallest_measure_index - 1]
+        if discarded_hash.fetch(next_smallest_measure, 0) >= ROUNDING_THRESHOLDS[next_smallest_measure]
+          hash[smallest_measure] += 1
+          _rollup! hash, smallest_measure_index
+        end
+      else
+        raise ArgumentError, "unrecognized remainder value #{remainder.inspect}"
+      end
+    end
+
+    def _rollup!(hash, smallest_measure_index)
+      DOTIW::TimeHash::TIME_FRACTIONS[smallest_measure_index..-1].each_with_index do |fraction, index|
+        if hash.fetch(fraction, 0) >= ROLLUP_THRESHOLDS[fraction]
+          hash.delete fraction
+          next_fraction = DOTIW::TimeHash::TIME_FRACTIONS[smallest_measure_index + index + 1]
+          hash[next_fraction] = hash.fetch(next_fraction, 0) + 1
+        else
+          break
+        end
+      end
     end
   end
 end

data/lib/dotiw/time_hash.rb

@@ -43,8 +43,6 @@ module DOTIW
     def build_time_hash
       if accumulate_on = options[:accumulate_on]
         accumulate_on = accumulate_on.to_sym
-        return build_time_hash if accumulate_on == :years
-
         TIME_FRACTIONS.index(accumulate_on).downto(0) { |i| send("build_#{TIME_FRACTIONS[i]}") }
       else
         while distance > 0
@@ -91,11 +89,15 @@ module DOTIW
     def build_months
       build_years_months_weeks_days
 
-      if (years = output.delete(:years)) > 0
+      if options[:accumulate_on]&.to_sym == :months && (years = output.delete(:years)) > 0
         output[:months] += (years * 12)
       end
     end
 
+    def build_years
+      build_years_months_weeks_days
+    end
+
     def build_years_months_weeks_days
       months = (largest.year - smallest.year) * 12 + (largest.month - smallest.month)
       years, months = months.divmod(12)

data/lib/dotiw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DOTIW
-  VERSION = '5.3.2'
+  VERSION = '5.5.0'
 end

data/lib/dotiw.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'i18n'
-
+require 'logger'
 require 'active_support'
 require 'active_support/core_ext'
 

data/spec/lib/dotiw_spec.rb

@@ -13,10 +13,12 @@ describe 'A better distance_of_time_in_words' do
     include DOTIW::Methods
   end
 
-  START_TIME = '01-08-2009'.to_time
+  START_TIME = '01-08-2009'.to_time(:utc)
 
   before do
     I18n.locale = :en
+    ActiveSupport.to_time_preserves_timezone = :zone
+
     allow(Time).to receive(:now).and_return(START_TIME)
     allow(Time.zone).to receive(:now).and_return(START_TIME)
   end
@@ -101,11 +103,6 @@ describe 'A better distance_of_time_in_words' do
         expect(DOTIW.languages.map(&:to_s).sort).to eq languages.sort
       end
 
-      it 'raises ArgumentError when nil is passed for time' do
-        expect { distance_of_time_in_words(nil) }.to raise_error(ArgumentError)
-        expect { distance_of_time_in_words(nil, nil) }.to raise_error(ArgumentError)
-      end
-
       DOTIW.languages.each do |lang|
         context lang do
           YAML.safe_load(
@@ -118,12 +115,18 @@ describe 'A better distance_of_time_in_words' do
             context category do
               fixtures.each_pair do |k, v|
                 it v do
+                  options = {
+                    locale: lang
+                  }
+
+                  options[:compact] = true if category.split.include?('compact')
+
                   expect(
                     distance_of_time_in_words(
                       START_TIME,
                       START_TIME + eval(k),
                       true,
-                      locale: lang
+                      options
                     )
                   ).to eq(v)
                 end
@@ -170,7 +173,7 @@ describe 'A better distance_of_time_in_words' do
       [Time.zone.now, Time.zone.now + 15.days - 1.minute, '14 days, 23 hours, and 59 minutes'],
       [Time.zone.now, Time.zone.now + 29.days - 1.minute, '28 days, 23 hours, and 59 minutes'],
       [Time.zone.now, Time.zone.now + 30.days - 1.minute, '29 days, 23 hours, and 59 minutes'],
-      [Time.zone.now, Time.zone.now + 31.days - 1.minute, '30 days, 23 hours, and 59 minutes'],
+      [Time.zone.now, Time.zone.now + 31.day - 1.minute, '30 days, 23 hours, and 59 minutes'],
       [Time.zone.now, Time.zone.now + 32.days - 1.minute, '31 days, 23 hours, and 59 minutes'],
       [Time.zone.now, Time.zone.now + 33.days - 1.minute, '32 days, 23 hours, and 59 minutes']
     ].each do |start, finish, output|
@@ -216,7 +219,8 @@ describe 'A better distance_of_time_in_words' do
          START_TIME + 2.day + 10_000.hour + 10.second,
          :months,
          '13 months, 3 weeks, 1 day, 16 hours, and 10 seconds'],
-        ['2015-1-15'.to_time, '2016-3-15'.to_time, :months, '14 months']
+        ['2015-1-15'.to_time, '2016-3-15'.to_time, :months, '14 months'],
+        ['2015-1-15'.to_time, '2016-3-15'.to_time, :years, '1 year and 2 months']
       ].each do |start, finish, accumulator, output|
         it "should be #{output}" do
           expect(distance_of_time_in_words(start, finish, true, accumulate_on: accumulator)).to eq(output)
@@ -241,6 +245,38 @@ describe 'A better distance_of_time_in_words' do
         end
       end
     end
+
+    describe 'with mixed inputs' do
+      # Further backwards compatability with the original rails
+      # distance_of_time_in_words helper.
+      [
+        [0, 2.5.minutes.to_i, '2 minutes and 30 seconds'],
+        [10.minutes.to_i, 0, '10 minutes'],
+        [0, 24.weeks.to_i, '5 months, 2 weeks, and 1 day'],
+        [0, 0, 'less than 1 second'],
+      ].each do |start, finish, output|
+        it "should be #{output}" do
+          expect(distance_of_time_in_words(start, finish)).to eq(output)
+        end
+      end
+
+      context "of which one or both can't be converted to a Time value" do
+        let(:invalid_inputs) do
+          [
+            [nil, 5.minutes],
+            [nil, double(:does_not_respond_to_time)],
+            [nil],
+            [nil, nil],
+          ]
+        end
+
+        it "should raise an ArgumentError" do
+          invalid_inputs.each do |start, finish|
+            expect { distance_of_time_in_words(start, finish) }.to raise_error(ArgumentError)
+          end
+        end
+      end
+    end
   end
 
   describe 'with output options' do
@@ -302,7 +338,7 @@ describe 'A better distance_of_time_in_words' do
        { highest_measures: 3 },
        '1 year and 2 weeks'],
       [START_TIME,
-       START_TIME + 1.days,
+       START_TIME + 1.day,
        { only: %i[years months] },
        'less than 1 month'],
       [START_TIME,
@@ -310,15 +346,55 @@ describe 'A better distance_of_time_in_words' do
        { except: %i[hours minutes seconds] },
        'less than 1 day'],
       [START_TIME,
-       START_TIME + 1.days,
+       START_TIME + 1.day,
        { highest_measures: 1, only: %i[years months] },
-       'less than 1 month']
+       'less than 1 month'],
+      [START_TIME,
+       START_TIME + 1.day + 1.hour,
+       { highest_measures: {} },
+       '1 day'],
+      [START_TIME,
+       START_TIME + 1.day + 1.hour,
+       { highest_measures: { remainder: :floor} },
+       '1 day'],
+      [START_TIME,
+       START_TIME + 1.year + 1.minute,
+       { highest_measures: { remainder: :ceiling } },
+       '2 years'],
+      [START_TIME,
+       START_TIME + 1.day + 2.hours + 30.minutes,
+       { highest_measures: { max: 2, remainder: :round } },
+       '1 day and 3 hours'],
+      [START_TIME,
+       START_TIME + 1.day + 23.hours + 59.minutes + 59.seconds,
+       { highest_measures: { max: 3, remainder: :round } },
+       '2 days'],
+      [START_TIME,
+       START_TIME + 1.day,
+       { highest_measures: { remainder: :ceiling }, only: :months },
+       'less than 1 month'],
+      [START_TIME,
+       # Simplistic rounding: one would expect this to round up to a second week.
+       START_TIME + 1.week + 3.days + 23.hours,
+       { highest_measures: { remainder: :round } },
+       '1 week'],
+      [START_TIME,
+       # Simplistic rounding: in some months, 15 days is less than half, but we always round it up.
+       START_TIME + 1.month + 14.days,
+       { highest_measures: { remainder: :round } },
+       '2 months'],
     ].each do |start, finish, options, output|
       it "should be #{output}" do
         expect(distance_of_time_in_words(start, finish, true, options)).to eq(output)
       end
     end
 
+    it "raises ArgumentError when an unrecognized value is passed for highest_measure.remainder" do
+      expect do
+        distance_of_time_in_words(START_TIME, START_TIME + 1.day, true, { highest_measures: { remainder: :oops }})
+      end.to raise_error(ArgumentError)
+    end
+
     if defined?(ActionView)
       describe 'ActionView without include seconds argument' do
         [
@@ -370,7 +446,7 @@ describe 'A better distance_of_time_in_words' do
             expect(distance_of_time_in_words(start, finish, true, options)).to eq(output)
           end
         end
-  
+
         context 'via ActionController::Base.helpers' do
           it '#distance_of_time_in_words' do
             end_time = START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds

data/spec/lib/i18n/dz.yml

@@ -0,0 +1,21 @@
+seconds:
+  1.second: སྐར་ཆ་ ༡
+  3.seconds: སྐར་ཆ་ 3
+minutes:
+  1.minute: སྐར་མ་ ༡
+  20.minutes: སྐར་མ་ 20
+hours:
+  1.hour: ཆུ་ཚོད་ ༡
+  5.hours: ཆུ་ཚོད་ 5
+days:
+  1.day: ཉིནམ་ ༡
+  6.days: ཉིནམ་ 6
+weeks:
+  1.week: བདུན༌ཕྲག་ ༡
+  2.weeks: བདུན༌ཕྲག་ 2
+months:
+  1.month: ཟླཝ་ ༡
+  9.months: ཟླཝ་ 9
+years:
+  1.year: ལོ་ ༡
+  3.years: ལོ་ 3

data/spec/lib/i18n/ru.yml

@@ -3,3 +3,21 @@ seconds:
   1.second: 1 секунда
 minutes:
   1.minute: 1 минута
+compact seconds:
+  1.second: 1с
+  11.seconds: 11с
+  21.seconds: 21с
+compact minutes:
+  1.minute: 1м
+  11.minutes: 11м
+  21.minutes: 21м
+compact hours:
+  1.hour: 1ч
+  11.hours: 11ч
+  21.hours: 21ч
+compact days:
+  1.day: 1д
+compact years:
+  1.year: 1г
+  11.years: 11г
+  21.years: 21г

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotiw
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.5.0
 platform: ruby
 authors:
 - Ryan Bigg
 - Lauran Jansen
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,6 +122,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.7
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   dotiw is a gem for Rails that overrides the
                 default distance_of_time_in_words and provides
@@ -141,6 +182,7 @@ files:
 - ".rspec"
 - Appraisals
 - CHANGELOG.md
+- CODEOWNERS
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -149,16 +191,19 @@ files:
 - benchmarks/time_hash_bench.rb
 - dotiw.gemspec
 - gemfiles/.bundle/config
-- gemfiles/rails_4.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_7.0.gemfile
+- gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/dotiw.rb
 - lib/dotiw/action_view/helpers/date_helper.rb
 - lib/dotiw/locale/ar.yml
 - lib/dotiw/locale/da.yml
 - lib/dotiw/locale/de.yml
+- lib/dotiw/locale/dz.yml
 - lib/dotiw/locale/en.yml
 - lib/dotiw/locale/es.yml
 - lib/dotiw/locale/fr.yml
@@ -182,6 +227,7 @@ files:
 - spec/lib/i18n/ar.yml
 - spec/lib/i18n/da.yml
 - spec/lib/i18n/de.yml
+- spec/lib/i18n/dz.yml
 - spec/lib/i18n/en.yml
 - spec/lib/i18n/es.yml
 - spec/lib/i18n/fr.yml
@@ -203,7 +249,6 @@ homepage: https://github.com/radar/distance_of_time_in_words
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -218,8 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Better distance_of_time_in_words for Rails
 test_files:
@@ -227,6 +271,7 @@ test_files:
 - spec/lib/i18n/ar.yml
 - spec/lib/i18n/da.yml
 - spec/lib/i18n/de.yml
+- spec/lib/i18n/dz.yml
 - spec/lib/i18n/en.yml
 - spec/lib/i18n/es.yml
 - spec/lib/i18n/fr.yml