jekyll-google-calendar 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1946582c3cf64cd533e2375fadeb22cdfdc7730cec110103f9cfa693ce7eb802
-  data.tar.gz: 3f3e2ec49bf29c049afa1185cddefebe106927da32c48d6aff2ae2fd42b62f4b
+  metadata.gz: 8639a693d7678ca5a0d13b964f91cc48e5f19290cefadba6464b0d449d6444c5
+  data.tar.gz: 2d4417316d13393970fc4112917eecc6390c3ca41a363692b6f079f4e26c727a
 SHA512:
-  metadata.gz: 6d2861a5331541ebed48c88a7430188f073c966d1c10154daddd5cc64bd0d697322c0fa1625322c7880d5f844436e30f5e2ba3a0ed78ad34bb1a3d58ac25b07b
-  data.tar.gz: 8326822b153152c8e32f51b2fcf5a50256b3c4d7c226dfbc0f21666a641d778222b89b120e56549cf8e23bad47d63b90d32a2c702ef0124617fba79b6cf17100
+  metadata.gz: 9657bc9d551096a5442b58164dcb9fe1ca30cbab0212d54b3a2fe28c9cf03dea6abd585fd4a5ad9c14b4f971b42373ca92cf6476737b52d2e77b41f1162788fb
+  data.tar.gz: b3634adee7ede9facbccbc2a635b89af94696049dff96177fc150ac76cb4181c97268c3207c00ea8418c4c5eea7c1bb5ac2038f4f5851b7933bac4a55a1c8831

data/lib/jekyll/google/calendar/event_list.rb

@@ -0,0 +1,41 @@
+require 'date'
+
+module Jekyll
+    module Google
+        module Calendar
+            module EventListFilter
+                def get_google_calendar_events_by_date_offset(events, startOffset, endOffset, soft_max)
+                    i = 0
+                    newEvents = []
+                    unless events.nil?
+                        for event in events
+                            date = event["start"]["date"] || event["start"]["dateTime"]
+                            date = date.to_time
+
+                            start_of_day = Time.new(Time.now.year, Time.now.month, Time.now.day) + 60*60*24 * startOffset
+                            end_of_range = nil
+                            if endOffset >= 0
+                                end_of_range = Time.new(Time.now.year, Time.now.month, Time.now.day) + 60*60*24 * (endOffset + 1)
+                            end
+
+                            today = date < start_of_day + 60*60*24
+
+
+                            if (date >= start_of_day.utc) && (!end_of_range || date < end_of_range)
+                                if (today || i < soft_max)
+                                    newEvents.push(event)
+                                    i = i + 1
+                                else
+                                    return newEvents
+                                end
+                            end 
+                        end
+                    end
+                    newEvents
+                end
+            end
+        end
+    end
+end
+
+Liquid::Template.register_filter(Jekyll::Google::Calendar::EventListFilter)

data/lib/jekyll/google/calendar/generator.rb

@@ -1,12 +1,10 @@
 require 'google/apis/calendar_v3'
 require 'googleauth'
+require_relative "event_list"
+include Jekyll::Google::Calendar::EventListFilter
 
 GoogleCalendar = ::Google::Apis::CalendarV3
 
-#TODO: Handle case where calendar doesn't exist or is not readable
-#TODO: Add conference data to hash
-#TODO: Add remaining calendar response data to hash
-
 module Jekyll
     module Google
         module Calendar
@@ -31,6 +29,7 @@ module Jekyll
                 end
             end
 
+
             ##
             # This class is a Generator that Jekyll will call to generate events from our Google Calendars
 
@@ -47,13 +46,70 @@ module Jekyll
                     @gcallendar_config = site.config['gcalendar']
                     raise 'Missing Google Calendar configuration in _config.yml' unless @gcallendar_config
                     service = setup_calendar()
+                    site.data["calendars"] = Hash.new
                     @gcallendar_config['calendars'].each do |calendar|
                         process_calendar(site, service, calendar['id'], calendar['look_ahead'], calendar['directory'], calendar['date_format'], calendar['layout'])
                     end
+
+                    unless @gcallendar_config["event_list_name"].nil?
+                        events = []
+                        unless site.data["calendars"].nil?
+                            site.data["calendars"].each do |calendar|
+                                events = events.concat(calendar[1])
+                            end
+                            events = get_google_calendar_events_by_date_offset(events,0,-1,1000)
+
+                            page_size = @gcallendar_config['event_list_per_page']
+                            pages = (events.length / page_size).ceil
+                            for i in 0..(pages-1)
+                                create_event_list_page(site, events.slice(i*page_size, page_size), @gcallendar_config['event_list_page_layout'], i+1, pages, events.length)
+                            end
+                        end
+                    end
                 end
         
                 private
 
+                def create_event_list_page(site, event_list, layout, event_list_page, event_list_pages, total_events)
+                    dir = @gcallendar_config["event_list_name"]
+                    path = "/" + (dir[-1] == "/" ? dir : dir + "/") + event_list_page .to_s
+                    if (event_list_page == 1)
+                        path = "/" + (dir[-1] == "/" ? dir : dir + "/")
+                    end
+
+                    prev_path = nil
+                    prev_page = nil
+                    if (event_list_page > 1)
+                        prev_page = event_list_page-1
+                        prev_path = "/" + (dir[-1] == "/" ? dir : dir + "/") + (event_list_page-1).to_s
+                        if (event_list_page == 2)
+                            prev_path = "/" + (dir[-1] == "/" ? dir : dir + "/")
+                        end
+                    end
+
+                    next_path = nil
+                    next_page = nil
+                    if (event_list_page <= event_list_pages)
+                        next_page = event_list_page+1
+                        next_path = "/" + (dir[-1] == "/" ? dir : dir + "/") + (event_list_page+1).to_s
+                        if (event_list_page == 2)
+                            next_path = "/" + (dir[-1] == "/" ? dir : dir + "/")
+                        end
+                    end
+
+                    paginator = {"page" => event_list_page,
+                                "per_page" => @gcallendar_config['event_list_per_page'],
+                                "events" => event_list,
+                                "total_events" => total_events,
+                                "total_pages" => event_list_pages,
+                                "previous_page" => prev_page,
+                                "previous_page_path" => prev_path,
+                                "next_page" => next_page,
+                                "next_page_path" => next_path}
+
+                    site.pages << EventListPage.new(site, site.source, path, 'index.html', layout, paginator)
+                end
+
                 def setup_calendar()
                     scope = 'https://www.googleapis.com/auth/calendar'
                     calendar = GoogleCalendar::CalendarService.new
@@ -69,6 +125,7 @@ module Jekyll
                     page_token = nil
                     calendar_data = nil
                     end_time = DateTime.now + look_ahead
+                    site.data["calendars"][calendar_id] = []
                     begin
                         response = get_events(calendar, calendar_id, page_token, end_time)
                         calendar_data = calendar_data ? calendar_data : hash_calendar_data(response)
@@ -106,6 +163,7 @@ module Jekyll
                         path += "-" + overlap.length.to_s
                     end
                     site.pages << EventPage.new(site, site.source, path, 'index.html', layout, hash, calendar_data, calendar_id)
+                    site.data["calendars"][calendar_id].push(hash);
                 end
 
                 def hash_calendar_data(response)
@@ -205,6 +263,21 @@ module Jekyll
                     hash
                 end
             end
+
+            class EventListPage < Page
+                def initialize(site, base, dir, name, layout, paginator)
+                    @site = site
+                    @base = base
+                    @dir = dir
+                    @name = name
+                    self.process(@name)
+                    self.data    = site.layouts[layout].data.dup
+                    self.content = site.layouts[layout].content.dup
+                    self.data['layout'] = layout
+                    self.data['events'] = paginator
+                end
+            end
+
         end
     end
 end

data/lib/jekyll/google/calendar/version.rb

@@ -1,7 +1,7 @@
 module Jekyll
     module Google
         module Calendar
-            VERSION = "0.1.1"
+            VERSION = "0.2.0"
         end
     end
 end

data/lib/jekyll-google-calendar.rb

@@ -1,2 +1,3 @@
 require "jekyll/google/calendar/version"
 require "jekyll/google/calendar/generator"
+require "jekyll/google/calendar/event_list"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-google-calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - David Gundry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-google-calendar.rb
+- lib/jekyll/google/calendar/event_list.rb
 - lib/jekyll/google/calendar/generator.rb
 - lib/jekyll/google/calendar/version.rb
 homepage: https://github.com/davidgundry/jekyll-google-calendar