caldav.rb 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bade6bf8d4171a511851eab788d9a4e0c6926ee1cfa8811ce61ba1a8b4e61ba
-  data.tar.gz: 428761e5e9978cab9cae7ae1e15a38cbec9dade3b3547b2be5168851abc46645
+  metadata.gz: 78f2d9632906e82c83ef2a9f7368fedd3a6e6ec473b1bf5225963ca3e298fef0
+  data.tar.gz: fd60c2113bc0059685560b89052edcfd70c2e85bda4359e2be03b48a49196688
 SHA512:
-  metadata.gz: 7f43dad1403215dc884edd5ad4cd54e7f5d1ef30f72926c949be39c30ddc141fde805b895f057533e6a7acd5b2a2fe822de29557f47971ba1e308b147650fa70
-  data.tar.gz: 96ce0a9f7c0894180276d7d33e22b4b5df287ddd1fdbfc9bdbfed589021cb14e650bc10d77a6ce33e46d0b9a84684363f4c21d63a5deb8cc87ca7b5a9b20c55c
+  metadata.gz: e4b935fdde691594b182f27fe4aed10e43017a986b1d4de04ec47443c7090d0485714b2ec424ddf760de9363d484e7be899a9d8750757e99d5919273bef401ba
+  data.tar.gz: d26b9a87746ea1e8abdfc2c20f31c641e6980a78d95ccceb0eb1ba1f3228a3540b5b6e5e0ebd5c4447426d74226b236dded24893e3b0212ef8480ff1d74a6a70

data/CHANGELOG

@@ -1,5 +1,16 @@
 # CHANGELOG
 
+## 20260811
+
+0.2.0: Begin Layer 2 (Objects) — Calendar value objects and object-returning discovery.
+
+1. + CalDAV::Calendar, a value object (path, display_name, ctag, color, description, timezone, supported_components), with .from_resource mapping a CalDAV::Resource, and .all(client:, home:) discovering a home's calendars as Calendars — the eodhd model-class-method form; the client stays the low-level raw path.
+2. + the object-layer entry points: require 'CalDAV/Objects' (default, with extensions) and require 'CalDAV/Objects/Core' (objects without the extension accessors).
+3. + a composable vendor-extension layer: lib/CalDAV/Extensions/CalendarServer.rb (getctag) and Apple.rb (calendar-color). Each is a module that prepends onto the client to add its namespace and property to the calendar-discovery request and mixes a reader into CalDAV::Resource, composing via super so vendors stack rather than clobber. Layer 1 stays strictly RFC 4791 (empty base hooks); the object layer loads both by default, 'CalDAV/Objects/Core' loads neither, and a consumer may require a single vendor. from_resource reads ctag/color opportunistically.
+4. + CalDAV::Resource#display_name (DAV:displayname).
+5. ~ CalDAV#calendars: returns CalDAV::Resource objects rather than href strings, from a fuller PROPFIND (displayname, calendar-description, calendar-timezone, supported-calendar-component-set). Callers wanting raw read the resources directly; Calendar.all maps them.
+
+
 ## 20260623
 
 0.1.0: Complete the RFC 4791 §5.2 navigation surface.
@@ -14,6 +25,7 @@
 8. ~ README navigation-accessor list.
 9. ~ VERSION: /0.0.1/0.1.0/
 
+
 ## 20260621
 
 0.0.1: Lowercase load file; require VERSION; MultiStatus tests.
@@ -24,6 +36,7 @@
 4. + CalDAV::MultiStatus unit test, covering the two overrides over WebDAV::MultiStatus: parse_response (wraps each response as a CalDAV::Resource, in order) and parse_properties (a pretty-printed nested property is kept as serialised markup rather than collapsing to inter-tag whitespace).
 5. ~ VERSION: /0.0.0/0.0.1/
 
+
 ## 20260620
 
 0.0.0: Initial release.

data/README.md

@@ -1,6 +1,6 @@
 # caldav.rb
 
-A CalDAV client library for Ruby, built on [webdav](https://github.com/thoran/webdav) and implementing RFC 4791. This release ships **Layer 1 (Protocol)** of a planned three-layer ecosystem.
+A CalDAV client library for Ruby, built on [webdav](https://github.com/thoran/webdav) and implementing RFC 4791. It ships **Layer 1 (Protocol)** and the beginning of **Layer 2 (Objects)** — Calendar objects — of a planned three-layer ecosystem.
 
 
 ## Installation
@@ -18,11 +18,11 @@ gem 'caldav.rb'
 
 ## Concepts
 
-caldav.rb is designed in three layers, each a strict superset of the one below. This release ships Layer 1 only; the higher layers are future releases with reserved require paths.
+caldav.rb is designed in three layers, each a strict superset of the one below. Layer 1 is complete; Layer 2 has begun with Calendar objects; its Event and Principal objects, and all of Layer 3, are future releases.
 
-- **Layer 1 — Protocol** (this release). The CalDAV verbs, multistatus responses, and namespace-aware navigation accessors. The equivalent of a raw protocol library: it returns CalDAV-typed responses but does not parse iCalendar payloads or construct domain objects. Most users will want Layer 2 once it ships; until then, the protocol layer is usable directly by reading `resource.calendar_data` and parsing it with the `icalendar` gem.
-- **Layer 2 — Objects** (future, `require 'caldav.rb/objects'`). `CalDAV::Event`, `CalDAV::Calendar`, and `CalDAV::Principal` value objects with iCalendar parsing and convenience predicates.
-- **Layer 3 — Queryable** (future, `require 'caldav.rb/queryable'`). A [Namo](https://github.com/thoran/namo)-backed `CalDAV::Query::Calendar` exposing events as queryable rows with derived columns.
+- **Layer 1 — Protocol.** The CalDAV verbs, multistatus responses, and namespace-aware navigation accessors. The equivalent of a raw protocol library: it returns CalDAV-typed responses but does not parse iCalendar payloads or construct domain objects. For events, read `resource.calendar_data` and parse it with the `icalendar` gem until Layer 2's `CalDAV::Event` lands.
+- **Layer 2 — Objects** (`require 'CalDAV/Objects'`). Value objects over the protocol layer. `CalDAV::Calendar` and object-returning discovery (`CalDAV::Calendar.all`) ship now, with vendor properties (getctag, calendar-color) available and separable (`require 'CalDAV/Objects/Core'` to omit them). `CalDAV::Event` (with iCalendar parsing) and `CalDAV::Principal` are still to come.
+- **Layer 3 — Queryable** (future, `require 'CalDAV/Queryable'`). A [Namo](https://github.com/thoran/namo)-backed `CalDAV::Query::Calendar` exposing events as queryable rows with derived columns.
 
 
 ## Usage
@@ -33,12 +33,43 @@ require 'caldav.rb'
 caldav = CalDAV.new('https://caldav.example.com/dav/', username: 'user', password: 'pass')
 ```
 
+The object layer (`require 'CalDAV/Objects'`) is the high-level API; today it covers calendar discovery. Everything else below is the protocol layer it is built on — which you can always use directly for raw access.
+
 ### Discovery
 
+With the object layer, listing calendars returns `CalDAV::Calendar` objects — `Calendar.all` walks principal → home-set → calendars for you:
+
+```ruby
+require 'CalDAV/Objects'
+CalDAV::Calendar.all(client: caldav).each{|calendar| puts calendar.display_name}
+```
+
+Each `Calendar` exposes its collection's properties:
+
+```ruby
+calendar = CalDAV::Calendar.all(client: caldav).first
+calendar.path                  # "/dav/calendars/user/work/"
+calendar.description           # the calendar-description string
+calendar.timezone              # the raw VTIMEZONE string, if the server sets one
+calendar.supported_components  # the raw supported-component-set (unparsed markup)
+calendar.ctag                  # change tag for cheap sync-detection (vendor extension)
+calendar.color                 # the calendar colour (vendor extension)
+calendar.to_s                  # display name, or path when unnamed
+```
+
+`ctag` and `color` come from the vendor extensions, loaded by default. Require the core objects instead to omit them — the readers stay, but return `nil`:
+
+```ruby
+require 'CalDAV/Objects/Core'  # strictly RFC 4791 — no vendor extensions
+CalDAV::Calendar.all(client: caldav).first.ctag   # => nil
+```
+
+Drop to the protocol layer when you want the raw resources, or aren't loading the object layer — the same walk, step by step:
+
 ```ruby
 principal = caldav.current_user_principal
 home = caldav.calendar_home_set(principal)
-caldav.calendars(home).each{|href| puts href}
+caldav.calendars(home).each{|resource| puts resource.href}  # CalDAV::Resource objects
 ```
 
 Each discovery helper defaults its argument to the result of the previous step, so `caldav.calendars` alone walks principal → home-set → calendars.
@@ -77,18 +108,30 @@ caldav.mkcalendar('/calendars/user/new/', body: mkcalendar_xml)
 
 ## Methods
 
-### Protocol verbs (RFC 4791)
+### Layer 1 — Protocol (`require 'caldav.rb'`)
+
+Raw CalDAV-typed responses and navigation resources; no domain objects.
+
+#### Protocol verbs (RFC 4791)
 
 - `mkcalendar(path, body:)` — §5.3.1. Create a calendar collection. Returns a `WebDAV::Response`.
 - `calendar_query(path, body:, depth:)` — §7.8. REPORT with a `<c:calendar-query>` body. Returns a `CalDAV::MultiStatus`.
 - `calendar_multiget(path, body:, depth:)` — §7.9. REPORT with a `<c:calendar-multiget>` body. Returns a `CalDAV::MultiStatus`.
 - `freebusy_query(path, body:, depth:)` — §7.10. REPORT with a `<c:free-busy-query>` body. Returns a raw `WebDAV::Response` carrying VFREEBUSY iCalendar data — **not** a multistatus. This asymmetry is inherent to the CalDAV spec.
 
-### Discovery
+#### Discovery
 
 - `current_user_principal(path = base URL path)` — returns the principal URL string. PROPFINDs the base URL's path by default; pass a path to start discovery elsewhere.
 - `calendar_home_set(principal = current_user_principal)` — returns the calendar-home-set URL string.
-- `calendars(home = calendar_home_set)` — returns an array of calendar collection URL strings.
+- `calendars(home = calendar_home_set)` — returns the calendar-collection `CalDAV::Resource`s.
+
+### Layer 2 — Objects (`require 'CalDAV/Objects'`)
+
+Value objects built over Layer 1. The default require also loads the vendor extensions (`getctag`, `calendar-color`); `require 'CalDAV/Objects/Core'` omits them.
+
+- `CalDAV::Calendar.all(client:, home: nil)` — discovers a home's calendars and returns `CalDAV::Calendar` objects. `home` defaults to the client's discovered calendar-home-set.
+- `CalDAV::Calendar.from_resource(resource)` — maps a single `CalDAV::Resource` to a `CalDAV::Calendar`.
+- `CalDAV::Calendar` readers — `path`, `display_name`, `description`, `timezone`, `supported_components`, `ctag`, `color`; `ctag` and `color` are `nil` unless the vendor extensions are loaded. `to_s` gives the display name or path.
 
 
 ## Responses
@@ -96,6 +139,7 @@ caldav.mkcalendar('/calendars/user/new/', body: mkcalendar_xml)
 The REPORT verbs return `CalDAV::MultiStatus`, a type-preserving subclass of `WebDAV::MultiStatus` whose `resources` are `CalDAV::Resource` objects. Each `CalDAV::Resource` adds CalDAV-namespace navigation accessors over the underlying webdav resource:
 
 - `href` — the resource URL
+- `display_name` — the human-readable name from `<d:displayname>`
 - `calendar_data` — the iCalendar string from `<c:calendar-data>`
 - `calendar_description` — `<c:calendar-description>`
 - `supported_calendar_component_set` — `<c:supported-calendar-component-set>`
@@ -113,13 +157,13 @@ These are strictly navigation: they return raw strings and values, never parsed
 
 ## Limitations
 
-This is a Layer 1 protocol release. Known boundaries:
+The client reads but does not write, and the object layer is only beginning. Known boundaries:
 
-- **Read-only.** Conditional writes need `If-Match`, which webdav's `put` does not yet expose; writes arrive with Layer 2.
-- **No iCalendar parsing.** Use the `icalendar` gem on `resource.calendar_data` if you need parsed events now.
+- **Read-only.** No creating, updating or deleting yet — conditional writes need `If-Match`, which webdav's `put` does not yet expose. Writes are a later increment, beyond Layer 2's read-only objects, not part of them.
+- **No iCalendar parsing.** Use the `icalendar` gem on `resource.calendar_data` if you need parsed events now, until Layer 2's `CalDAV::Event` lands.
 - **Basic auth only.** No OAuth.
 - **Tested against one real CalDAV server.** Other servers should work but are unverified.
-- **No sync-collection.** Incremental sync is deferred.
+- **No sync-collection.** `getctag` gives coarse per-collection change-detection now; fine-grained sync-collection (RFC 6578) is deferred.
 
 
 ## Dependencies

data/lib/CalDAV/Calendar.rb

@@ -0,0 +1,67 @@
+# CalDAV/Calendar.rb
+# CalDAV::Calendar
+
+require 'webdav'
+
+class CalDAV < WebDAV
+  class Calendar
+    attr_reader\
+      :path,
+      :display_name,
+      :ctag,
+      :color,
+      :description,
+      :timezone,
+      :supported_components
+
+    class << self
+      # Discovers the calendars in a home collection and returns them as
+      # Calendars — the high-level, object-returning entry point. The CalDAV
+      # client stays the low-level path for anyone wanting the raw resources.
+      # home defaults to the client's discovered calendar-home-set.
+      def all(client:, home: nil)
+        load(client: client, home: home)
+      end
+
+      # Builds a Calendar from a CalDAV::Resource (as returned by a calendar-home
+      # PROPFIND). Strictly a mapping over the resource's navigation accessors — no
+      # parsing. ctag and color are read opportunistically: populated only when
+      # the extension accessors are loaded (require 'CalDAV/Objects' pulls them
+      # in; 'CalDAV/Objects/Core' does not), and nil otherwise.
+      def from_resource(resource)
+        new(
+          path: resource.href,
+          display_name: resource.display_name,
+          ctag: (resource.getctag if resource.respond_to?(:getctag)),
+          color: (resource.calendar_color if resource.respond_to?(:calendar_color)),
+          description: resource.calendar_description,
+          timezone: resource.calendar_timezone,
+          supported_components: resource.supported_calendar_component_set
+        )
+      end
+
+      private
+
+      def load(client:, home: nil)
+        resources = home ? client.calendars(home) : client.calendars
+        resources.collect{|resource| from_resource(resource)}
+      end
+    end
+
+    def to_s
+      display_name || path
+    end
+
+    private
+
+    def initialize(path:, display_name: nil, ctag: nil, color: nil, description: nil, timezone: nil, supported_components: nil)
+      @path = path
+      @display_name = display_name
+      @ctag = ctag
+      @color = color
+      @description = description
+      @timezone = timezone
+      @supported_components = supported_components
+    end
+  end
+end

data/lib/CalDAV/Extensions/Apple.rb

@@ -0,0 +1,34 @@
+# CalDAV/Extensions/Apple.rb
+# CalDAV::Extensions::Apple
+
+# The apple calendar-color property. A non-RFC-4791 vendor extension: it prepends
+# its namespace and property onto the calendar-discovery request and mixes its
+# reader into Resource. Composes with other extensions via super. Loaded with the
+# object layer; omitted by 'CalDAV/Objects/Core'.
+
+require_relative '../../caldav'
+
+class CalDAV < WebDAV
+  module Extensions
+    module Apple
+      NAMESPACE = 'http://apple.com/ns/ical/'
+
+      private def calendars_request_namespaces
+        %(#{super} xmlns:ic="#{NAMESPACE}")
+      end
+
+      private def calendars_request_properties
+        "#{super}\n        <ic:calendar-color/>"
+      end
+
+      module Reader
+        def calendar_color
+          property(CalDAV::Extensions::Apple::NAMESPACE, 'calendar-color')
+        end
+      end
+    end
+  end
+
+  prepend Extensions::Apple
+  Resource.include Extensions::Apple::Reader
+end

data/lib/CalDAV/Extensions/CalendarServer.rb

@@ -0,0 +1,35 @@
+# CalDAV/Extensions/CalendarServer.rb
+# CalDAV::Extensions::CalendarServer
+
+# The calendarserver getctag property (calendar-collection sync token). A
+# non-RFC-4791 vendor extension: it prepends its namespace and property onto the
+# calendar-discovery request and mixes its reader into Resource. Composes with
+# other extensions via super. Loaded with the object layer; omitted by
+# 'CalDAV/Objects/Core'.
+
+require_relative '../../caldav'
+
+class CalDAV < WebDAV
+  module Extensions
+    module CalendarServer
+      NAMESPACE = 'http://calendarserver.org/ns/'
+
+      private def calendars_request_namespaces
+        %(#{super} xmlns:cs="#{NAMESPACE}")
+      end
+
+      private def calendars_request_properties
+        "#{super}\n        <cs:getctag/>"
+      end
+
+      module Reader
+        def getctag
+          property(CalDAV::Extensions::CalendarServer::NAMESPACE, 'getctag')
+        end
+      end
+    end
+  end
+
+  prepend Extensions::CalendarServer
+  Resource.include Extensions::CalendarServer::Reader
+end

data/lib/CalDAV/Objects/Core.rb

@@ -0,0 +1,9 @@
+# CalDAV/Objects/Core.rb
+# CalDAV object layer, core (no extension accessors)
+
+# The object layer without the extension-namespace accessors — a strictly
+# RFC 4791 object surface. `require 'CalDAV/Objects'` loads this plus the
+# extensions; require this path directly to opt out of them.
+
+require_relative '../../caldav'
+require_relative '../Calendar'

data/lib/CalDAV/Objects.rb

@@ -0,0 +1,11 @@
+# CalDAV/Objects.rb
+# CalDAV Objects layer (Layer 2), default: with vendor extensions
+
+# Value objects built over the Layer 1 protocol/navigation surface. Opt-in via
+# `require 'CalDAV/Objects'`. This default form also loads the vendor extensions
+# (calendarserver getctag, apple calendar-color); require 'CalDAV/Objects/Core'
+# for the objects without them, a strictly RFC 4791 consumer.
+
+require_relative './Objects/Core'
+require_relative './Extensions/Apple'
+require_relative './Extensions/CalendarServer'

data/lib/CalDAV/Resource.rb

@@ -19,6 +19,10 @@ class CalDAV < WebDAV
       hash[:propstats]
     end
 
+    def display_name
+      property(DAV_NAMESPACE, 'displayname')
+    end
+
     # Navigation accessors. Strictly navigation, not parsing: they return the
     # underlying iCalendar string or value.
 

data/lib/CalDAV/VERSION.rb

@@ -4,5 +4,5 @@
 class WebDAV; end
 
 class CalDAV < WebDAV
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/caldav.rb

@@ -37,8 +37,10 @@ class CalDAV < WebDAV
     handle_response(response)
   end
 
-  # Discovery helpers. Return paths/strings. And object-oriented discovery API
-  # (Principal/Calendar objects) is is planned.
+  # Discovery helpers. current_user_principal and calendar_home_set return href
+  # strings; calendars returns CalDAV::Resource objects (the navigation surface),
+  # which the object layer (CalDAV::Calendar.all, via require 'CalDAV/Objects')
+  # maps into value objects.
 
   def current_user_principal(path = discovery_path)
     resource = propfind_as_caldav(path, body: current_user_principal_body, depth: '0').resources.first
@@ -52,7 +54,7 @@ class CalDAV < WebDAV
 
   def calendars(home = calendar_home_set)
     resources = propfind_as_caldav(home, body: calendars_body, depth: '1').resources
-    resources.select{|resource| resource.is_calendar?}.collect{|resource| resource.href}
+    resources.select{|resource| resource.is_calendar?}
   end
 
   private
@@ -126,11 +128,21 @@ class CalDAV < WebDAV
   def calendars_body
     <<~XML
       <?xml version="1.0" encoding="UTF-8"?>
-      <d:propfind xmlns:d="DAV:">
+      <d:propfind xmlns:d="DAV:" xmlns:c="#{NAMESPACE}"#{calendars_request_namespaces}>
         <d:prop>
+          <d:displayname/>
           <d:resourcetype/>
+          <c:calendar-description/>
+          <c:calendar-timezone/>
+          <c:supported-calendar-component-set/>#{calendars_request_properties}
         </d:prop>
       </d:propfind>
     XML
   end
+
+  # Root of the calendar-discovery extension chain. Extension modules prepend
+  # onto these and super, so their contributions compose rather than clobber;
+  # empty here keeps the request strictly RFC 4791.
+  def calendars_request_namespaces; ''; end
+  def calendars_request_properties;  ''; end
 end

data/test/CalDAV/Calendar_test.rb

@@ -0,0 +1,169 @@
+# test/CalDAV/Calendar_test.rb
+
+require_relative '../helper'
+require_relative '../../lib/CalDAV/Objects'
+
+describe CalDAV::Calendar do
+  let(:calendar) do
+    CalDAV::Calendar.new(
+      path: '/dav/calendars/user/test/work/',
+      display_name: 'Work',
+      ctag: 'abc123',
+      color: '#FF0000',
+      description: 'Work calendar',
+      supported_components: 'VEVENT'
+    )
+  end
+
+  describe "#path" do
+    it "returns the path" do
+      _(calendar.path).must_equal '/dav/calendars/user/test/work/'
+    end
+  end
+
+  describe "#display_name" do
+    it "returns the display name" do
+      _(calendar.display_name).must_equal 'Work'
+    end
+  end
+
+  describe "#ctag" do
+    it "returns the ctag" do
+      _(calendar.ctag).must_equal 'abc123'
+    end
+  end
+
+  describe "#color" do
+    it "returns the color" do
+      _(calendar.color).must_equal '#FF0000'
+    end
+  end
+
+  describe "#to_s" do
+    it "returns the display name" do
+      _(calendar.to_s).must_equal 'Work'
+    end
+
+    it "falls back to path when display_name is nil" do
+      c = CalDAV::Calendar.new(path: '/dav/work/')
+      _(c.to_s).must_equal '/dav/work/'
+    end
+  end
+
+  describe ".from_resource" do
+    let(:multistatus) do
+      CalDAV::MultiStatus.new(MockResponse.new(code: '207', message: 'Multi-Status', body: <<~XML))
+        <?xml version="1.0" encoding="UTF-8"?>
+        <d:multistatus xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/" xmlns:ic="http://apple.com/ns/ical/">
+          <d:response>
+            <d:href>/calendars/user/work/</d:href>
+            <d:propstat>
+              <d:prop>
+                <d:displayname>Work</d:displayname>
+                <d:resourcetype><d:collection/><c:calendar/></d:resourcetype>
+                <cs:getctag>abc123</cs:getctag>
+                <ic:calendar-color>#FF0000</ic:calendar-color>
+                <c:calendar-description>Work calendar</c:calendar-description>
+                <c:calendar-timezone>BEGIN:VTIMEZONE</c:calendar-timezone>
+              </d:prop>
+              <d:status>HTTP/1.1 200 OK</d:status>
+            </d:propstat>
+          </d:response>
+        </d:multistatus>
+      XML
+    end
+    let(:built){CalDAV::Calendar.from_resource(multistatus.resources.first)}
+
+    it "maps href to path" do
+      _(built.path).must_equal '/calendars/user/work/'
+    end
+
+    it "maps displayname to display_name" do
+      _(built.display_name).must_equal 'Work'
+    end
+
+    it "maps calendar-description to description" do
+      _(built.description).must_equal 'Work calendar'
+    end
+
+    it "maps calendar-timezone to timezone" do
+      _(built.timezone).must_equal 'BEGIN:VTIMEZONE'
+    end
+
+    it "maps getctag to ctag (extension, loaded by default)" do
+      _(built.ctag).must_equal 'abc123'
+    end
+
+    it "maps calendar-color to color (extension, loaded by default)" do
+      _(built.color).must_equal '#FF0000'
+    end
+
+    it "leaves ctag and color nil when those properties are absent" do
+      body = <<~XML
+        <?xml version="1.0" encoding="UTF-8"?>
+        <d:multistatus xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+          <d:response>
+            <d:href>/calendars/user/plain/</d:href>
+            <d:propstat>
+              <d:prop><d:displayname>Plain</d:displayname></d:prop>
+              <d:status>HTTP/1.1 200 OK</d:status>
+            </d:propstat>
+          </d:response>
+        </d:multistatus>
+      XML
+      plain = CalDAV::Calendar.from_resource(CalDAV::MultiStatus.new(MockResponse.new(code: '207', message: 'Multi-Status', body: body)).resources.first)
+      _(plain.ctag).must_be_nil
+      _(plain.color).must_be_nil
+    end
+  end
+
+  describe ".all" do
+    let(:caldav){CalDAV.new('https://caldav.example.com/', username: 'u', password: 'p')}
+    let(:home_response) do
+      MockResponse.new(code: '207', message: 'Multi-Status', body: <<~XML)
+        <?xml version="1.0" encoding="UTF-8"?>
+        <d:multistatus xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/" xmlns:ic="http://apple.com/ns/ical/">
+          <d:response>
+            <d:href>/dav/calendars/user/abc/</d:href>
+            <d:propstat><d:prop><d:resourcetype><d:collection/></d:resourcetype></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat>
+          </d:response>
+          <d:response>
+            <d:href>/dav/calendars/user/abc/work/</d:href>
+            <d:propstat>
+              <d:prop>
+                <d:displayname>Work</d:displayname>
+                <d:resourcetype><d:collection/><c:calendar/></d:resourcetype>
+                <cs:getctag>ctag-1</cs:getctag>
+                <ic:calendar-color>#FF0000</ic:calendar-color>
+                <c:calendar-description>Work calendar</c:calendar-description>
+              </d:prop>
+              <d:status>HTTP/1.1 200 OK</d:status>
+            </d:propstat>
+          </d:response>
+        </d:multistatus>
+      XML
+    end
+
+    it "returns Calendar objects for the calendar collections only" do
+      caldav.stub(:request, home_response) do
+        calendars = CalDAV::Calendar.all(client: caldav, home: '/dav/calendars/user/abc/')
+        _(calendars.length).must_equal 1
+        _(calendars.first).must_be_kind_of CalDAV::Calendar
+        _(calendars.first.path).must_equal '/dav/calendars/user/abc/work/'
+        _(calendars.first.display_name).must_equal 'Work'
+      end
+    end
+
+    it "maps the extension properties when the extensions are loaded" do
+      caldav.stub(:request, home_response) do
+        work = CalDAV::Calendar.all(client: caldav, home: '/dav/calendars/user/abc/').first
+        _(work.ctag).must_equal 'ctag-1'
+        _(work.color).must_equal '#FF0000'
+      end
+    end
+
+    it "requires a client" do
+      _{CalDAV::Calendar.all(home: '/dav/calendars/user/abc/')}.must_raise ArgumentError
+    end
+  end
+end

data/test/CalDAV/Extensions/Apple_test.rb

@@ -0,0 +1,30 @@
+# test/CalDAV/Extensions/Apple_test.rb
+
+require_relative '../../helper'
+require 'CalDAV/Objects' # loads the vendor extensions
+
+describe "CalDAV::Extensions::Apple" do
+  let(:resource) do
+    body = <<~XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <d:multistatus xmlns:d="DAV:" xmlns:ic="http://apple.com/ns/ical/">
+        <d:response>
+          <d:href>/calendars/user/work/</d:href>
+          <d:propstat><d:prop><ic:calendar-color>#FF0000</ic:calendar-color></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat>
+        </d:response>
+      </d:multistatus>
+    XML
+    CalDAV::MultiStatus.new(MockResponse.new(code: '207', message: 'Multi-Status', body: body)).resources.first
+  end
+
+  it "reads calendar-color from the apple namespace" do
+    _(resource.calendar_color).must_equal '#FF0000'
+  end
+
+  it "contributes its namespace and property to the calendars request" do
+    caldav = CalDAV.new('https://caldav.example.com/', username: 'u', password: 'p')
+    body = caldav.send(:calendars_body)
+    _(body).must_include 'xmlns:ic="http://apple.com/ns/ical/"'
+    _(body).must_include '<ic:calendar-color/>'
+  end
+end

data/test/CalDAV/Extensions/CalendarServer_test.rb

@@ -0,0 +1,30 @@
+# test/CalDAV/Extensions/CalendarServer_test.rb
+
+require_relative '../../helper'
+require 'CalDAV/Objects' # loads the vendor extensions
+
+describe "CalDAV::Extensions::CalendarServer" do
+  let(:resource) do
+    body = <<~XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+        <d:response>
+          <d:href>/calendars/user/work/</d:href>
+          <d:propstat><d:prop><cs:getctag>abc123</cs:getctag></d:prop><d:status>HTTP/1.1 200 OK</d:status></d:propstat>
+        </d:response>
+      </d:multistatus>
+    XML
+    CalDAV::MultiStatus.new(MockResponse.new(code: '207', message: 'Multi-Status', body: body)).resources.first
+  end
+
+  it "reads getctag from the calendarserver namespace" do
+    _(resource.getctag).must_equal 'abc123'
+  end
+
+  it "contributes its namespace and property to the calendars request" do
+    caldav = CalDAV.new('https://caldav.example.com/', username: 'u', password: 'p')
+    body = caldav.send(:calendars_body)
+    _(body).must_include 'xmlns:cs="http://calendarserver.org/ns/"'
+    _(body).must_include '<cs:getctag/>'
+  end
+end

data/test/CalDAV/Objects/Core_test.rb

@@ -0,0 +1,15 @@
+# test/CalDAV/Objects/Core_test.rb
+
+require_relative '../../helper'
+require 'CalDAV/Objects/Core'
+
+# The core path loads the object layer without the extension accessors. Their
+# absence can't be asserted in-process — requires are global, and another test
+# loads the full 'CalDAV/Objects' — so this covers only that the path itself
+# resolves and yields the objects; the opt-out is a structural property of
+# Core.rb not requiring Resource/Extensions.
+describe "CalDAV/Objects/Core" do
+  it "loads the object layer through the core require path" do
+    _(defined?(CalDAV::Calendar)).must_equal 'constant'
+  end
+end

data/test/CalDAV/Objects_test.rb

@@ -0,0 +1,34 @@
+# test/CalDAV/Objects_test.rb
+
+require_relative '../helper'
+
+# Exercise the Layer 2 entry point through its real public require path, so this
+# guards the path itself (the CalDAV-cased, portable form) — not just the file's
+# contents. lib is on the load path under rake's TestTask, as it is for a
+# consumer of the installed gem.
+require 'CalDAV/Objects'
+
+describe "CalDAV/Objects" do
+  it "loads the object layer through the require path" do
+    _(defined?(CalDAV::Calendar)).must_equal 'constant'
+  end
+
+  it "pulls in the Layer 1 base it builds on" do
+    _(CalDAV.ancestors).must_include(WebDAV)
+    _(defined?(CalDAV::Resource)).must_equal 'constant'
+  end
+
+  it "loads the extension accessors by default" do
+    _(CalDAV::Resource.method_defined?(:getctag)).must_equal true
+    _(CalDAV::Resource.method_defined?(:calendar_color)).must_equal true
+  end
+
+  it "composes every loaded extension into the calendars request" do
+    caldav = CalDAV.new('https://caldav.example.com/', username: 'u', password: 'p')
+    body = caldav.send(:calendars_body)
+    _(body).must_include 'xmlns:cs="http://calendarserver.org/ns/"'
+    _(body).must_include '<cs:getctag/>'
+    _(body).must_include 'xmlns:ic="http://apple.com/ns/ical/"'
+    _(body).must_include '<ic:calendar-color/>'
+  end
+end

data/test/CalDAV/Resource_test.rb

@@ -12,6 +12,7 @@ describe CalDAV::Resource do
           <d:propstat>
             <d:prop>
               <d:resourcetype><d:collection/><c:calendar/></d:resourcetype>
+              <d:displayname>Work</d:displayname>
               <c:calendar-description>Work calendar</c:calendar-description>
               <c:supported-calendar-data><c:calendar-data content-type="text/calendar" version="2.0"/></c:supported-calendar-data>
               <c:max-resource-size>10485760</c:max-resource-size>
@@ -59,6 +60,10 @@ describe CalDAV::Resource do
     _(calendar_resource.href).must_equal '/calendars/user/work/'
   end
 
+  it "reads displayname" do
+    _(calendar_resource.display_name).must_equal 'Work'
+  end
+
   it "reads calendar-description" do
     _(calendar_resource.calendar_description).must_equal 'Work calendar'
   end

data/test/{caldav_test.rb → CalDAV_test.rb}

@@ -173,9 +173,12 @@ describe CalDAV do
       XML
     end
 
-    it "returns only the calendar collection hrefs as bare URL strings" do
+    it "returns only the calendar-collection resources" do
       caldav.stub(:request, response) do
-        _(caldav.calendars('/dav/calendars/user/abc/')).must_equal ['/dav/calendars/user/abc/work/']
+        result = caldav.calendars('/dav/calendars/user/abc/')
+        _(result.length).must_equal 1
+        _(result.first).must_be_kind_of CalDAV::Resource
+        _(result.first.href).must_equal '/dav/calendars/user/abc/work/'
       end
     end
   end

data/test/integration_test.rb

@@ -23,7 +23,7 @@ describe 'CalDAV integration' do
     XML
   end
 
-  it "discovers principal, home-set and calendars as bare URL strings" do
+  it "discovers principal and home-set as strings, and calendars as resources" do
     with_caldav_cassette('discovery') do
       principal = caldav.current_user_principal
       _(principal).must_be_kind_of String
@@ -33,9 +33,10 @@ describe 'CalDAV integration' do
       _(home).wont_include '<'
       calendars = caldav.calendars(home)
       _(calendars).must_be_kind_of Array
-      calendars.each do |href|
-        _(href).must_be_kind_of String
-        _(href).wont_include '<'
+      calendars.each do |resource|
+        _(resource).must_be_kind_of CalDAV::Resource
+        _(resource.href).must_be_kind_of String
+        _(resource.href).wont_include '<'
       end
     end
   end
@@ -44,7 +45,7 @@ describe 'CalDAV integration' do
     with_caldav_cassette('calendar_query') do
       calendar = caldav.calendars.first
       skip 'no calendars on this account' unless calendar
-      result = caldav.calendar_query(calendar, body: events_query_body)
+      result = caldav.calendar_query(calendar.href, body: events_query_body)
       _(result).must_be_kind_of CalDAV::MultiStatus
       result.resources.each{|resource| _(resource).must_be_kind_of CalDAV::Resource}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caldav.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - thoran
@@ -105,15 +105,25 @@ files:
 - README.md
 - Rakefile
 - caldav.rb.gemspec
+- lib/CalDAV/Calendar.rb
+- lib/CalDAV/Extensions/Apple.rb
+- lib/CalDAV/Extensions/CalendarServer.rb
 - lib/CalDAV/MultiStatus.rb
+- lib/CalDAV/Objects.rb
+- lib/CalDAV/Objects/Core.rb
 - lib/CalDAV/Resource.rb
 - lib/CalDAV/VERSION.rb
 - lib/Net/HTTP/Mkcalendar.rb
 - lib/caldav.rb
+- test/CalDAV/Calendar_test.rb
+- test/CalDAV/Extensions/Apple_test.rb
+- test/CalDAV/Extensions/CalendarServer_test.rb
 - test/CalDAV/MultiStatus_test.rb
+- test/CalDAV/Objects/Core_test.rb
+- test/CalDAV/Objects_test.rb
 - test/CalDAV/Resource_test.rb
+- test/CalDAV_test.rb
 - test/Net/HTTP/Mkcalendar_test.rb
-- test/caldav_test.rb
 - test/helper.rb
 - test/integration_test.rb
 - test/vcr_helper.rb
@@ -136,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.18
 specification_version: 4
 summary: A Ruby CalDAV client library.
 test_files: []