add_to_calendar_links 0.3.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db13d2739854e9084dc5f20de1ba937af2760ca5722e99cd92b83ae59adb79da
-  data.tar.gz: bdd83bb55237b2de0346e78a7c75752f02f4ea89ef522d5b4dc95e3b5f8f177c
+  metadata.gz: ff19e9aa3a6c509b5469cd27ff8f0b01cc82f07141cd0ed67e34f5eb43bfa65e
+  data.tar.gz: 94432081f0b675201b9aada3180aa03b4ddd28b6f22a74712510686c6c3e9faf
 SHA512:
-  metadata.gz: 1df0b7a7307a37cb42614d6cc2ce9fbc8b8a42fae7c11abe995df5625a9b0622f1aa14ada6a983c7e0cafa5f870b368893cc1dbf15b6ce142692a0bda105c04d
-  data.tar.gz: bfe123ceec2622a0b18c0020d65ac1b060614795f35bf9e8d51244e5a2730cda39a127f4f3ec6ec991e3a3670bc54d67ee73e3fa035c00207e7073ac97619ce9
+  metadata.gz: da4489eeed48856d3ecb2a34bef48d25eb31cedb38096f8e5bc77337099401729a054402f63456163ac42641b73a53290f13329241b63fe3737121632df88450
+  data.tar.gz: 48777ad3226a53f48e5bfc46d9e81df16d82f1dd40600dac72313a9d48a7198ec647ff2ada13a4502dac022a5c1c9e0314d7134182bbd8bf9c206a52a0a02908

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in add_to_calendar.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    add_to_calendar_links (0.3.1)
+    add_to_calendar_links (0.3.5)
       tzinfo (>= 1.1, < 3)
       tzinfo-data (~> 1.2021)
 

data/lib/add_to_calendar_links.rb

@@ -7,14 +7,13 @@ include ERB::Util
 require 'tzinfo'
 require 'date'
 require 'uri'
-# require 'pry'
 
 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
-    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)
+    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)
       @start_datetime = start_datetime
       @end_datetime = end_datetime
       @title = title
@@ -25,6 +24,8 @@ module AddToCalendarLinks
       @add_url_to_description = add_url_to_description
       @organizer = URI.parse(organizer) if organizer
       @strip_html = strip_html
+      @sequence = sequence
+      @last_modified = last_modified
       validate_attributes
     end
   
@@ -58,25 +59,28 @@ module AddToCalendarLinks
 
     def yahoo_url
       # Eg. https://calendar.yahoo.com/?v=60&view=d&type=20&title=Holly%27s%208th%20Birthday!&st=20200615T170000Z&dur=0100&desc=Join%20us%20to%20celebrate%20with%20lots%20of%20games%20and%20cake!&in_loc=7%20Apartments,%20London
-      calendar_url = "https://calendar.yahoo.com/?v=60&view=d&type=20"
+      calendar_url = "https://calendar.yahoo.com/?v=60&VIEW=d&TYPE=20"
       params = {}
-      params[:title] = url_encode(title)
-      params[:st] = utc_datetime(start_datetime)
+      params[:TITLE] = url_encode(title)
+      params[:ST] = utc_datetime(start_datetime)
       if end_datetime
+        # params[:ET] = utc_datetime(end_datetime)
         seconds = duration_seconds(start_datetime, end_datetime)
-        params[:dur] = seconds_to_hours_minutes(seconds)
+        params[:DUR] = seconds_to_hours_minutes(seconds)
       else
-        params[:dur] = "0100" 
+        # params[:ET] = utc_datetime(start_datetime + 60*60)
+        params[:DUR] = "0100" 
       end
-      params[:desc] = url_encode(description) if description
+      params[:DESC] = url_encode(strip_html_tags(description)).truncate(3000) if description
+
       if add_url_to_description && url
-        if params[:desc]
-          params[:desc] << url_encode("\n\n#{url}")
+        if params[:DESC]
+          params[:DESC] << url_encode("\n\n#{url}")
         else
-          params[:desc] = url_encode(url)
+          params[:DESC] = url_encode(url)
         end
       end
-      params[:in_loc] = url_encode(location) if location
+      params[:IN_LOC] = url_encode(location) if location
 
       params.each do |key, value|
         calendar_url << "&#{key}=#{value}"
@@ -95,10 +99,48 @@ module AddToCalendarLinks
       microsoft("outlook.com")
     end
 
+    def ical_file
+      calendar_url = "BEGIN:VCALENDAR\nVERSION:2.0\nBEGIN:VEVENT"
+      
+      params = {}
+      params[:DTSTART] = utc_datetime(start_datetime)
+      if end_datetime
+        params[:DTEND] = utc_datetime(end_datetime)
+      else
+        params[:DTEND] = utc_datetime(start_datetime + 60*60) # 1 hour later
+      end
+      params[:SUMMARY] = strip_html_tags(title) #ical doesnt support html so remove all markup. Optional for other formats
+      params[:URL] = url if url
+      params[:DESCRIPTION] = strip_html_tags(description).strip if description
+      if add_url_to_description && url
+        if params[:DESCRIPTION]
+          params[:DESCRIPTION] << "\\n\\n#{url}"
+        else
+          params[:DESCRIPTION] = url
+        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
+      params[:ORGANIZER] = organizer if organizer
+      params[:SEQUENCE] = sequence if sequence
+      params[:LASTMODIFIED] = format_date_google(last_modified) if last_modified
+      params[:METHOD] = "REQUEST"
+
+      params.each do |key, value|
+        calendar_url << "\n#{key}:#{value}"
+      end
+
+      calendar_url << "\nEND:VEVENT\nEND:VCALENDAR"
+
+      return calendar_url
+    end
+
     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"
+
       params = {}
       params[:DTSTART] = utc_datetime(start_datetime)
       if end_datetime
@@ -108,7 +150,7 @@ module AddToCalendarLinks
       end
       params[:SUMMARY] = url_encode_ical(title, strip_html: true) #ical doesnt support html so remove all markup. Optional for other formats
       params[:URL] = url_encode(url) if url
-      params[:DESCRIPTION] = url_encode_ical(description, strip_html: true) if description
+      params[:DESCRIPTION] = url_encode_ical(strip_html_tags(description, line_break_seperator: "\n")) if description
       if add_url_to_description && url
         if params[:DESCRIPTION]
           params[:DESCRIPTION] << "\\n\\n#{url_encode(url)}"
@@ -119,7 +161,10 @@ module AddToCalendarLinks
       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
-      params[:organizer] = organizer if organizer
+      params[:ORGANIZER] = organizer if organizer
+      params[:SEQUENCE] = sequence if sequence
+      params[:LASTMODIFIED] = format_date_google(last_modified) if last_modified
+      params[:METHOD] = "REQUEST"
 
       new_line = "%0A"
       params.each do |key, value|
@@ -254,11 +299,10 @@ module AddToCalendarLinks
       def url_encode_ical(s, strip_html: @strip_html)
         # per https://tools.ietf.org/html/rfc5545#section-3.3.11
         string = s.dup # don't modify original input
-
-        string = strip_html_tags(string) if strip_html
+        if strip_html
+          string = strip_html_tags(string)
+        end
         string.gsub!("\\", "\\\\\\") # \ >> \\     --yes, really: https://stackoverflow.com/questions/6209480/how-to-replace-backslash-with-double-backslash
-        string.gsub!(",", "\\,")
-        string.gsub!(";", "\\;")
         string.gsub!("\r\n", "\n") # so can handle all newlines the same
         string.split("\n").map { |e|
           if e.empty?
@@ -266,11 +310,19 @@ module AddToCalendarLinks
           else
             url_encode(e)
           end
-        }.join("\\n")
+        }.compact.join("\\n").gsub(/(\\n){2,}/, "\\n\\n").strip
       end
 
-      def strip_html_tags(description)
-        description.dup.gsub(/<\/?[^>]*>/, "")
+      def strip_html_tags(description, line_break_seperator: "\\n")
+        string = description.dup
+        string.gsub!("<br>", line_break_seperator)
+        string.gsub!("<p>", line_break_seperator)
+        string.gsub!("</p>", line_break_seperator)
+        string.gsub!("&amp;", "and")
+        string.gsub!("&nbsp;", " ")
+        string.gsub!(/<\/?[^>]*>/, "")
+        string.gsub!(/(\\n){2,}/, "\\n\\n")
+        string.strip
       end
   end
 end

data/lib/add_to_calendar_links/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: add_to_calendar_links
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: '0.4'
 platform: ruby
 authors:
 - Jared Turner
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo