dotiw 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1c8a832bcdb740a88002dec2f5c843daeca75b2674b2e31c26abc17a144c6a2
-  data.tar.gz: 163a34f6e15e34026375176118399cc65ed73b2f723dab436bc9aedaf36dc0b7
+  metadata.gz: 36c95ebe9c3f26cad8de3f4671810af863f765b14f0c5066d761b84881515935
+  data.tar.gz: 76b3a723afd1e060a71e148c1b2f839460e325848de32b94d1d0fe701266f266
 SHA512:
-  metadata.gz: 6e1a5291d51d629e4fc27d3f915f84586089be0869a676107154ef5f865c46fac768c4a2e7d86ac5fdfc2aadc879b668923f130f2f75ad0c355cbb86a5b18cc4
-  data.tar.gz: f575e5e232a5adfefd8f81aa15f132dc352d020233bd1f66f6cddca473031d5cce0abf76bfd0842e0b55c3c60d4a44e2e7cf56a28b6e6fc89245e9fd17705bd7
+  metadata.gz: 25bbeae402bf0addf41bfdd5b0a7b7e23c51c528c1905714abad73696fa62cc8fb79eb6721fac8e69e1c8ca86c1d72c0fb04e7d8728b196d1dde5158df1cc035
+  data.tar.gz: 8d63f397602b8f07df9c4d0a1f60f10c48a19b8e01ee3346305bb364e3a18b74670032cdb37f6b1c6da8f26eb2e056ebb5b7f0940798c5bc133b612765500233

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.3.1 (2021/03/26)
+
+* [#124](https://github.com/radar/distance_of_time_in_words/pull/124): Fixes compact formatting for distance_of_time_in_words - [@rposborne](https://github.com/rposborne).
+
 ## 5.3.0 (2021/03/18)
 
 * [#115](https://github.com/radar/distance_of_time_in_words/pull/115): Use constants for time durations (2x faster, 3.5x less memory) - [@krzysiek1507](https://github.com/krzysiek1507).

data/lib/dotiw/methods.rb

@@ -102,7 +102,7 @@ module DOTIW
                                                        default: :'support.array.last_word_connector',
                                                        locale: options[:locale]
 
-      output.to_sentence(options.except(:accumulate_on))
+      output.to_sentence(options.except(:accumulate_on, :compact))
     end
   end
 end

data/lib/dotiw/version.rb

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

data/spec/lib/dotiw_spec.rb

@@ -135,32 +135,33 @@ describe 'A better distance_of_time_in_words' do
     end
 
     [
-      [START_TIME, START_TIME + 5.days + 3.minutes, '5 days and 3 minutes'],
-      [START_TIME, START_TIME + 1.minute, '1 minute'],
-      [START_TIME, START_TIME + 3.years, '3 years'],
-      [START_TIME, START_TIME + 10.years, '10 years'],
-      [START_TIME, START_TIME + 8.months, '8 months'],
-      [START_TIME, START_TIME + 3.hour, '3 hours'],
-      [START_TIME, START_TIME + 13.months, '1 year and 1 month'],
+      [START_TIME, START_TIME + 5.days + 3.minutes, '5 days and 3 minutes', '5d3m'],
+      [START_TIME, START_TIME + 1.minute, '1 minute', '1m'],
+      [START_TIME, START_TIME + 3.years, '3 years', '3y'],
+      [START_TIME, START_TIME + 10.years, '10 years', '10y'],
+      [START_TIME, START_TIME + 8.months, '8 months', '8mo'],
+      [START_TIME, START_TIME + 3.hour, '3 hours', '3h'],
+      [START_TIME, START_TIME + 13.months, '1 year and 1 month', '1y1mo'],
       # Any numeric sequence is merely coincidental.
       [START_TIME, START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
-       '1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds'],
-      ['2009-3-16'.to_time, '2008-4-14'.to_time, '11 months and 2 days'],
-      ['2009-3-16'.to_time + 1.minute, '2008-4-14'.to_time, '11 months, 2 days, and 1 minute'],
-      ['2009-4-14'.to_time, '2008-3-16'.to_time, '1 year, 4 weeks, and 1 day'],
-      ['2009-2-01'.to_time, '2009-3-01'.to_time, '1 month'],
-      ['2008-2-01'.to_time, '2008-3-01'.to_time, '1 month'],
-      [Date.parse('31.03.2015').to_time, Time.parse('01.03.2016'), '10 months, 4 weeks, and 2 days'],
-      [Date.new(2014, 1, 31), Date.new(2014, 3, 1), '4 weeks and 1 day'],
-      ['2008-2-01'.to_time, '2008-3-01'.to_time, '1 month'],
-      ['2014-1-31'.to_time, '2014-3-01'.to_time, '4 weeks and 1 day'],
-      ['2014-1-31'.to_time, '2014-3-02'.to_time, '4 weeks and 2 days'],
-      ['2016-1-31'.to_time, '2016-3-01'.to_time, '4 weeks and 2 days'],
-      ['2016-1-31'.to_time, '2016-3-02'.to_time, '1 month']
-    ].each do |start, finish, output|
+       '1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds', '1y2mo3w4d5h6m7s'],
+      ['2009-3-16'.to_time, '2008-4-14'.to_time, '11 months and 2 days', '11mo2d'],
+      ['2009-3-16'.to_time + 1.minute, '2008-4-14'.to_time, '11 months, 2 days, and 1 minute', '11mo2d1m'],
+      ['2009-4-14'.to_time, '2008-3-16'.to_time, '1 year, 4 weeks, and 1 day', '1y4w1d'],
+      ['2009-2-01'.to_time, '2009-3-01'.to_time, '1 month', '1mo'],
+      ['2008-2-01'.to_time, '2008-3-01'.to_time, '1 month', '1mo'],
+      [Date.parse('31.03.2015').to_time, Time.parse('01.03.2016'), '10 months, 4 weeks, and 2 days', '10mo4w2d'],
+      [Date.new(2014, 1, 31), Date.new(2014, 3, 1), '4 weeks and 1 day', '4w1d'],
+      ['2008-2-01'.to_time, '2008-3-01'.to_time, '1 month', '1mo'],
+      ['2014-1-31'.to_time, '2014-3-01'.to_time, '4 weeks and 1 day', '4w1d'],
+      ['2014-1-31'.to_time, '2014-3-02'.to_time, '4 weeks and 2 days', '4w2d'],
+      ['2016-1-31'.to_time, '2016-3-01'.to_time, '4 weeks and 2 days', '4w2d'],
+      ['2016-1-31'.to_time, '2016-3-02'.to_time, '1 month', '1mo']
+    ].each do |start, finish, output, compact_result|
       it "should be #{output}" do
         expect(distance_of_time_in_words(start, finish, true)).to eq(output)
         expect(distance_of_time_in_words(finish, start, true)).to eq(output)
+        expect(distance_of_time_in_words(start, finish, true, compact: true)).to eq(compact_result)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotiw
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Ryan Bigg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport