calendav 0.0.1 → 0.1.0

data/spec/acceptance/google_spec.rb

@@ -2,6 +2,7 @@
 
 require "googleauth"
 require "icalendar"
+require "securerandom"
 require "uri"
 
 RSpec.describe "Google" do
@@ -27,68 +28,208 @@ RSpec.describe "Google" do
   end
 
   it "determines the user's principal URL" do
-    expect(subject.principal_url)
-      .to eq("https://apidata.googleusercontent.com/caldav/v2/#{URI.encode_www_form_component(username)}/user")
+    expect(subject.principal_url).to eq_encoded_url(
+      "https://apidata.googleusercontent.com/caldav/v2/#{username}/user"
+    )
   end
 
   it "determines the user's calendar URL" do
-    expect(subject.calendars.home_url)
-      .to eq("https://apidata.googleusercontent.com/caldav/v2/#{URI.encode_www_form_component(username)}/")
-  end
-
-  it "can create and delete calendars" do
-    skip "Not supported by Google"
-    url = subject.calendars.create(
-      display_name: "Calendav Test"
+    expect(subject.calendars.home_url).to eq_encoded_url(
+      "https://apidata.googleusercontent.com/caldav/v2/#{username}/"
     )
+  end
 
-    subject.calendars.delete(url)
+  it "cannot create calendars" do
+    expect(subject.calendars.create?).to eq(false)
   end
 
-  it "can find calendars" do
+  it "can find and update calendars" do
     calendars = subject.calendars.list
+    calendar = calendars.detect { |cal| cal.display_name == "Calendav Test" }
+
+    expect(calendar).to_not be_nil
 
-    expect(calendars.collect(&:display_name)).to include("Calendav Test")
+    subject.calendars.update(calendar.url, display_name: "Calendav Update")
+
+    calendars = subject.calendars.list
+    calendar = calendars.detect { |cal| cal.display_name == "Calendav Update" }
+
+    subject.calendars.update(calendar.url, display_name: "Calendav Test")
   end
 
   context "with a calendar" do
     let(:calendars) { subject.calendars.list }
-    let(:calendar_url) do
-      calendars.detect { |cal| cal.display_name == "Calendav Test" }&.path ||
-        subject.calendars.create(display_name: "Calendav Test")
+    let(:calendar) do
+      calendars.detect { |cal| cal.display_name == "Calendav Test" }
     end
     let(:identifier) { "#{SecureRandom.uuid}.ics" }
     let(:start) { Time.new 2021, 6, 1, 10, 30 }
     let(:finish) { Time.new 2021, 6, 1, 12, 30 }
 
-    after :each do
-      next if calendars.detect { |cal| cal.display_name == "Calendav Test" }
+    it "supports events" do
+      expect(calendar.components).to include("VEVENT")
+    end
 
-      subject.calendars.delete(calendar_url)
+    it "supports WebDAV-Sync" do
+      expect(calendar.reports).to include("sync-collection")
     end
 
-    it "can create, find and delete events" do
+    it "can create, find, update and delete events" do
       ics = Icalendar::Calendar.new
       ics.event do |event|
-        event.dtstart = start
-        event.dtend = finish
+        event.dtstart = start.utc
+        event.dtend = finish.utc
         event.summary = "Brunch"
       end
       ics.publish
 
       # Create an event
-      event_url = subject.events.create(calendar_url, identifier, ics.to_ical)
-      expect(event_url).to include(URI.decode_www_form_component(calendar_url))
+      event_url = subject.events.create(calendar.url, identifier, ics.to_ical)
+      expect(event_url).to include(URI.decode_www_form_component(calendar.url))
 
       # Search for the event
       events = subject.events.list(
-        calendar_url, from: Time.new(2021, 6, 1), to: Time.new(2021, 6, 2)
+        calendar.url, from: Time.new(2021, 6, 1), to: Time.new(2021, 6, 2)
       )
       expect(events.length).to eq(1)
       expect(events.first.summary).to eq("Brunch")
+      expect(events.first.url).to eq_encoded_url(event_url)
+
+      # Update the event
+      ics.events.first.dtstart = Time.new(2021, 7, 1, 10, 30).utc
+      ics.events.first.dtend = Time.new(2021, 7, 1, 12, 30).utc
+      subject.events.update(event_url, ics.to_ical)
+
+      # Search again
+      events = subject.events.list(
+        calendar.url, from: Time.new(2021, 7, 1), to: Time.new(2021, 7, 2)
+      )
+      expect(events.length).to eq(1)
+      expect(events.first.summary).to eq("Brunch")
+      expect(events.first.url).to eq_encoded_url(event_url)
+
+      # Create another event
+      ics = Icalendar::Calendar.new
+      ics.event do |event|
+        event.dtstart = start.utc
+        event.dtend = finish.utc
+        event.summary = "Brunch"
+      end
+      ics.publish
+
+      another_url = subject.events.create(
+        calendar.url, "#{SecureRandom.uuid}.ics", ics.to_ical
+      )
+
+      # Search for all events
+      events = subject.events.list(calendar.url)
+      expect(events.length).to eq(2)
+
+      # Delete the events
+      expect(subject.events.delete(event_url)).to eq(true)
+      expect(subject.events.delete(another_url)).to eq(true)
+    end
+
+    it "respects etag conditions with updates" do
+      ics = Icalendar::Calendar.new
+      ics.event do |event|
+        event.dtstart = start.utc
+        event.dtend = finish.utc
+        event.summary = "Brunch"
+      end
+      ics.publish
+
+      event_url = subject.events.create(calendar.url, identifier, ics.to_ical)
+      event = subject.events.find(event_url)
+
+      ics.events.first.summary = "Coffee"
+      expect(
+        subject.events.update(event_url, ics.to_ical, etag: event.etag)
+      ).to eq(true)
+
+      expect(subject.events.find(event_url).summary).to eq("Coffee")
+
+      # Updating with the old etag should fail
+      ics.events.first.summary = "Brunch"
+      expect(
+        subject.events.update(event_url, ics.to_ical, etag: event.etag)
+      ).to eq(false)
+
+      expect(subject.events.find(event_url).summary).to eq("Coffee")
 
-      # Delete the event
       expect(subject.events.delete(event_url)).to eq(true)
     end
+
+    it "does not respect etag conditions for deletions" do
+      ics = Icalendar::Calendar.new
+      ics.event do |event|
+        event.dtstart = start.utc
+        event.dtend = finish.utc
+        event.summary = "Brunch"
+      end
+      ics.publish
+
+      event_url = subject.events.create(calendar.url, identifier, ics.to_ical)
+      event = subject.events.find(event_url)
+
+      ics.events.first.summary = "Coffee"
+      expect(
+        subject.events.update(event_url, ics.to_ical, etag: event.etag)
+      ).to eq(true)
+
+      # Google doesn't care about the If-Match header on DELETE requests :(
+      expect(subject.events.delete(event_url, etag: event.etag)).to eq(true)
+    end
+
+    it "handles synchronisation requests" do
+      first = Icalendar::Calendar.new
+      first.event do |event|
+        event.dtstart = start.utc
+        event.dtend = finish.utc
+        event.summary = "Brunch"
+      end
+      first.publish
+
+      first_url = subject.events.create(calendar.url, identifier, first.to_ical)
+      token = subject.calendars.find(calendar.url, sync: true).sync_token
+
+      events = subject.events.list(calendar.url)
+      expect(events.length).to eq(1)
+
+      second = Icalendar::Calendar.new
+      second.event do |event|
+        event.dtstart = start.utc
+        event.dtend = finish.utc
+        event.summary = "Brunch Again"
+      end
+      second.publish
+      second_url = subject.events.create(
+        calendar.url, "#{SecureRandom.uuid}.ics", second.to_ical
+      )
+
+      first.events.first.summary = "Coffee"
+      subject.events.update(first_url, first.to_ical)
+
+      collection = subject.calendars.sync(calendar.url, token)
+      expect(collection.changes.collect(&:url))
+        .to match_encoded_urls([first_url, second_url])
+
+      expect(collection.deletions).to be_empty
+
+      first.events.first.summary = "Brunch"
+      subject.events.update(first_url, first.to_ical)
+
+      subject.events.delete(second_url)
+
+      collection = subject.calendars.sync(calendar.url, collection.sync_token)
+      urls = collection.changes.collect(&:url)
+      expect(urls.length).to eq(1)
+      expect(urls[0]).to eq_encoded_url(first_url)
+
+      expect(collection.deletions.length).to eq(1)
+      expect(collection.deletions.first).to eq_encoded_url(second_url)
+
+      subject.events.delete(first_url)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require "dotenv"
 
 Dotenv.load
 
+require_relative "support/encoded_matchers"
+
 RSpec.configure do |config|
   config.disable_monkey_patching!
 

data/spec/support/encoded_matchers.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EncodedMatchers
+  def eq_encoded_url(expected)
+    eq(RecodeURI.call(expected))
+  end
+
+  def match_encoded_urls(expected)
+    match_array(expected.collect { |uri| RecodeURI.call(uri) })
+  end
+end
+
+class RecodeURI
+  def self.call(uri)
+    encoded = URI(uri)
+
+    encoded.path = encoded.path.split("/").collect do |piece|
+      URI.encode_www_form_component(piece)
+    end.join("/")
+
+    encoded.path += "/" if uri.end_with?("/")
+
+    encoded.to_s
+  end
+end
+
+RSpec.configure do |config|
+  config.include EncodedMatchers
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calendav
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-13 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: icalendar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: icalendar
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -146,15 +160,26 @@ files:
 - lib/calendav/credentials/google.rb
 - lib/calendav/credentials/standard.rb
 - lib/calendav/endpoint.rb
+- lib/calendav/errors.rb
 - lib/calendav/event.rb
+- lib/calendav/multi_response.rb
+- lib/calendav/namespaces.rb
+- lib/calendav/parsers/calendar_xml.rb
+- lib/calendav/parsers/event_xml.rb
+- lib/calendav/parsers/response_xml.rb
+- lib/calendav/parsers/sync_xml.rb
 - lib/calendav/requests/calendar_home_set.rb
 - lib/calendav/requests/current_user_principal.rb
 - lib/calendav/requests/list_calendars.rb
 - lib/calendav/requests/list_events.rb
 - lib/calendav/requests/make_calendar.rb
-- lib/calendav/xml_processor.rb
+- lib/calendav/requests/sync_collection.rb
+- lib/calendav/requests/update_calendar.rb
+- lib/calendav/sync_collection.rb
+- spec/acceptance/apple_spec.rb
 - spec/acceptance/google_spec.rb
 - spec/spec_helper.rb
+- spec/support/encoded_matchers.rb
 homepage: https://github.com/pat/calendav
 licenses:
 - Hippocratic-2.1
@@ -182,8 +207,10 @@ signing_key:
 specification_version: 4
 summary: CalDAV client
 test_files:
+- spec/acceptance/apple_spec.rb
 - spec/acceptance/google_spec.rb
 - spec/spec_helper.rb
+- spec/support/encoded_matchers.rb
 - ".rspec"
 - Gemfile
 - Rakefile

data/lib/calendav/xml_processor.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Calendav
-  class XMLProcessor
-    NAMESPACES = {
-      "xmlns:dav" => "DAV:",
-      "xmlns:caldav" => "urn:ietf:params:xml:ns:caldav",
-      "xmlns:cs" => "http://calendarserver.org/ns/",
-      "xmlns:apple" => "http://apple.com/ns/ical/"
-    }.freeze
-
-    def self.call(...)
-      new(...).call
-    end
-
-    def initialize(raw, namespaces = NAMESPACES)
-      @raw = raw
-      @namespaces = namespaces
-    end
-
-    def call
-      document = parse(raw)
-
-      namespaces.each do |key, value|
-        document.root[key] = value unless document.namespaces[key]
-      end
-
-      parse(document.to_xml)
-    end
-
-    private
-
-    attr_reader :raw, :namespaces
-
-    def parse(string)
-      Nokogiri::XML(string) { |config| config.strict.noblanks }
-    rescue Nokogiri::XML::SyntaxError
-      puts string
-      raise
-    end
-  end
-end