add_to_calendar_links 0.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff19e9aa3a6c509b5469cd27ff8f0b01cc82f07141cd0ed67e34f5eb43bfa65e
-  data.tar.gz: 94432081f0b675201b9aada3180aa03b4ddd28b6f22a74712510686c6c3e9faf
+  metadata.gz: 423f11257d10d8dfee4255bc96b497c91c88a92f0fc2d6efeffb201954b806fb
+  data.tar.gz: 92879e7e0a0e9fdc37491ea9f08a8bcade115c13042e520a64b592f4909967b8
 SHA512:
-  metadata.gz: da4489eeed48856d3ecb2a34bef48d25eb31cedb38096f8e5bc77337099401729a054402f63456163ac42641b73a53290f13329241b63fe3737121632df88450
-  data.tar.gz: 48777ad3226a53f48e5bfc46d9e81df16d82f1dd40600dac72313a9d48a7198ec647ff2ada13a4502dac022a5c1c9e0314d7134182bbd8bf9c206a52a0a02908
+  metadata.gz: 39be1c44951c564f8f702f692b82599d842758640fd7d53b6fe7e5acbf0dca1a6bc3989908ad130971b3b108ec25d9fb45e93f836fae8bd03205ff6c61a33a08
+  data.tar.gz: 847d3f5cbc60407c601177c9d9beaf065f10d4e153f2df93dbb337f28dadb009d16d1543d887c0f81137da4ecb7c8e4f164fadfd7a4df40033a57bb7b5e41890

data/lib/add_to_calendar_links.rb

@@ -12,8 +12,8 @@ module AddToCalendarLinks
   class Error < StandardError; end
   
   class URLs
-    attr_accessor :start_datetime, :end_datetime, :title, :timezone, :location, :url, :description, :add_url_to_description, :organizer, :strip_html, :sequence, :last_modified
-    def initialize(start_datetime:, end_datetime: nil, title:, timezone:, location: nil, url: nil, description: nil, add_url_to_description: true, organizer: nil, strip_html: false, sequence: nil, last_modified: Time.now.utc)
+    attr_accessor :start_datetime, :end_datetime, :title, :timezone, :location, :url, :description, :add_url_to_description, :organizer, :strip_html, :sequence, :last_modified, :uid
+    def initialize(start_datetime:, end_datetime: nil, title:, timezone:, location: nil, url: nil, description: nil, add_url_to_description: true, organizer: nil, strip_html: false, sequence: nil, last_modified: Time.now.utc, uid:)
       @start_datetime = start_datetime
       @end_datetime = end_datetime
       @title = title
@@ -22,9 +22,10 @@ module AddToCalendarLinks
       @url = url
       @description = description
       @add_url_to_description = add_url_to_description
-      @organizer = URI.parse(organizer) if organizer
+      @organizer = organizer if organizer
       @strip_html = strip_html
       @sequence = sequence
+      @uid = uid
       @last_modified = last_modified
       validate_attributes
     end
@@ -100,7 +101,7 @@ module AddToCalendarLinks
     end
 
     def ical_file
-      calendar_url = "BEGIN:VCALENDAR\nVERSION:2.0\nBEGIN:VEVENT"
+      calendar_url = "BEGIN:VCALENDAR\nVERSION:2.0\nMETHOD:REQUEST\nBEGIN:VEVENT"
       
       params = {}
       params[:DTSTART] = utc_datetime(start_datetime)
@@ -120,15 +121,23 @@ module AddToCalendarLinks
         end
       end
       params[:LOCATION] = strip_html_tags(location) if location
-      params[:UID] = "-#{url}" if url
-      params[:UID] = "-#{utc_datetime(start_datetime)}-#{title}" unless params[:UID] # set uid based on starttime and title only if url is unavailable
+      if uid
+        params[:UID] = uid
+      else
+        params[:UID] = "-#{urlc}" if url
+        params[:UID] = "-#{utc_datetime(start_datetime)}-#{title}" unless params[:UID] # set uid based on starttime and title only if url is unavailable
+      end
       params[:ORGANIZER] = organizer if organizer
       params[:SEQUENCE] = sequence if sequence
-      params[:LASTMODIFIED] = format_date_google(last_modified) if last_modified
+      params["LAST-MODIFIED"] = format_date_google(last_modified) if last_modified
       params[:METHOD] = "REQUEST"
 
       params.each do |key, value|
-        calendar_url << "\n#{key}:#{value}"
+        if key == :ORGANIZER
+          calendar_url << "\n#{key}#{value}"
+        else
+          calendar_url << "\n#{key}:#{value}"
+        end
       end
 
       calendar_url << "\nEND:VEVENT\nEND:VCALENDAR"
@@ -139,7 +148,7 @@ module AddToCalendarLinks
     def ical_url
       # Downloads a *.ics file provided as a data-uri
       # Eg. "data:text/calendar;charset=utf8,BEGIN:VCALENDAR%0AVERSION:2.0%0ABEGIN:VEVENT%0ADTSTART:20200512T123000Z%0ADTEND:20200512T160000Z%0ASUMMARY:Holly%27s%208th%20Birthday%21%0AURL:https%3A%2F%2Fwww.example.com%2Fevent-details%0ADESCRIPTION:Come%20join%20us%20for%20lots%20of%20fun%20%26%20cake%21\\n\\nhttps%3A%2F%2Fwww.example.com%2Fevent-details%0ALOCATION:Flat%204%5C%2C%20The%20Edge%5C%2C%2038%20Smith-Dorrien%20St%5C%2C%20London%5C%2C%20N1%207GU%0AUID:-https%3A%2F%2Fwww.example.com%2Fevent-details%0AEND:VEVENT%0AEND:VCALENDAR"
-      calendar_url = "data:text/calendar;charset=utf8,BEGIN:VCALENDAR%0AVERSION:2.0%0ABEGIN:VEVENT"
+      calendar_url = "data:text/calendar;charset=utf8,BEGIN:VCALENDAR%0AVERSION:2.0%0AMETHOD:REQUEST%0ABEGIN:VEVENT"
 
       params = {}
       params[:DTSTART] = utc_datetime(start_datetime)
@@ -159,12 +168,15 @@ module AddToCalendarLinks
         end
       end
       params[:LOCATION] = url_encode_ical(location) if location
-      params[:UID] = "-#{url_encode(url)}" if url
-      params[:UID] = "-#{utc_datetime(start_datetime)}-#{url_encode_ical(title)}" unless params[:UID] # set uid based on starttime and title only if url is unavailable
+      if uid
+        params[:UID] = uid
+      else
+        params[:UID] = "-#{url_encode(url)}" if url
+        params[:UID] = "-#{utc_datetime(start_datetime)}-#{url_encode_ical(title)}" unless params[:UID] # set uid based on starttime and title only if url is unavailable
+      end
       params[:ORGANIZER] = organizer if organizer
       params[:SEQUENCE] = sequence if sequence
-      params[:LASTMODIFIED] = format_date_google(last_modified) if last_modified
-      params[:METHOD] = "REQUEST"
+      params["LAST-MODIFIED"] = format_date_google(last_modified) if last_modified
 
       new_line = "%0A"
       params.each do |key, value|

data/lib/add_to_calendar_links/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AddToCalendarLinks
-  VERSION = '0.4'
+  VERSION = '0.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: add_to_calendar_links
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.5
 platform: ruby
 authors:
 - Jared Turner