ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-31 23:10:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #77 from cblanc/develop

Browse source 
Please forgive me
This commit is contained in:
Chris Blanchard 2016-02-07 20:16:19 +00:00
commit 0301d1fa24
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/services/google_calendar.rb
View file

@ -39,7 +39,7 @@ end
class GoogleCalendar class GoogleCalendar
class Request class Request
BASE_URL = "https://www.googleapis.com/calendar/v3/calendars" BASE_URL = "https://www.googleapis.com/"
EVENTS_ENDPOINT = "events" EVENTS_ENDPOINT = "events"
def self.events_list(id, timezone_offset) def self.events_list(id, timezone_offset)
@ -61,7 +61,12 @@ class GoogleCalendar
def get_data def get_data
Rails.cache.fetch(cache_key, expires_in: 5.minutes) do Rails.cache.fetch(cache_key, expires_in: 5.minutes) do
Faraday.get(request_url) if Rails.env.development?
conn = Faraday.new(BASE_URL, ssl: {verify: false})
else
conn = Faraday.new(BASE_URL)
end
conn.get(request_url)
end end
end end
@ -76,7 +81,7 @@ class GoogleCalendar
#that is longer ago then 7 days. #that is longer ago then 7 days.
#Alternative: maxResults=2500 #Alternative: maxResults=2500
time_min = (Time.now - 7.days).utc.iso8601 time_min = (Time.now - 7.days).utc.iso8601
"#{BASE_URL}/#{@id}/#{@endpoint}/?key=#{ENV['GOOGLE_API_KEY']}&timeMin=#{time_min}" "calendar/v3/calendars/#{@id}/#{@endpoint}/?key=#{ENV['GOOGLE_API_KEY']}&timeMin=#{time_min}"
end end
end end