candl 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f453ff6b5464c6f58fabdfef441cc0080af51524582d2db10341cdb4f0782774
-  data.tar.gz: 6ef66482d98e39352a822e9c204af6982693f7f079e0cd31394c2414076eef4c
+  metadata.gz: ae5b957c2eb6a2da21113e9fbd401c9e92670d59e2b7cb3bd179fa8330ff8b0d
+  data.tar.gz: 1b9f60b83fc4c6bfcd27c8624d0df0886434c996f544d2918178f9803e2e8739
 SHA512:
-  metadata.gz: 919af5b1fdbb29b54b7e668ef119862143cf6f72c2ea8abb8fa1e500de39b1f6cd51841f2d5a97b30fdef1eed2bd01fe723385fbfbb35397f92aa8f527d9d6f5
-  data.tar.gz: 26ebe116f5fa6c8957b7e890b593eee95b563832ec988e007f074c3f668f584e0b69ef4255ee2af1f5cd1efb2396c5072c574b371eba5e4120ec60f665d2bb5e
+  metadata.gz: e7cb797136db669b46393567c0eee45e2510097cc85ae63efe2aef5e00ada2efc00f09a5070f949791fcf6b7d19f76945c29ddb17aae86d13c734c19dc4b477d
+  data.tar.gz: 9f1da686f930b06667f7a59d5839a5d20619b94f0b4bb93c678d34fa5ee352f3f4b1153077b3652bcd8cff1dea2220cebc85b341a85e27e6be7a0e265e70899c

data/README.md

@@ -1,5 +1,7 @@
 # Candl
 
+[![Build Status](https://travis-ci.org/hicknhack-software/candl.svg?branch=master)](https://travis-ci.org/hicknhack-software/candl)
+
 This gem helps load and display a calendar from google calendar in an agenda or month style view.
 
 ## Usage
@@ -11,7 +13,7 @@ Find an example inclusion of the _frame.slim partial in the show.slim file in ca
 The main steps to use this gem are:
 - Initialize an agenda or month model object with a config that specifies these values:
 
-````
+```json
 config = {
   "calendar": {
     "google_calendar_api_host_base_path": "https://www.googleapis.com/calendar/v3/calendars/",
@@ -31,7 +33,7 @@ config = {
     "maps_query_parameter": "q"
   }
 }
-````
+```
 
 - The node "calendar" holds all relevant information to the chosen calendar that you want to load events from.
 - Under "general" there is the "maps_query_host" wich is the base url to a map service (like google maps in this example) and the "maps_query_parameter". (Maybe in the future there will be more map services, that let one search for a location just via the url and a parameter. But for now i only found gmaps to be able to do this. Like: https://www.google.de/maps/?q=Dresden+Hauptbahnhof)
@@ -67,25 +69,26 @@ require 'candl'
 
 In the view you want the calendar to appear initialize a configuration hash like so:
 ```slim
-- config = { \
-    calendar: { \
-      google_calendar_api_host_base_path: "https://www.googleapis.com/calendar/v3/calendars/", \
-      calendar_id: "schau-hnh%40web.de", \
-      api_key: "AIzaSyB5F1X5hBi8vPsmt1itZTpMluUAjytf6hI" \
-    }, \
-    agenda: { \
-      display_day_count: 14, \
-      days_shift_coefficient: 7 \
-    }, \
-    month: { \
-      summary_teaser_length_in_characters: 42, \
-      delta_start_of_weekday_from_sunday: 1 \
-    }, \
-    general: { \
-      maps_query_host: "https://www.google.de/maps", \
-      maps_query_parameter: "q", \
-      cache_update_interval_in_s: 7200 \
-    } \
+ruby:
+  config = {
+    calendar: {
+      google_calendar_api_host_base_path: "https://www.googleapis.com/calendar/v3/calendars/",
+      calendar_id: "schau-hnh%40web.de",
+      api_key: "AIzaSyB5F1X5hBi8vPsmt1itZTpMluUAjytf6hI"
+    },
+    agenda: {
+      display_day_count: 14,
+      days_shift_coefficient: 7
+    },
+    month: {
+      summary_teaser_length_in_characters: 42,
+      delta_start_of_weekday_from_sunday: 1
+    },
+    general: {
+      maps_query_host: "https://www.google.de/maps",
+      maps_query_parameter: "q",
+      cache_update_interval_in_s: 7200
+    }
   }
 ```
 In this example done in a view that uses .slim instead of .erb but in the end config is just a ruby hash that needs to have the right key's and sensible values for them.

data/app/views/candl/calendar/_agenda.slim

@@ -1,47 +1,47 @@
 
-- unless calendar_agenda.agenda_grouped_events.empty?
-  .agenda
-    - calendar_agenda.agenda_grouped_events.keys.sort.each do |date|
-      .row_head class=Candl::AgendaModel.emphasize_date(date, Date.today, 'today', 'not_today') = l(date, format: '%A, %e. %B %Y')
-      - calendar_agenda.agenda_grouped_events[date].each do |event|
+.agenda
+  - calendar_agenda.agenda_grouped_events.keys.sort.each do |date|
+    .row_head class=Candl::AgendaModel.emphasize_date(date, Date.today, 'today', 'not_today') = l(date, format: '%A, %e. %B %Y')
+    - calendar_agenda.agenda_grouped_events[date].each do |event|
 
-        .event_shell
-          .open_more data-id=""
-            .event
-              - if event.dtstart.instance_of?(DateTime)
-                span.time = event.dtstart.localtime.strftime('%k:%M')
-              - else
-                span.time ▶
-              span.flex_wrap_it.breakable.summary{ title = Candl::AgendaModel.summary_title(event) } == event.summary.to_s.force_encoding("UTF-8")
-              i class="material-icons auto_margin_left" arrow_drop_down
+      .event_shell
+        .open_more data-id=""
+          .event
+            - if event.dtstart.instance_of?(DateTime)
+              span.time = event.dtstart.localtime.strftime('%k:%M')
+            - else
+              span.time ▶
+            span.flex_wrap_it.breakable.summary{ title = Candl::AgendaModel.summary_title(event) } == event.summary.to_s.force_encoding("UTF-8")
+            i class="material-icons auto_margin_left" arrow_drop_down
 
-          .details style="display: none;"
-            .timeframe title="Zeitraum"
-              .text
-                span.icon
-                  i class="material-icons" date_range
-                span.content
-                  - if event.dtstart.instance_of?(DateTime)
-                    = l(event.dtstart.localtime, format: :short) + " - " + l(event.dtend.localtime, format: :hnh_short)
+        .details style="display: none;"
+          .timeframe title="Zeitraum"
+            .text
+              span.icon
+                i class="material-icons" date_range
+              span.content
+                - if event.dtstart.instance_of?(DateTime)
+                  - if event.dtstart.to_date != event.dtend.to_date 
+                    = l(event.dtstart.localtime, format: :short) + " - " + l(event.dtend.localtime, format: :short)
                   - else
-                    = l(event.dtstart, format: :short) + " - " + l((event.dtend - 1.day), format: :short)
-
-            - if !event.location.to_s.strip.empty?
-              .location title="Adresse"
-                .text
-                  span.icon
-                    i class="material-icons" location_on
-                  span.content
-                    a href=calendar_agenda.address_to_maps_path(event.location.to_s) target="_blank"
-                      .flex_wrap_it.breakable = event.location.to_s.force_encoding("UTF-8")
+                    = l(event.dtstart.localtime, format: :short) + " - " + l(event.dtend.localtime, format: :hnh_short)
+                - else
+                  = l(event.dtstart, format: :short) + " - " + l((event.dtend - 1.day), format: :short)
 
-            - if !event.description.to_s.strip.empty?
-            .description title="Weitere Beschreibung"
+          - if !event.location.to_s.strip.empty?
+            .location title="Adresse"
               .text
                 span.icon
-                  i class="material-icons" description
+                  i class="material-icons" location_on
                 span.content
-                  .flex_wrap_it.breakable = auto_link(event.description.to_s.force_encoding("UTF-8"), html: { target: '_blank' })
+                  a href=calendar_agenda.address_to_maps_path(event.location.to_s) target="_blank"
+                    .flex_wrap_it.breakable = event.location.to_s.force_encoding("UTF-8")
+
+          - if !event.description.to_s.strip.empty?
+          .description title="Weitere Beschreibung"
+            .text
+              span.icon
+                i class="material-icons" description
+              span.content
+                .flex_wrap_it.breakable = auto_link(event.description.to_s.force_encoding("UTF-8"), html: { target: '_blank' })
 
-- else
-  p No upcoming events in the next week.

data/app/views/candl/calendar/_frame.slim

@@ -2,31 +2,16 @@
 - is_month = params[:v] != 'a'
 - current_shift_factor = params[:s] || 0
 - date_today = Date.today
-- update_interval = config[:general][:cache_update_interval_in_s]
+- update_interval = config[:general][:cache_update_interval_in_s] ||= 2.hours
 
 - if is_month
-  - begin
-    - month = Rails.cache.fetch("#month/#{current_shift_factor}/#{date_today}", expires_in: update_interval) do
-      - Candl::MonthModel.new(config, current_shift_factor, date_today)
-  - rescue => exception
-    - events_error_free = false
-    - puts "\033[31mERROR - GOT EXCEPTION:\033[0m"
-    - puts exception
-    / Maybe there is a beter way to signal the exception?
+  - model = Rails.cache.fetch("#month/#{current_shift_factor}/#{date_today}", expires_in: update_interval) do
+    - Candl::MonthModel.new(config, current_shift_factor, date_today)
 - else
-  - begin
-    - agenda = Rails.cache.fetch("#agenda/#{current_shift_factor}/#{date_today}", expires_in: update_interval) do
-      - Candl::AgendaModel.new(config, current_shift_factor, date_today)
-  - rescue => exception
-    - events_error_free = false
-    - puts "\033[31mERROR - GOT EXCEPTION:\033[0m"
-    - puts exception
-    / Maybe there is a beter way to signal the exception?
-
-- if events_error_free
-  - model = (is_month ? month : agenda)
-
-
+  - model = Rails.cache.fetch("#agenda/#{current_shift_factor}/#{date_today}", expires_in: update_interval) do
+    - Candl::AgendaModel.new(config, current_shift_factor, date_today)
+  
+- if model.initialization_successful
   .popover_backdrop.init_display_none
 
   div
@@ -55,5 +40,4 @@
         = render partial: "candl/calendar/agenda", locals: { calendar_agenda: model }
 
 - else
-  .error_message Der Kalender kann wegen einer kurzzeitigen technischen Störung gerade nicht angezeigt werden. Bitte versuchen Sie es in einer Weile noch einmal.
-
+  .error_message 'error.no_events_loaded'

data/app/views/candl/calendar/_month.slim

@@ -1,97 +1,46 @@
-- unless (calendar_month.grouped_events.empty? && calendar_month.grouped_multiday_events.empty?)
-  table.table.table-bordered.month_view
-    thead
-      colgroup span="7"
-      tr
-        th colspan="7" scope="colgroup" = l((calendar_month.view_dates.select{ |date| date.day == 14 }).first, format: '%B %Y')
-      tr
-        - calendar_month.weekday_dates.each do |date|
-          th.weekday_name_header scope="col" = l(date, format: '%A')
-
-    tbody
-      - Candl::MonthModel.weeks_in_months_view_dates(calendar_month.view_dates).times do |row|
-        tr.day_row
-          - 7.times do |collumn|
+table.table.table-bordered.month_view
+  thead
+    colgroup span="7"
+    tr
+      th colspan="7" scope="colgroup" = l((calendar_month.view_dates.select{ |date| date.day == 14 }).first, format: '%B %Y')
+    tr
+      - calendar_month.weekday_dates.each do |date|
+        th.weekday_name_header scope="col" = l(date, format: '%A')
+
+  tbody
+    - Candl::MonthModel.weeks_in_months_view_dates(calendar_month.view_dates).times do |row|
+      tr.day_row
+        - 7.times do |collumn|
+          - current_day = calendar_month.view_dates[7 * row + collumn]
+          td class=Candl::MonthModel.emphasize_date(current_day, Date.today, 'bg-info', 'bg-default')
+            - if current_day.day == 1
+              .day_head = current_day.day.to_s + '. ' + l(current_day, format: '%b.')
+            - else
+              .day_head = current_day.day.to_s
+
+      - weekly_multiday_event_heap = calendar_month.grouped_multiday_events[row]
+
+      - until weekly_multiday_event_heap.empty?
+        tr
+          - collumn = 0
+          - while collumn < 7 do
             - current_day = calendar_month.view_dates[7 * row + collumn]
-            td class=Candl::MonthModel.emphasize_date(current_day, Date.today, 'bg-info', 'bg-default')
-              - if current_day.day == 1
-                .day_head = current_day.day.to_s + '. ' + l(current_day, format: '%b.')
-              - else
-                .day_head = current_day.day.to_s
+            - current_event = Candl::MonthModel.find_best_fit_for_day(calendar_month.view_dates[7 * row], current_day, weekly_multiday_event_heap)
+            - if current_event
+              - weekly_multiday_event_heap.delete_if{ |event| event.uid == current_event.uid }
 
-        - weekly_multiday_event_heap = calendar_month.grouped_multiday_events[row]
+              - current_event_length_within_current_week = [(calendar_month.view_dates[7 * row + 6] + 1.day), current_event.dtend].min.to_date - current_day.to_date
 
-        - until weekly_multiday_event_heap.empty?
-          tr
-            - collumn = 0
-            - while collumn < 7 do
-              - current_day = calendar_month.view_dates[7 * row + collumn]
-              - current_event = Candl::MonthModel.find_best_fit_for_day(calendar_month.view_dates[7 * row], current_day, weekly_multiday_event_heap)
-              - if current_event
-                - weekly_multiday_event_heap.delete_if{ |event| event.uid == current_event.uid }
+              - collumn += current_event_length_within_current_week - 1
 
-                - current_event_length_within_current_week = [(calendar_month.view_dates[7 * row + 6] + 1.day), current_event.dtend].min - current_day
+              - if current_event_length_within_current_week > 0
+                td.small_padding colspan=current_event_length_within_current_week
+                  .multiday_event.onclick_open_backdrop class=Candl::MonthModel.multiday_event_cutoff(current_event.dtstart < current_day, current_event.dtend > (calendar_month.view_dates[7 * row + 6] + 1.day), 'multiday_event_leftcut', 'multiday_event_bothcut', 'multiday_event_rightcut')
 
-                - collumn += current_event_length_within_current_week - 1
-
-                - if current_event_length_within_current_week > 0
-                  td.small_padding colspan=current_event_length_within_current_week
-                    .multiday_event.onclick_open_backdrop class=Candl::MonthModel.multiday_event_cutoff(current_event.dtstart < current_day, current_event.dtend > (calendar_month.view_dates[7 * row + 6] + 1.day), 'multiday_event_leftcut', 'multiday_event_bothcut', 'multiday_event_rightcut')
-
-                      .snowflake_popover[data-placement="bottom" data-toggle="popover" data-container="body" type="button" data-html="true" href="#"]
-
-                        div
-                          span.summary.breakable{ title = Candl::MonthModel.summary_title(current_event) } == current_event.summary.to_s.force_encoding("UTF-8").truncate(calendar_month.summary_teaser_length().to_i, seperator: ' ')
-
-                        .popover_content.hide
-                          .close_span
-                            .close title='Schließen'
-                              i.material-icons close
-
-                          .summary title='Zusammenfassung'
-                            .text
-                              i.material-icons.icon_spacing subject
-                              .breakable = current_event.summary.to_s.force_encoding('UTF-8')
-                          hr
-
-                          .from_to title='Zeitraum'
-                            .text
-                              i.material-icons.icon_spacing date_range
-                              = l(current_event.dtstart, format: :short) + " - " + l((current_event.dtend - 1.day), format: :short)
-                          hr
-
-                          - if !current_event.location.to_s.strip.empty?
-                            .location title='Adresse'
-                              .text
-                                i.material-icons.icon_spacing location_on
-                                a href=calendar_month.address_to_maps_path(current_event.location.to_s).force_encoding('UTF-8') target='_blank'
-                                  .flex_wrap_it.breakable = current_event.location.to_s.force_encoding('UTF-8')
-                            hr
-
-                          - if !current_event.description.to_s.strip.empty?
-                            .description title='Weitere Beschreibung'
-                              .text
-                                i.material-icons.icon_spacing description
-                                .flex_wrap_it.breakable = auto_link(current_event.description.to_s.force_encoding("UTF-8"), html: { target: '_blank' })
-              - else
-                td
-
-              - collumn += 1
-
-        tr.events_row
-          - 7.times do |collumn|
-            - current_day = calendar_month.view_dates[7 * row + collumn]
-            td class=Candl::MonthModel.emphasize_date(current_day, Date.today, 'bg-info', 'bg-default')
-
-              - if calendar_month.grouped_events[current_day]
-                - calendar_month.grouped_events[current_day].sort_by{ |event| event.dtstart.localtime }.each do |event|
-
-                  .event.onclick_open_backdrop
                     .snowflake_popover[data-placement="bottom" data-toggle="popover" data-container="body" type="button" data-html="true" href="#"]
 
                       div
-                        span.time = event.dtstart.localtime.strftime('%k:%M')
-                        span.summary.breakable{ title = Candl::MonthModel.summary_title(event) } == event.summary.to_s.force_encoding("UTF-8").truncate(calendar_month.summary_teaser_length.to_i, seperator: ' ')
+                        span.summary.breakable{ title = Candl::MonthModel.summary_title(current_event) } == current_event.summary.to_s.force_encoding("UTF-8").truncate(calendar_month.summary_teaser_length().to_i, seperator: ' ')
 
                       .popover_content.hide
                         .close_span
@@ -101,29 +50,77 @@
                         .summary title='Zusammenfassung'
                           .text
                             i.material-icons.icon_spacing subject
-                            .breakable = event.summary.to_s.force_encoding('UTF-8')
+                            .breakable = current_event.summary.to_s.force_encoding('UTF-8')
                         hr
 
                         .from_to title='Zeitraum'
                           .text
                             i.material-icons.icon_spacing date_range
-                            = l(event.dtstart.localtime, format: :short) + " - " + l(event.dtend.localtime, format: :hnh_short)
+                            = l(current_event.dtstart, format: :short) + " - " + l((current_event.dtend - 1.day), format: :short)
+                        hr
 
-                        - if !event.location.to_s.strip.empty?
-                          hr
+                        - if !current_event.location.to_s.strip.empty?
                           .location title='Adresse'
                             .text
-                              .icon_spacing
-                                i.material-icons location_on
-                              a href=calendar_month.address_to_maps_path(event.location.to_s).force_encoding('UTF-8') target='_blank'
-                                .flex_wrap_it.breakable = event.location.to_s.force_encoding('UTF-8')
-
-                        - if !event.description.to_s.strip.empty?
+                              i.material-icons.icon_spacing location_on
+                              a href=calendar_month.address_to_maps_path(current_event.location.to_s).force_encoding('UTF-8') target='_blank'
+                                .flex_wrap_it.breakable = current_event.location.to_s.force_encoding('UTF-8')
                           hr
+
+                        - if !current_event.description.to_s.strip.empty?
                           .description title='Weitere Beschreibung'
                             .text
                               i.material-icons.icon_spacing description
-                              .flex_wrap_it.breakable = auto_link(event.description.to_s.force_encoding("UTF-8"), html: { target: '_blank' })
+                              .flex_wrap_it.breakable = auto_link(current_event.description.to_s.force_encoding("UTF-8"), html: { target: '_blank' })
+            - else
+              td
+
+            - collumn += 1
+
+      tr.events_row
+        - 7.times do |collumn|
+          - current_day = calendar_month.view_dates[7 * row + collumn]
+          td class=Candl::MonthModel.emphasize_date(current_day, Date.today, 'bg-info', 'bg-default')
+
+            - if calendar_month.grouped_events[current_day]
+              - calendar_month.grouped_events[current_day].sort_by{ |event| event.dtstart.localtime }.each do |event|
+
+                .event.onclick_open_backdrop
+                  .snowflake_popover[data-placement="bottom" data-toggle="popover" data-container="body" type="button" data-html="true" href="#"]
+
+                    div
+                      span.time = event.dtstart.localtime.strftime('%k:%M')
+                      span.summary.breakable{ title = Candl::MonthModel.summary_title(event) } == event.summary.to_s.force_encoding("UTF-8").truncate(calendar_month.summary_teaser_length.to_i, seperator: ' ')
+
+                    .popover_content.hide
+                      .close_span
+                        .close title='Schließen'
+                          i.material-icons close
+
+                      .summary title='Zusammenfassung'
+                        .text
+                          i.material-icons.icon_spacing subject
+                          .breakable = event.summary.to_s.force_encoding('UTF-8')
+                      hr
+
+                      .from_to title='Zeitraum'
+                        .text
+                          i.material-icons.icon_spacing date_range
+                          = l(event.dtstart.localtime, format: :short) + " - " + l(event.dtend.localtime, format: :hnh_short)
+
+                      - if !event.location.to_s.strip.empty?
+                        hr
+                        .location title='Adresse'
+                          .text
+                            .icon_spacing
+                              i.material-icons location_on
+                            a href=calendar_month.address_to_maps_path(event.location.to_s).force_encoding('UTF-8') target='_blank'
+                              .flex_wrap_it.breakable = event.location.to_s.force_encoding('UTF-8')
+
+                      - if !event.description.to_s.strip.empty?
+                        hr
+                        .description title='Weitere Beschreibung'
+                          .text
+                            i.material-icons.icon_spacing description
+                            .flex_wrap_it.breakable = auto_link(event.description.to_s.force_encoding("UTF-8"), html: { target: '_blank' })
 
-- else
-  p No upcoming events in the next week.

data/config/locales/de.yml

@@ -1,4 +1,7 @@
 de:  
   time:
     formats:
-      hnh_short: "%R Uhr"
+      hnh_short: "%R Uhr"
+      
+  error:
+    no_events_loaded: "Fehler aufgetreten. Bitte versuchen sie es später noch einmal."

data/config/locales/en.yml

@@ -1,4 +1,7 @@
 en:  
   time:
     formats:
-      hnh_short: "%l:%M %P"
+      hnh_short: "%l:%M %P"
+
+  error:
+    no_events_loaded: "An error occurred. Please try again later."

data/lib/candl/agenda_model.rb

@@ -1,6 +1,8 @@
 module Candl
   class AgendaModel
     # Attributes one needs to access from the "outside"
+    attr_reader :initialization_successful
+
     attr_reader :display_day_count
     attr_reader :days_shift_coefficient
 
@@ -28,20 +30,26 @@ module Candl
     #   } \
     # }
     def initialize(config, current_shift_factor, date_today = Date.today)
-      self.google_calendar_base_path = config[:calendar][:google_calendar_api_host_base_path]
+      self.google_calendar_base_path = config[:calendar][:google_calendar_api_host_base_path] ||= "https://www.googleapis.com/calendar/v3/calendars/"
       self.calendar_id = config[:calendar][:calendar_id]
       self.api_key = config[:calendar][:api_key]
 
-      self.display_day_count = config[:agenda][:display_day_count]
-      self.days_shift_coefficient = config[:agenda][:days_shift_coefficient]
+      self.display_day_count = config[:agenda][:display_day_count] ||= 14
+      self.days_shift_coefficient = config[:agenda][:days_shift_coefficient] ||= 7
 
-      self.maps_query_host = config[:general][:maps_query_host]
-      self.maps_query_parameter = config[:general][:maps_query_parameter]
+      self.maps_query_host = config[:general][:maps_query_host] ||= "https://www.google.de/maps"
+      self.maps_query_parameter = config[:general][:maps_query_parameter] ||= "q"
 
       from = current_start_date(current_shift_factor, date_today)
       to = current_end_date(current_shift_factor, date_today)
 
-      events = agenda_events(from, to)
+      self.initialization_successful = true
+      begin
+        events = agenda_events(from, to)
+      rescue => exception
+        self.initialization_successful = false
+        logger.error "ERROR: #{exception}"
+      end
 
       self.agenda_grouped_events = get_days_grouped_events(events)
     end
@@ -101,8 +109,6 @@ module Candl
 
     # build a google maps path from the  adress details
     def address_to_maps_path(address)
-      # URI::HTTP.build( host: maps_query_host, query: { q: address.force_encoding("UTF-8").gsub(" ", "+") }.to_query).to_s
-
       ActionDispatch::Http::URL.path_for path: maps_query_host, params: Hash[maps_query_parameter.to_s, address.force_encoding("UTF-8").gsub(" ", "+")]
     end
 
@@ -118,6 +124,8 @@ module Candl
       events.group_by { |event| event.dtstart.to_date }
     end
 
+    attr_writer :initialization_successful
+
     attr_writer :display_day_count
     attr_writer :days_shift_coefficient
 

data/lib/candl/event_loader_model.rb

@@ -44,7 +44,6 @@ module Candl
       if requested_events["items"] != nil
         restructured_events = requested_events["items"].map{ |e| e["start"]["dateTime"] != nil ? Event.new(DateTime.parse(e["start"]["dateTime"]), DateTime.parse(e["end"]["dateTime"]), e["summary"], e["description"], e["location"], e["id"]) : Event.new(Date.parse(e["start"]["date"]), Date.parse(e["end"]["date"]), e["summary"], e["description"], e["location"], e["id"]) }
       else
-        # raise Exception.new("Calendar event request failed and responded with:\n  #{requested_events}")
         raise "Calendar event request failed and responded with:\n  #{requested_events}"
       end
 
@@ -55,11 +54,11 @@ module Candl
     def self.spread_multiday_events(events, from, to)
       unspreaded_events = events.select{ |event| (event.dtend - event.dtstart).to_i > 0 }
 
-      unspreaded_events.map do |event|
+      spreaded_events = unspreaded_events.map do |event|
         ([from, (event.dtstart + 1.day)].max .. [(event.dtend - 1.day), to].min).to_a.map do |date|
           Event.new.tap do |e|
-            e.dtstart = date
-            e.dtend = event.dtend
+            e.dtstart = date.to_date
+            e.dtend = event.dtend.to_date
             e.summary = event.summary
             e.location = event.location
             e.description = event.description

data/lib/candl/month_model.rb

@@ -1,6 +1,8 @@
 module Candl
   class MonthModel
     # Attributes one needs to access from the "outside"
+    attr_reader :initialization_successful
+
     attr_reader :delta_start_of_weekday_from_sunday
     attr_reader :summary_teaser_length
 
@@ -30,25 +32,30 @@ module Candl
     #   } \
     # }
     def initialize(config, current_shift_factor, date_today = Date.today)
-      self.google_calendar_base_path = config[:calendar][:google_calendar_api_host_base_path]
+      self.google_calendar_base_path = config[:calendar][:google_calendar_api_host_base_path] ||= "https://www.googleapis.com/calendar/v3/calendars/"
       self.calendar_id = config[:calendar][:calendar_id]
       self.api_key = config[:calendar][:api_key]
 
-      self.summary_teaser_length = config[:month][:summary_teaser_length_in_characters]
-      self.delta_start_of_weekday_from_sunday = config[:month][:delta_start_of_weekday_from_sunday]
+      self.summary_teaser_length = config[:month][:summary_teaser_length_in_characters] ||= 42
+      self.delta_start_of_weekday_from_sunday = config[:month][:delta_start_of_weekday_from_sunday] ||= 1
 
-      self.days_shift_coefficient = config[:agenda][:days_shift_coefficient]
+      self.days_shift_coefficient = config[:agenda][:days_shift_coefficient] ||= 7
 
-      self.maps_query_host = config[:general][:maps_query_host]
-      self.maps_query_parameter = config[:general][:maps_query_parameter]
-      self.cache_update_interval_in_ms = config[:general][:cache_update_interval_in_ms]
+      self.maps_query_host = config[:general][:maps_query_host] ||= "https://www.google.de/maps"
+      self.maps_query_parameter = config[:general][:maps_query_parameter] ||= "q"
 
       date_month_start = MonthModel.current_month_start(current_shift_factor, date_today)
       date_month_end = MonthModel.current_month_end(current_shift_factor, date_today)
 
       self.view_dates = generate_months_view_dates(date_month_start, date_month_end)
 
-      events = get_month_events(view_dates.first, view_dates.last)
+      self.initialization_successful = true
+      begin
+        events = get_month_events(view_dates.first, view_dates.last)
+      rescue => exception
+        self.initialization_successful = false
+        logger.error "ERROR: #{exception}"
+      end
 
       self.grouped_events = MonthModel::group_events(events, view_dates.first, view_dates.last)
       self.grouped_multiday_events = MonthModel::group_multiday_events(events, view_dates)
@@ -119,7 +126,6 @@ module Candl
 
     # build a google maps path from the adress details
     def address_to_maps_path(address)
-      # URI::HTTP.build( host: maps_query_host, query: { maps_query_parameter: address.force_encoding("UTF-8").gsub(" ", "+") }.to_query).to_s
       ActionDispatch::Http::URL.path_for path: maps_query_host, params: Hash[maps_query_parameter.to_s, address.force_encoding("UTF-8").gsub(" ", "+")]
     end
 
@@ -175,13 +181,12 @@ module Candl
 
     # gets events within a day grouped by day
     def self.group_events(events, from, to)
-      # events = month_events(from, to)
-      events.select { |event| event.dtstart.instance_of?(DateTime) }.sort_by{ |event| event.dtstart.localtime }.group_by { |event| event.dtstart.to_date }
+      events.select{ |event| (event.dtstart.to_date == event.dtend.to_date) }.sort_by{ |event| event.dtstart.localtime }.group_by{ |event| event.dtstart.to_date }
     end
 
     # gets events that are multiple day's long grouped by the week
     def self.group_multiday_events(events, view_dates)
-      multiday_events = events.select { |event| event.dtstart.instance_of?(Date) }
+      multiday_events = events.select { |event| event.dtstart.to_date != event.dtend.to_date }
 
       grouped_multiday_events = []
 
@@ -197,6 +202,8 @@ module Candl
       grouped_multiday_events
     end
 
+    attr_writer :initialization_successful
+
     attr_writer :delta_start_of_weekday_from_sunday
     attr_writer :summary_teaser_length
 
@@ -210,7 +217,6 @@ module Candl
     attr_accessor :google_calendar_base_path
     attr_accessor :maps_query_host
     attr_accessor :maps_query_parameter
-    attr_accessor :cache_update_interval_in_ms
 
     attr_accessor :days_shift_coefficient
 

data/lib/candl/version.rb

@@ -1,3 +1,3 @@
 module Candl
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end