holidays_from_google_calendar 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a8916afe622596bf9311273eb56740d3615eade
-  data.tar.gz: e0cf6e4174857b76dfdec9b4f7ca5a0a8a99a1e0
+  metadata.gz: 6153b8303d8c2ed10bd01777d2a12220e7068741
+  data.tar.gz: 098761555465b0d8a7e91f8948c60ba724e0055f
 SHA512:
-  metadata.gz: 5b974f06482b715f7a6f1dcc96bea081b8a6a89980e84ecc943e16efed67625c95c6541c2a2967537ee9266c700c2a884e020680869d44a994733ab7fe5573fe
-  data.tar.gz: c54480c4df9bc58eaf7167122bd414be990ae65a9bd9d5a4a727db34e2b946e9f74b30cf30dee33dc52ecc5d5f46aee8d54f7992d35c0f3ca8022147c28b1dbf
+  metadata.gz: d306a10df8000079761dcf39a6e5c43a2005be859cc2586789c58238fc5e8b06f9a6747f506f58c17cf4c5fdbf45127a783f79b6ac637f6065c1a445befd0641
+  data.tar.gz: fb9c764618e7f03a183371cca109b16671c79e463c521272a9c4236b1bddafd7b4384fca177bc8610eb812d539761d847cc2e0dfc66d6d9720e8ddb8e8fd1bd0

data/README.md

@@ -80,7 +80,7 @@ usa_holidays.holiday?(Date.parse("Aug 2 2016")) # Weekday (Tuesday)
 ```
 
 ## Development
-Need to set the following environment variable to run rspec.
+Need to set the following environment variable to run rspec:
 
 ```bash
 GOOGLE_API_KEY="YOUR OWN GOOGLE API KEY"

data/lib/holidays_from_google_calendar/cache_unit.rb

@@ -21,18 +21,14 @@ module HolidaysFromGoogleCalendar
     end
 
     def overlapped?(other)
-      (date_min <= other.date_max && other.date_min <= date_max) ||
-        (other.date_min <= date_max && date_min <= other.date_max)
+      (date_min <= other.date_max && other.date_min <= date_max + 1) ||
+        (other.date_min <= date_max && date_min <= other.date_max + 1)
     end
 
     def combine(other)
       return unless overlapped?(other)
-
-      if date_min <= other.date_max
-        date_min = other.date_min # rubocop:disable Lint/UselessAssignment
-      elsif other.date_min <= date_max
-        date_max = other.date_max # rubocop:disable Lint/UselessAssignment
-      end
+      date_min = [date_min, other.date_min].min
+      date_max = [date_max, other.date_max].max
       @holidays =
         @holidays.concat(other.holidays).uniq.sort { |a, b| a.date <=> b.date }
     end

data/lib/holidays_from_google_calendar/version.rb

@@ -1,3 +1,3 @@
 module HolidaysFromGoogleCalendar
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holidays_from_google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - necojackarc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client