timely 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2b1578790a3652ed5ddb9a945edfb6a1ce97c8d3
-  data.tar.gz: c90cc8c24b07e22e4adb8329a2f7f4ded66705cb
+SHA256:
+  metadata.gz: 36062e70f6f891b86756085fcad60f2bd9e4b835c981d63eb6de79c3d3686918
+  data.tar.gz: 04626beef2e728acb924fc9a29413a13f4ebd2769af4825aaabce3a062607fba
 SHA512:
-  metadata.gz: 55f0ea5284f24c00885e30a2f63ba567b560ab44e02039b1438e4c971f194b258a0273dbcbeeb79707371a15bb3ad6b7346f617c093825955a05f0110a696c5a
-  data.tar.gz: 828865db23a5d6d06f1470c3cf912a0eec6699c6a23c969ac3ecfbbdf8641e83bcb013c51f9eeffaf0c162bf4c7faa3d836898195892db221f4ae74d3ec13878
+  metadata.gz: da490cb6717e3e8a3d814bb48022b62b6fb0e21b515fc6a4d25e9011f89ff10f1f1bdc90175ea71f8c440062584ba9be7185b85e7a3bb08b158b542f8446f3ea
+  data.tar.gz: 71d85acac0eabfa64971724a479b8d758721b8fac00ab2071d515926c5418e1155bab611ca28a5012a24a2ab7edd6de776e035d5a350e32ed9eefed6bdb34aea

data/.ruby-version

@@ -1 +1 @@
-2.4.4
+2.6.3

data/.travis.yml

@@ -1,22 +1,22 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.3.0
   - 2.4
+  - 2.5
+  - 2.6
 matrix:
   fast_finish: true
   exclude:
     - rvm: 2.4
-      gemfile: gemfiles/rails3.gemfile
+      gemfile: gemfiles/rails6.gemfile
+
+before_install:
+  - gem install bundler
 script: bundle exec rake spec
 gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
   - gemfiles/rails5.gemfile
+  - gemfiles/rails6.gemfile
 notifications:
   email:
     - support@travellink.com.au
-  flowdock:
-    secure: QC1mV/0NZwA4tU2K1BQSety/seEf7ujL3uUlddXrMm0yHp0NBMlo1tnQ7KKopSKoyoPj9M9KmfhrCdbdZXDOU57WucH+pz7Tn9Zp9VkPUMniN4rYSwkrF17vihM5NpdyDzqo5mzthVPUEV0DtlK+Uu2W4wMUpu1uKaahFzHJH6k=
 sudo: false
 cache: bundler

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.4.0
+
+* [TT-5648] Fix date_range to string when a single month covers a year period
+
 ## 0.3.4
 
 * [TT-4812] Remove bootstrap class from calender tag

data/README.md

@@ -1,5 +1,4 @@
-Timely
-======
+# Timely
 
 [![Build Status](https://travis-ci.org/sealink/timely.png?branch=master)](https://travis-ci.org/sealink/timely)
 [![Coverage Status](https://coveralls.io/repos/sealink/timely/badge.png)](https://coveralls.io/r/sealink/timely)
@@ -11,18 +10,20 @@ Timely
 Various helpers to work with times, dates and weekdays, etc.
 
 It includes the following (see end for full descriptions)
-* Core extensions to Date and Time
-* DateChooser, a class to help select a subset of dates within any range, e.g. All 2nd Sundays, Every 15th of the month, All Tuesdays and Wednesdays
-* WeekDays, a class to manage the selection of weekdays, outputs a integer representing which days as a number between 0 and 127 (e.g. a 7 bit integer)
-* DateRange: A subclass of Range for dates with various helpers and aliases
-* TrackableDateSet: Recording set of dates processed/processing
-* TemporalPatterns: Various other classes related to time, e.g. Frequency
+
+- Core extensions to Date and Time
+- DateChooser, a class to help select a subset of dates within any range, e.g. All 2nd Sundays, Every 15th of the month, All Tuesdays and Wednesdays
+- WeekDays, a class to manage the selection of weekdays, outputs a integer representing which days as a number between 0 and 127 (e.g. a 7 bit integer)
+- DateRange: A subclass of Range for dates with various helpers and aliases
+- TrackableDateSet: Recording set of dates processed/processing
+- TemporalPatterns: Various other classes related to time, e.g. Frequency
 
 It includes the following rails extensions (only loaded if inside rails project):
-* Date Group, a date range which can also be limited to WeekDays, e.g. all weekends between March and April
-* Season, a collection of Date Groups
-* weekdays_field, a way to declare an integer field to store weekdays (weekdays is stored as 7 bit integer)
-* acts_as_seasonal, a way to declare a season_id foreign key as well as some helper methods
+
+- Date Group, a date range which can also be limited to WeekDays, e.g. all weekends between March and April
+- Season, a collection of Date Groups
+- weekdays_field, a way to declare an integer field to store weekdays (weekdays is stored as 7 bit integer)
+- acts_as_seasonal, a way to declare a season_id foreign key as well as some helper methods
 
 # INSTALLATION
 

data/gemfiles/{rails3.gemfile → rails6.gemfile}

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'activerecord', '~> 3.2.0'
+  gem 'activerecord', '~> 6.0.0.rc1'
 end

data/lib/timely/date_range.rb

@@ -58,7 +58,7 @@ module Timely
       if first && last
         if first == last
           first.strftime(fmt)
-        elsif first == first.at_beginning_of_month && last == last.at_end_of_month
+        elsif first.year == last.year && first == first.at_beginning_of_month && last == last.at_end_of_month
           if first.month == last.month
             first.strftime(month_fmt)
           else

data/lib/timely/version.rb

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

data/spec/date_range_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
 describe Timely::DateRange do
-  
+
   it "should allow initialization with two dates" do
     expect { @date_range = Timely::DateRange.new(Date.today, Date.today + 3) }.to_not raise_error
     expect(@date_range.start_date).to eq Date.today
     expect(@date_range.end_date).to eq Date.today + 3
     expect(@date_range.number_of_nights).to eq 4
   end
-  
+
   it "should allow initialization with one date" do
     expect { @date_range = Timely::DateRange.new(Date.today) }.to_not raise_error
     expect(@date_range.start_date).to eq Date.today
     expect(@date_range.end_date).to eq Date.today
     expect(@date_range.number_of_nights).to eq 1
   end
-  
+
   it "should allow initialization with a range" do
     expect { @date_range = Timely::DateRange.new(Date.today..Date.today + 3) }.to_not raise_error
     expect(@date_range.start_date).to eq Date.today
@@ -27,6 +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)'
     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'
@@ -74,5 +75,5 @@ describe Timely::DateRange do
     expect(@date_range.intersecting_dates(Timely::DateRange.new("2000-01-03".to_date, "2000-01-05".to_date))).to eq ("2000-01-03".to_date.."2000-01-03".to_date)
     expect(@date_range.intersecting_dates(Timely::DateRange.new("2000-01-02".to_date, "2000-01-04".to_date))).to eq ("2000-01-03".to_date.."2000-01-03".to_date)
   end
-  
+
 end

data/timely.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.0.1"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec-its'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timely
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Noack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,13 +220,11 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.gemfile
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - lib/timely.rb
 - lib/timely/date.rb
 - lib/timely/date_chooser.rb
@@ -295,8 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Set of time, date, weekday related methods.

data/HISTORY.md

@@ -1,3 +0,0 @@
-# 0.0.1 / 2008-05-08
-
-* Initial release

data/gemfiles/rails4.gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-gemspec :path => '../'
-
-group :development, :test do
-  gem 'activerecord', '~> 4.0'
-end