async-caldav 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d7c0fb4e8401d178d2d34ed20d3b2581d03abe4faa7e91d1d7daca09a2b4747
-  data.tar.gz: 854dab74930bc90b545748eb1ec4c7e5ddd8cbca0971d473e6df5d7c852fc2f8
+  metadata.gz: 971fb69146a93d8657e1c629d81ea95faf49749d0cecffaef4b05338d7cf44b2
+  data.tar.gz: bcfd995444a48137f9de0d7d1b1fa9e60f6a161bb8b84b0da8a30368d67ce1e1
 SHA512:
-  metadata.gz: f6d336add0343d5ac74da5f26ad5d3c7c8ce13ad1c43e34358d84b2add094b3dfc67faa22a382924c24cb8849101a9254542a17c77c94122742357da9c131505
-  data.tar.gz: f408de6047fd41a3980dd3fe15ffcb998b3a05159809ea74ca6ba50ffea6192f774a9e76d293160947bfd5ef289b633939b0e3cbec264609d6bd303dd74a5828
+  metadata.gz: b7b37b620996b985bbc5052dcfe3e9124bc0377dc924ccdae9e638de8cdda943eae064a39246294bb0e8e139daa410d68531057cf39dab0cc75482efeb4605a8
+  data.tar.gz: e023fd085b489d0d45ee3c8cdc3a5d8bfa4c068ee5a6129381f51a6994fdb980f4b4d0d935be01383ab99518fe56207759189724b9b4c48dc019ed0d86bf6162

data/lib/async/caldav/client/addressbook.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
 require "builder"
 
 module Async
@@ -21,20 +19,28 @@ module Async
           x.instruct! :xml, version: "1.0", encoding: "UTF-8"
           x.tag!("cr:addressbook-query", "xmlns:d" => "DAV:", "xmlns:cr" => "urn:ietf:params:xml:ns:carddav") do
             x.tag!("d:prop") { x.tag!("d:getetag"); x.tag!("cr:address-data") }
-            x << filter if filter
+            if filter
+              x << filter
+            end
           end
           body = x.target!
 
           status, _, resp_body = @client.request('REPORT', @path, body: body, headers: { 'Content-Type' => 'text/xml' })
-          raise Error, "REPORT failed: #{status}" unless status == 207
+          unless status == 207
+            raise Error, "REPORT failed: #{status}"
+          end
 
           @client.parse_multistatus_items(resp_body, data_tag: 'address-data')
         end
 
         def put_contact(filename, body, if_match: nil, if_none_match: nil)
           headers = { 'Content-Type' => 'text/vcard' }
-          headers['If-Match'] = if_match if if_match
-          headers['If-None-Match'] = if_none_match if if_none_match
+          if if_match
+            headers['If-Match'] = if_match
+          end
+          if if_none_match
+            headers['If-None-Match'] = if_none_match
+          end
 
           path = "#{@path}#{filename}"
           status, resp_headers, = @client.request('PUT', path, body: body, headers: headers)
@@ -92,15 +98,21 @@ module Async
           x.tag!("d:propertyupdate", "xmlns:d" => "DAV:") do
             x.tag!("d:set") do
               x.tag!("d:prop") do
-                x.tag!("d:displayname", displayname) if displayname
+                if displayname
+                  x.tag!("d:displayname", displayname)
+                end
               end
             end
           end
 
           status, = @client.request('PROPPATCH', @path, body: x.target!, headers: { 'Content-Type' => 'text/xml' })
-          raise Error, "PROPPATCH failed: #{status}" unless status == 207
+          unless status == 207
+            raise Error, "PROPPATCH failed: #{status}"
+          end
 
-          @displayname = displayname if displayname
+          if displayname
+            @displayname = displayname
+          end
           self
         end
       end

data/lib/async/caldav/client/calendar.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "scampi"
 require "builder"
 
 module Async
@@ -24,20 +22,28 @@ module Async
           x.instruct! :xml, version: "1.0", encoding: "UTF-8"
           x.tag!("c:calendar-query", "xmlns:d" => "DAV:", "xmlns:c" => "urn:ietf:params:xml:ns:caldav") do
             x.tag!("d:prop") { x.tag!("d:getetag"); x.tag!("c:calendar-data") }
-            x << filter if filter
+            if filter
+              x << filter
+            end
           end
           body = x.target!
 
           status, _, resp_body = @client.request('REPORT', @path, body: body, headers: { 'Content-Type' => 'text/xml' })
-          raise Error, "REPORT failed: #{status}" unless status == 207
+          unless status == 207
+            raise Error, "REPORT failed: #{status}"
+          end
 
           @client.parse_multistatus_items(resp_body, data_tag: 'calendar-data')
         end
 
         def put_event(filename, body, if_match: nil, if_none_match: nil)
           headers = { 'Content-Type' => 'text/calendar' }
-          headers['If-Match'] = if_match if if_match
-          headers['If-None-Match'] = if_none_match if if_none_match
+          if if_match
+            headers['If-Match'] = if_match
+          end
+          if if_none_match
+            headers['If-None-Match'] = if_none_match
+          end
 
           path = "#{@path}#{filename}"
           status, resp_headers, = @client.request('PUT', path, body: body, headers: headers)
@@ -91,7 +97,9 @@ module Async
 
         def propfind
           status, _, body = @client.request('PROPFIND', @path, headers: { 'Depth' => '0' })
-          raise Error, "PROPFIND failed: #{status}" unless status == 207
+          unless status == 207
+            raise Error, "PROPFIND failed: #{status}"
+          end
           @client.parse_collection_props(body)
         end
 
@@ -101,19 +109,33 @@ module Async
           x.tag!("d:propertyupdate", "xmlns:d" => "DAV:", "xmlns:c" => "urn:ietf:params:xml:ns:caldav", "xmlns:x" => "http://apple.com/ns/ical/") do
             x.tag!("d:set") do
               x.tag!("d:prop") do
-                x.tag!("d:displayname", displayname) if displayname
-                x.tag!("c:calendar-description", description) if description
-                x.tag!("x:calendar-color", color) if color
+                if displayname
+                  x.tag!("d:displayname", displayname)
+                end
+                if description
+                  x.tag!("c:calendar-description", description)
+                end
+                if color
+                  x.tag!("x:calendar-color", color)
+                end
               end
             end
           end
 
           status, = @client.request('PROPPATCH', @path, body: x.target!, headers: { 'Content-Type' => 'text/xml' })
-          raise Error, "PROPPATCH failed: #{status}" unless status == 207
+          unless status == 207
+            raise Error, "PROPPATCH failed: #{status}"
+          end
 
-          @displayname = displayname if displayname
-          @description = description if description
-          @color = color if color
+          if displayname
+            @displayname = displayname
+          end
+          if description
+            @description = description
+          end
+          if color
+            @color = color
+          end
           self
         end
 
@@ -135,7 +157,9 @@ module Async
           if status == 403
             raise InvalidSyncToken, "Invalid sync token"
           end
-          raise Error, "REPORT failed: #{status}" unless status == 207
+          unless status == 207
+            raise Error, "REPORT failed: #{status}"
+          end
 
           new_token = resp_body.match(/<[^>]*sync-token[^>]*>([^<]+)</)[1] rescue nil
           items = @client.parse_sync_items(resp_body)