protocol-caldav 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8094e6e1eb67a07518af3ee93dacaf90c3503df5591c448dc5fb6254017a4e2a
-  data.tar.gz: 8879d2477ddf90750f87451574ece2b6ab30b2b014c70c3a916487a56c532f49
+  metadata.gz: 4506a98c42a98f929d194a834d1cd3b9e3ba5d75824a4a2f2921d7fb67a8ee8f
+  data.tar.gz: 92c8aa4a1b645aacca6f03f5343cbf57d842120019401436e6f3d9781841f0ac
 SHA512:
-  metadata.gz: 6a378a3b95b2d9825d43b6b2e1917d41558a3146ae96cdd8425d2ba0ece33ff06731ba144abed4691b7e45bee2be40fd927e99d1d8b46c145ef194e7322acea2
-  data.tar.gz: 1cc5776a7b5148f7c3672fe6d814ee361eb4be0c93b0ce1f0dfb1feaf8a21d8706769629f295686b2d3226cda64021b4d1e68d2f3d3ec7834334b779847a36ce
+  metadata.gz: 7937306d109796181723817e98460e5c61efdc41c38c7a629eff641f12b12715930f16ce2042fcbada7e296541ff51a484c54465456ae876db052980a7a8d45a
+  data.tar.gz: 28ee48c158bba16390fb0d3f8fe855d0adcde6ecc5cb569cbf63a8dba01a27623a5a2b2cbf7388a7c2412256be53c87e8e64cf7d79d8f0224d87934e9c7aef23

data/lib/protocol/caldav/collection.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
 require "builder"
 
 require "protocol/caldav"
@@ -21,10 +19,18 @@ module Protocol
       end
 
       def update_attrs(updates)
-        @displayname = updates[:displayname] if updates.key?(:displayname)
-        @description = updates[:description] if updates.key?(:description)
-        @color = updates[:color] if updates.key?(:color)
-        @props = (@props || {}).merge(updates[:props]) if updates.key?(:props)
+        if updates.key?(:displayname)
+          @displayname = updates[:displayname]
+        end
+        if updates.key?(:description)
+          @description = updates[:description]
+        end
+        if updates.key?(:color)
+          @color = updates[:color]
+        end
+        if updates.key?(:props)
+          @props = (@props || {}).merge(updates[:props])
+        end
         self
       end
 
@@ -33,21 +39,31 @@ module Protocol
           XmlBuilder.propstat_ok(xml) do
             xml.tag!("d:resourcetype") do
               xml.tag!("d:collection")
-              xml.tag!("c:calendar") if @type == :calendar
-              xml.tag!("cr:addressbook") if @type == :addressbook
+              if @type == :calendar
+                xml.tag!("c:calendar")
+              end
+              if @type == :addressbook
+                xml.tag!("cr:addressbook")
+              end
             end
 
-            xml.tag!("d:displayname", @displayname) if @displayname
-            xml.tag!("c:calendar-description", @description) if @description
-            xml.tag!("x:calendar-color", @color) if @color
+            if @displayname
+              xml.tag!("d:displayname", @displayname)
+            end
+            if @description
+              xml.tag!("c:calendar-description", @description)
+            end
+            if @color
+              xml.tag!("x:calendar-color", @color)
+            end
 
             item_etags = @path.storage_class.list_items(@path.to_s).map { |_, data| data[:etag] }
             ctag = CTag.compute(
-              path: @path.to_s,
+              path:        @path.to_s,
               displayname: @displayname,
               description: @description,
-              color: @color,
-              item_etags: item_etags
+              color:       @color,
+              item_etags:  item_etags,
             )
             xml.tag!("cs:getctag", ctag)
             xml.tag!("d:sync-token", "http://caldav.local/sync/#{ctag}")
@@ -77,12 +93,20 @@ module Protocol
         XmlBuilder.response(xml, href: @path.to_s) do
           XmlBuilder.propstat_ok(xml) do
             xml.tag!("d:resourcetype")
-            xml.tag!("d:displayname") if @displayname
-            xml.tag!("c:calendar-description") if @description
-            xml.tag!("x:calendar-color") if @color
+            if @displayname
+              xml.tag!("d:displayname")
+            end
+            if @description
+              xml.tag!("c:calendar-description")
+            end
+            if @color
+              xml.tag!("x:calendar-color")
+            end
             xml.tag!("cs:getctag")
             xml.tag!("d:sync-token")
-            xml.tag!("c:supported-calendar-component-set") if @type == :calendar
+            if @type == :calendar
+              xml.tag!("c:supported-calendar-component-set")
+            end
           end
         end
       end
@@ -106,75 +130,75 @@ module Protocol
   end
 end
 
-test do
-  def normalize(xml)
-    xml.gsub(/>\s+</, '><').strip
-  end
+__END__
 
-  # Minimal mock storage for Collection tests
-  class MockStorageForCollection < Protocol::Caldav::Storage
-    def list_items(_path)
-      []
-    end
+def normalize(xml)
+  xml.gsub(/>\s+</, '><').strip
+end
+
+# Minimal mock storage for Collection tests
+class MockStorageForCollection < Protocol::Caldav::Storage
+  def list_items(_path)
+    []
   end
+end
 
-  describe "Protocol::Caldav::Collection" do
-    def make_collection(type: :calendar, displayname: "Work", **opts)
-      storage = MockStorageForCollection.new
-      path = Protocol::Caldav::Path.new("/calendars/admin/work/", storage_class: storage)
-      Protocol::Caldav::Collection.new(path: path, type: type, displayname: displayname, **opts)
-    end
+describe "Protocol::Caldav::Collection" do
+  def make_collection(type: :calendar, displayname: "Work", **opts)
+    storage = MockStorageForCollection.new
+    path = Protocol::Caldav::Path.new("/calendars/admin/work/", storage_class: storage)
+    Protocol::Caldav::Collection.new(path: path, type: type, displayname: displayname, **opts)
+  end
 
-    it "renders calendar resourcetype" do
-      xml = make_collection(type: :calendar).to_propfind_xml
-      xml.should.include "<c:calendar/>"
-    end
+  it "renders calendar resourcetype" do
+    xml = make_collection(type: :calendar).to_propfind_xml
+    xml.should.include "<c:calendar/>"
+  end
 
-    it "renders addressbook resourcetype" do
-      xml = make_collection(type: :addressbook).to_propfind_xml
-      xml.should.include "<cr:addressbook/>"
-    end
+  it "renders addressbook resourcetype" do
+    xml = make_collection(type: :addressbook).to_propfind_xml
+    xml.should.include "<cr:addressbook/>"
+  end
 
-    it "includes displayname when set" do
-      xml = make_collection(displayname: "Work").to_propfind_xml
-      xml.should.include "<d:displayname>Work</d:displayname>"
-    end
+  it "includes displayname when set" do
+    xml = make_collection(displayname: "Work").to_propfind_xml
+    xml.should.include "<d:displayname>Work</d:displayname>"
+  end
 
-    it "omits displayname when nil" do
-      xml = make_collection(displayname: nil).to_propfind_xml
-      xml.should.not.include "displayname"
-    end
+  it "omits displayname when nil" do
+    xml = make_collection(displayname: nil).to_propfind_xml
+    xml.should.not.include "displayname"
+  end
 
-    it "includes ctag" do
-      xml = make_collection.to_propfind_xml
-      xml.should.include "<cs:getctag>"
-    end
+  it "includes ctag" do
+    xml = make_collection.to_propfind_xml
+    xml.should.include "<cs:getctag>"
+  end
 
-    it "includes supported-calendar-component-set for calendars" do
-      xml = make_collection(type: :calendar).to_propfind_xml
-      xml.should.include "supported-calendar-component-set"
-    end
+  it "includes supported-calendar-component-set for calendars" do
+    xml = make_collection(type: :calendar).to_propfind_xml
+    xml.should.include "supported-calendar-component-set"
+  end
 
-    it "omits supported-calendar-component-set for addressbooks" do
-      xml = make_collection(type: :addressbook).to_propfind_xml
-      xml.should.not.include "supported-calendar-component-set"
-    end
+  it "omits supported-calendar-component-set for addressbooks" do
+    xml = make_collection(type: :addressbook).to_propfind_xml
+    xml.should.not.include "supported-calendar-component-set"
+  end
 
-    it "escapes special characters in displayname" do
-      xml = make_collection(displayname: "Work & <Personal>").to_propfind_xml
-      xml.should.include "Work &amp; &lt;Personal&gt;"
-    end
+  it "escapes special characters in displayname" do
+    xml = make_collection(displayname: "Work & <Personal>").to_propfind_xml
+    xml.should.include "Work &amp; &lt;Personal&gt;"
+  end
 
-    it "update_attrs modifies named fields" do
-      col = make_collection(displayname: "Old")
-      col.update_attrs(displayname: "New")
-      col.displayname.should.equal "New"
-    end
+  it "update_attrs modifies named fields" do
+    col = make_collection(displayname: "Old")
+    col.update_attrs(displayname: "New")
+    col.displayname.should.equal "New"
+  end
 
-    it "update_attrs leaves unmentioned fields alone" do
-      col = make_collection(displayname: "Work", description: "Desc")
-      col.update_attrs(displayname: "New")
-      col.description.should.equal "Desc"
-    end
+  it "update_attrs leaves unmentioned fields alone" do
+    col = make_collection(displayname: "Work", description: "Desc")
+    col.update_attrs(displayname: "New")
+    col.description.should.equal "Desc"
   end
 end

data/lib/protocol/caldav/constants.rb

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
-
 module Protocol
   module Caldav
     module Constants
       DAV_HEADERS = {
-        'dav' => '1, 2, 3, calendar-access, addressbook, extended-mkcol',
-        'allow' => 'OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, PROPPATCH, MKCALENDAR, MKCOL, MOVE, REPORT',
-        'content-type' => 'text/xml; charset=utf-8'
+        'dav'          => '1, 2, 3, calendar-access, addressbook, extended-mkcol',
+        'allow'        => 'OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, PROPPATCH, MKCALENDAR, MKCOL, MOVE, REPORT',
+        'content-type' => 'text/xml; charset=utf-8',
       }.freeze
 
       DAV_NS        = 'DAV:'
@@ -24,31 +21,30 @@ module Protocol
   end
 end
 
+__END__
 
-test do
-  describe "Protocol::Caldav::Constants" do
-    it "DAV_HEADERS is frozen" do
-      Protocol::Caldav::Constants::DAV_HEADERS.should.be.frozen
-    end
+describe "Protocol::Caldav::Constants" do
+  it "DAV_HEADERS is frozen" do
+    Protocol::Caldav::Constants::DAV_HEADERS.should.be.frozen
+  end
 
-    it "DAV_HEADERS includes calendar-access" do
-      Protocol::Caldav::Constants::DAV_HEADERS['dav'].should.include 'calendar-access'
-    end
+  it "DAV_HEADERS includes calendar-access" do
+    Protocol::Caldav::Constants::DAV_HEADERS['dav'].should.include 'calendar-access'
+  end
 
-    it "DAV_HEADERS includes addressbook" do
-      Protocol::Caldav::Constants::DAV_HEADERS['dav'].should.include 'addressbook'
-    end
+  it "DAV_HEADERS includes addressbook" do
+    Protocol::Caldav::Constants::DAV_HEADERS['dav'].should.include 'addressbook'
+  end
 
-    it "defines all required namespace URIs" do
-      Protocol::Caldav::Constants::DAV_NS.should.equal 'DAV:'
-      Protocol::Caldav::Constants::CALDAV_NS.should.equal 'urn:ietf:params:xml:ns:caldav'
-      Protocol::Caldav::Constants::CARDDAV_NS.should.equal 'urn:ietf:params:xml:ns:carddav'
-      Protocol::Caldav::Constants::CALSERVER_NS.should.equal 'http://calendarserver.org/ns/'
-    end
+  it "defines all required namespace URIs" do
+    Protocol::Caldav::Constants::DAV_NS.should.equal 'DAV:'
+    Protocol::Caldav::Constants::CALDAV_NS.should.equal 'urn:ietf:params:xml:ns:caldav'
+    Protocol::Caldav::Constants::CARDDAV_NS.should.equal 'urn:ietf:params:xml:ns:carddav'
+    Protocol::Caldav::Constants::CALSERVER_NS.should.equal 'http://calendarserver.org/ns/'
+  end
 
-    it "defines media types" do
-      Protocol::Caldav::Constants::CALENDAR_MEDIA_TYPE.should.equal 'text/calendar'
-      Protocol::Caldav::Constants::VCARD_MEDIA_TYPE.should.equal 'text/vcard'
-    end
+  it "defines media types" do
+    Protocol::Caldav::Constants::CALENDAR_MEDIA_TYPE.should.equal 'text/calendar'
+    Protocol::Caldav::Constants::VCARD_MEDIA_TYPE.should.equal 'text/vcard'
   end
 end

data/lib/protocol/caldav/content_line.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
-
 module Protocol
   module Caldav
     module ContentLine
@@ -31,124 +28,130 @@ module Protocol
           end
         end
 
-        return nil unless colon_idx
-
-        left = line[0...colon_idx]
-        value = line[(colon_idx + 1)..]
-
-        parts = split_params(left)
-        name = parts.shift
-        params = {}
-        parts.each do |param_str|
-          key, val = param_str.split('=', 2)
-          next unless key
-          val = val[1..-2] if val&.start_with?('"') && val&.end_with?('"')
-          params[key.upcase] = val || ''
+        if colon_idx
+          left = line[0...colon_idx]
+          value = line[(colon_idx + 1)..]
+          parts = split_params(left)
+          name = parts.shift
+          params = {}
+          parts.each do |param_str|
+            key, val = param_str.split('=', 2)
+            unless key
+              next
+            end
+            if val&.start_with?('"') && val&.end_with?('"')
+              val = val[1..-2]
+            end
+            params[key.upcase] = val || ''
+          end
+          [name, params, value]
+        else
+          nil
         end
-
-        [name, params, value]
       end
 
       # Split the left side of a content line by semicolons,
       # respecting quoted values.
       def split_params(str)
-        parts = []
-        current = +''
-        in_quotes = false
+        [].tap do |parts|
+          current = +''
+          in_quotes = false
+
+          str.each_char do |ch|
+            if ch == '"'
+              in_quotes = !in_quotes
+              current << ch
+            elsif ch == ';' && !in_quotes
+              parts << current
+              current = +''
+            else
+              current << ch
+            end
+          end
 
-        str.each_char do |ch|
-          if ch == '"'
-            in_quotes = !in_quotes
-            current << ch
-          elsif ch == ';' && !in_quotes
+          unless current.empty?
             parts << current
-            current = +''
-          else
-            current << ch
           end
         end
-        parts << current unless current.empty?
-        parts
       end
     end
   end
 end
 
+__END__
 
-test do
-  describe "Protocol::Caldav::ContentLine" do
-    describe ".unfold" do
-      it "unfolds CRLF SPACE continuations" do
-        Protocol::Caldav::ContentLine.unfold("SUMMARY:Annual\r\n planning").should.equal "SUMMARY:Annualplanning"
-      end
+describe "Protocol::Caldav::ContentLine" do
+  describe ".unfold" do
+    it "unfolds CRLF SPACE continuations" do
+      Protocol::Caldav::ContentLine.unfold("SUMMARY:Annual\r\n planning").should.equal "SUMMARY:Annualplanning"
+    end
 
-      it "unfolds CRLF TAB continuations" do
-        Protocol::Caldav::ContentLine.unfold("SUMMARY:Annual\r\n\tplanning").should.equal "SUMMARY:Annualplanning"
-      end
+    it "unfolds CRLF TAB continuations" do
+      Protocol::Caldav::ContentLine.unfold("SUMMARY:Annual\r\n\tplanning").should.equal "SUMMARY:Annualplanning"
+    end
 
-      it "does not unfold CRLF followed by non-whitespace" do
-        result = Protocol::Caldav::ContentLine.unfold("SUMMARY:A\r\nDTSTART:B")
-        result.should.equal "SUMMARY:A\nDTSTART:B"
-      end
+    it "does not unfold CRLF followed by non-whitespace" do
+      result = Protocol::Caldav::ContentLine.unfold("SUMMARY:A\r\nDTSTART:B")
+      result.should.equal "SUMMARY:A\nDTSTART:B"
+    end
 
-      it "removes the space/tab character (not kept in value)" do
-        Protocol::Caldav::ContentLine.unfold("X:hello\r\n world").should.equal "X:helloworld"
-      end
+    it "removes the space/tab character (not kept in value)" do
+      Protocol::Caldav::ContentLine.unfold("X:hello\r\n world").should.equal "X:helloworld"
+    end
 
-      it "handles three consecutive folded lines" do
-        Protocol::Caldav::ContentLine.unfold("X:a\r\n b\r\n c").should.equal "X:abc"
-      end
+    it "handles three consecutive folded lines" do
+      Protocol::Caldav::ContentLine.unfold("X:a\r\n b\r\n c").should.equal "X:abc"
+    end
 
-      it "handles LF-only line endings" do
-        Protocol::Caldav::ContentLine.unfold("X:a\n b").should.equal "X:ab"
-      end
+    it "handles LF-only line endings" do
+      Protocol::Caldav::ContentLine.unfold("X:a\n b").should.equal "X:ab"
     end
+  end
 
-    describe ".parse_line" do
-      it "parses a property with no parameters" do
-        name, params, value = Protocol::Caldav::ContentLine.parse_line("SUMMARY:Hello")
-        name.should.equal "SUMMARY"
-        params.should.equal({})
-        value.should.equal "Hello"
-      end
+  describe ".parse_line" do
+    it "parses a property with no parameters" do
+      name, params, value = Protocol::Caldav::ContentLine.parse_line("SUMMARY:Hello")
+      name.should.equal "SUMMARY"
+      params.should.equal({})
+      value.should.equal "Hello"
+    end
 
-      it "parses a property with one parameter" do
-        name, params, value = Protocol::Caldav::ContentLine.parse_line("DTSTART;TZID=America/New_York:20260101T090000")
-        name.should.equal "DTSTART"
-        params["TZID"].should.equal "America/New_York"
-        value.should.equal "20260101T090000"
-      end
+    it "parses a property with one parameter" do
+      name, params, value = Protocol::Caldav::ContentLine.parse_line("DTSTART;TZID=America/New_York:20260101T090000")
+      name.should.equal "DTSTART"
+      params["TZID"].should.equal "America/New_York"
+      value.should.equal "20260101T090000"
+    end
 
-      it "parses a parameter with a quoted value" do
-        name, params, value = Protocol::Caldav::ContentLine.parse_line('ATTENDEE;CN="Smith, John":mailto:j@e.com')
-        params["CN"].should.equal "Smith, John"
-        value.should.equal "mailto:j@e.com"
-      end
+    it "parses a parameter with a quoted value" do
+      name, params, value = Protocol::Caldav::ContentLine.parse_line('ATTENDEE;CN="Smith, John":mailto:j@e.com')
+      params["CN"].should.equal "Smith, John"
+      value.should.equal "mailto:j@e.com"
+    end
 
-      it "handles a colon inside a quoted parameter value" do
-        name, params, value = Protocol::Caldav::ContentLine.parse_line('X;FOO="a:b":realvalue')
-        params["FOO"].should.equal "a:b"
-        value.should.equal "realvalue"
-      end
+    it "handles a colon inside a quoted parameter value" do
+      name, params, value = Protocol::Caldav::ContentLine.parse_line('X;FOO="a:b":realvalue')
+      params["FOO"].should.equal "a:b"
+      value.should.equal "realvalue"
+    end
 
-      it "handles a property value containing colons" do
-        _, _, value = Protocol::Caldav::ContentLine.parse_line("URL:https://example.com:8080/path")
-        value.should.equal "https://example.com:8080/path"
-      end
+    it "handles a property value containing colons" do
+      _, _, value = Protocol::Caldav::ContentLine.parse_line("URL:https://example.com:8080/path")
+      value.should.equal "https://example.com:8080/path"
+    end
 
-      it "handles an empty property value" do
-        _, _, value = Protocol::Caldav::ContentLine.parse_line("DESCRIPTION:")
-        value.should.equal ""
-      end
+    it "handles an empty property value" do
+      _, _, value = Protocol::Caldav::ContentLine.parse_line("DESCRIPTION:")
+      value.should.equal ""
+    end
 
-      it "returns nil for a line with no colon" do
-        Protocol::Caldav::ContentLine.parse_line("NOCOLON").should.be.nil
-      end
+    it "returns nil for a line with no colon" do
+      Protocol::Caldav::ContentLine.parse_line("NOCOLON").should.be.nil
+    end
 
-      it "uppercases parameter names" do
-        _, params, _ = Protocol::Caldav::ContentLine.parse_line("X;tzid=utc:val")
-        params.key?("TZID").should.equal true
-      end
+    it "uppercases parameter names" do
+      _, params, _ = Protocol::Caldav::ContentLine.parse_line("X;tzid=utc:val")
+      params.key?("TZID").should.equal true
     end
   end
 end