timely 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36062e70f6f891b86756085fcad60f2bd9e4b835c981d63eb6de79c3d3686918
-  data.tar.gz: 04626beef2e728acb924fc9a29413a13f4ebd2769af4825aaabce3a062607fba
+  metadata.gz: 382904d08678605d938cd0d941705332863f14a1d4c35b2cb8b32e392512ebed
+  data.tar.gz: 4b3fe1a94eb20f44f5d7936ee74b2c6a318876842941802d1dc21730ebf9601b
 SHA512:
-  metadata.gz: da490cb6717e3e8a3d814bb48022b62b6fb0e21b515fc6a4d25e9011f89ff10f1f1bdc90175ea71f8c440062584ba9be7185b85e7a3bb08b158b542f8446f3ea
-  data.tar.gz: 71d85acac0eabfa64971724a479b8d758721b8fac00ab2071d515926c5418e1155bab611ca28a5012a24a2ab7edd6de776e035d5a350e32ed9eefed6bdb34aea
+  metadata.gz: afff189e47475c6735567715412ed9b18bdfcda0d3e18d47a1380e5638fe4761ca1e557258bdd94524d2de8c416b9fe6af2e5d1e0da7b345300263b8ef991165
+  data.tar.gz: 7992375af6e06869b694094b4219b7e59ce47cb902c9c4347d894d90eb9f208e44cb8d57addaa9797258c0b014520e7a5817a59c9b54535f1646ba586f6c5f97

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.1
+
+* [TT-5674] Make multi year date format friendlier
+
 ## 0.4.0
 
 * [TT-5648] Fix date_range to string when a single month covers a year period

data/lib/timely/date_range.rb

@@ -58,8 +58,8 @@ module Timely
       if first && last
         if first == last
           first.strftime(fmt)
-        elsif first.year == last.year && first == first.at_beginning_of_month && last == last.at_end_of_month
-          if first.month == last.month
+        elsif first == first.at_beginning_of_month && last == last.at_end_of_month
+          if first.year == last.year && first.month == last.month
             first.strftime(month_fmt)
           else
             "#{first.strftime(month_fmt)} to #{last.strftime(month_fmt)}"

data/lib/timely/version.rb

@@ -1,3 +1,3 @@
 module Timely
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/date_range_spec.rb

@@ -27,7 +27,7 @@ describe Timely::DateRange do
     expect(Timely::DateRange.new('2000-01-04'.to_date, '2000-01-06'.to_date).to_s).to eq '2000-01-04 to 2000-01-06 (inclusive)'
     expect(Timely::DateRange.new('2000-01-01'.to_date, '2000-05-31'.to_date).to_s).to eq 'Jan 2000 to May 2000'
     expect(Timely::DateRange.new('2000-01-01'.to_date, '2000-01-31'.to_date).to_s).to eq 'Jan 2000'
-    expect(Timely::DateRange.new('2000-01-01'.to_date, '2001-01-31'.to_date).to_s).to eq '2000-01-01 to 2001-01-31 (inclusive)'
+    expect(Timely::DateRange.new('2000-01-01'.to_date, '2001-01-31'.to_date).to_s).to eq 'Jan 2000 to Jan 2001'
     Date::DATE_FORMATS[:short] = '%Y-%m-%d'
     expect(Timely::DateRange.to_s('2000-01-01'.to_date, nil)).to eq 'on or after 2000-01-01'
     expect(Timely::DateRange.to_s(nil, '2000-01-31'.to_date)).to eq 'on or before 2000-01-31'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler