holidays_from_google_calendar 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a59e69c462038c25af1aa0b4823cf9016b52b14e
-  data.tar.gz: dcd9fd8b0cfd5fa346183eb7870538df0bf3c188
+  metadata.gz: d15b6c9af4b8d193dd5101bf9bb0fcbf88ca4b1f
+  data.tar.gz: df5668b442b607859d8ee4d7c66ef3bedb3d20fe
 SHA512:
-  metadata.gz: 5b7419bbaae8268b58db9fa448089c0e9283f6c3cdc689e546d372cecb0f81301a9b7f8975fbd90d5a3a2deab8a7de8fa4a5d0536d0de88eb7a669c73d2e16bd
-  data.tar.gz: 130fab39c62241f14dbb9f6678e11ea85c00425f50bcae587334bbb209a51576171276fdabf855406079f43252e200f1305f538c2785c6f5875128f6574760ed
+  metadata.gz: 5e21ac4c86de0875fe0b115a41655e8e3b0a8cecf64b7d3c1c0796b1cc4b1766de2a0c8e433f48171f5ed5e24afce58ef2f20d0e0261202ef25997d6d0c9a161
+  data.tar.gz: d2d10e1ca4c3cf260b9fa9ef017573efd0716bff787e1b70de1576ec472f55a7b44ff1f0c3ae2769d5c7980f4ad78aa0edbcc0746eb86f126ba4189c8db7bb64

data/lib/holidays_from_google_calendar.rb

@@ -18,6 +18,7 @@ module HolidaysFromGoogleCalendar
     end
 
     def in_year(date)
+      date = Date.parse(date.iso8601) if date.is_a?(Time)
       @client.retrieve(
         date_min: date.beginning_of_year,
         date_max: date.end_of_year + 1.day
@@ -25,6 +26,7 @@ module HolidaysFromGoogleCalendar
     end
 
     def in_month(date)
+      date = Date.parse(date.iso8601) if date.is_a?(Time)
       @client.retrieve(
         date_min: date.beginning_of_month,
         date_max: date.end_of_month + 1.day
@@ -32,8 +34,10 @@ module HolidaysFromGoogleCalendar
     end
 
     def holiday?(date)
+      date = Date.parse(date.iso8601) if date.is_a?(Time)
       return true if date.wday.in?([0, 6]) # If Sunday or Saturday
-      @client.retrieve(date_min: date, date_max: date + 1.day).size > 0
+      holiday = @client.retrieve(date_min: date, date_max: date + 1.day).first
+      holiday && holiday.date == date
     end
   end
 end

data/lib/holidays_from_google_calendar/client.rb

@@ -42,6 +42,7 @@ module HolidaysFromGoogleCalendar
     end
 
     def date_to_time(date)
+      date = Date.parse(date.iso8601) if date.is_a?(Time)
       Time.parse(date.iso8601).iso8601
     end
 

data/lib/holidays_from_google_calendar/version.rb

@@ -1,3 +1,3 @@
 module HolidaysFromGoogleCalendar
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: holidays_from_google_calendar
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - necojackarc