holidays_from_google_calendar 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d15b6c9af4b8d193dd5101bf9bb0fcbf88ca4b1f
-  data.tar.gz: df5668b442b607859d8ee4d7c66ef3bedb3d20fe
+  metadata.gz: d2ae6b02cc84e33b45e895f23533e6c3bf660a64
+  data.tar.gz: 4ae41a072da7685c8c30afe4a6d7c8f9a346fec6
 SHA512:
-  metadata.gz: 5e21ac4c86de0875fe0b115a41655e8e3b0a8cecf64b7d3c1c0796b1cc4b1766de2a0c8e433f48171f5ed5e24afce58ef2f20d0e0261202ef25997d6d0c9a161
-  data.tar.gz: d2d10e1ca4c3cf260b9fa9ef017573efd0716bff787e1b70de1576ec472f55a7b44ff1f0c3ae2769d5c7980f4ad78aa0edbcc0746eb86f126ba4189c8db7bb64
+  metadata.gz: 200ebd890eddc0d45a9aa72e93101ec4ac128b4d15fd9e186735ea7247907f3a06f3bdb398eca8616ace16e6062bbf828f54e866f444f2a3cb6b6b8813fe17e8
+  data.tar.gz: c2894111a48fcb745adc21805631d98a1266063d4b675c14742aa8d47c2c9889c1f4a454d57cb47f54c0c34cdfff2f2de331de781ecd583e4c887046d142c018

data/README.md

@@ -61,7 +61,6 @@ usa_holidays.in_year(Date.parse("2016-02-06")) # Retrieve 2016's holidays
  #<HolidaysFromGoogleCalendar::Holiday:0x007ff7d42d7a70 @date=Sun, 25 Dec 2016, @name="Christmas Day">,
  #<HolidaysFromGoogleCalendar::Holiday:0x007ff7d42d7660 @date=Mon, 26 Dec 2016, @name="Christmas Day observed">,
  #<HolidaysFromGoogleCalendar::Holiday:0x007ff7d42d70e8 @date=Sat, 31 Dec 2016, @name="New Year's Eve">,
- #<HolidaysFromGoogleCalendar::Holiday:0x007ff7d42d62b0 @date=Sun, 01 Jan 2017, @name="New Year's Day">]
 
 usa_holidays.in_month(Date.parse("3rd March 2016")) # Retrieve holidays of March, 2016
 => [#<HolidaysFromGoogleCalendar::Holiday:0x007ff7d42dd808 @date=Sun, 13 Mar 2016, @name="Daylight Saving Time starts">,

data/lib/holidays_from_google_calendar.rb

@@ -17,27 +17,30 @@ module HolidaysFromGoogleCalendar
       @client = Client.new(@configuration)
     end
 
+    def on_date(date)
+      @client.retrieve(
+        date_min: date,
+        date_max: date
+      )
+    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
+        date_max: date.end_of_year
       )
     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
+        date_max: date.end_of_month
       )
     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
-      holiday = @client.retrieve(date_min: date, date_max: date + 1.day).first
-      holiday && holiday.date == date
+      @client.retrieve(date_min: date, date_max: date).size > 0
     end
   end
 end

data/lib/holidays_from_google_calendar/client.rb

@@ -11,6 +11,9 @@ module HolidaysFromGoogleCalendar
     end
 
     def retrieve(date_min: nil, date_max: nil)
+      date_min = Date.parse(date_min.iso8601)
+      date_max = Date.parse(date_max.iso8601)
+
       if @cache.enabled?
         cached_holidays = @cache.retrieve(date_min, date_max)
         return cached_holidays if cached_holidays
@@ -32,9 +35,9 @@ module HolidaysFromGoogleCalendar
         single_events: true,
         order_by: "startTime",
         time_min: date_to_time(date_min),
-        time_max: date_to_time(date_max)
+        time_max: date_to_time(date_max + 1.day)
       )
-      pack_response_in_object(response)
+      pack_response_in_object(response, date_min, date_max)
     end
 
     def calendar_id
@@ -42,17 +45,21 @@ module HolidaysFromGoogleCalendar
     end
 
     def date_to_time(date)
-      date = Date.parse(date.iso8601) if date.is_a?(Time)
       Time.parse(date.iso8601).iso8601
     end
 
-    def pack_response_in_object(response)
+    def pack_response_in_object(response, date_min, date_max)
       response.items.reduce([]) do |array, item|
         holiday = Holiday.new(
           name: item.summary,
           date: Date.parse(item.start.date)
         )
-        array.push(holiday)
+
+        if date_min <= holiday.date && holiday.date <= date_max
+          array.push(holiday)
+        else
+          array # Do nothing
+        end
       end
     end
 

data/lib/holidays_from_google_calendar/version.rb

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

metadata

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