sabredav_client 0.2.1 → 0.2.2

data/lib/sabredav_client/request.rb

@@ -1,97 +1,97 @@
-module SabredavClient
-  class Request
-    attr_accessor :path
-    attr_reader :client, :request, :http
-
-    def initialize(method, client, path)
-      @client  = client
-      @path    = "#{client.base_path}/#{path}"
-      @http    = build_http
-      @request = build_request(method)
-
-      add_auth
-    end
-
-    def add_body(body)
-      request.body = body
-    end
-
-    def add_header(data)
-      request['Content-Length']  = data[:content_length]  if data[:content_length]
-      request['If-Match']        = data[:if_match]        if data[:if_match]
-      request['Content-Type']    = data[:content_type]    if data[:content_type]
-      request['DAV']             = data[:dav]             if data[:dav]
-    end
-
-    def run
-      @http.request(request)
-    end
-
-    private
-
-    def build_http
-      unless client.proxy_uri
-        http = Net::HTTP.new(client.host, client.port)
-      else
-        http = Net::HTTP.new(client.host, client.port, client.proxy_host, client.proxy_port)
-      end
-
-      if client.ssl
-        http.use_ssl = client.ssl
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
-      http
-    end
-
-    def build_request(method)
-      case method
-      when :get
-        Net::HTTP::Get.new(path)
-      when :post
-        Net::HTTP::Post.new(path)
-      when :put
-        Net::HTTP::Put.new(path)
-      when :delete
-        Net::HTTP::Delete.new(path)
-      when :propfind
-        Net::HTTP::Propfind.new(path)
-      when :proppatch
-        Net::HTTP::Proppatch.new(path)
-      when :report
-        Net::HTTP::Report.new(path)
-      when :mkcalendar
-        Net::HTTP::Mkcalendar.new(path)
-      when :mkcol
-        Net::HTTP::Mkcol.new(path)
-      else
-        raise SabredavClient::Errors::HTTPMethodNotSupportedError, method
-      end
-    end
-
-    def add_auth
-      unless client.authtype == 'digest'
-        request.basic_auth client.user, client.password
-      else
-        request.add_field 'Authorization', digestauth(method.to_s.upcase)
-      end
-    end
-
-    def digestauth
-      h = Net::HTTP.new client.duri.host, client.duri.port
-
-      if client.ssl
-        h.use_ssl = client.ssl
-        h.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-
-      req = Net::HTTP::Get.new client.duri.request_uri
-      res = h.request req
-      # res is a 401 response with a WWW-Authenticate header
-
-      auth = client.digest_auth.auth_header client.duri, res['www-authenticate'], method
-
-      return auth
-    end
-  end
-end
+module SabredavClient
+  class Request
+    attr_accessor :path
+    attr_reader :client, :request, :http
+
+    def initialize(method, client, path)
+      @client  = client
+      @path    = "#{client.base_path}/#{path}"
+      @http    = build_http
+      @request = build_request(method)
+
+      add_auth
+    end
+
+    def add_body(body)
+      request.body = body
+    end
+
+    def add_header(data)
+      request['Content-Length']  = data[:content_length]  if data[:content_length]
+      request['If-Match']        = data[:if_match]        if data[:if_match]
+      request['Content-Type']    = data[:content_type]    if data[:content_type]
+      request['DAV']             = data[:dav]             if data[:dav]
+    end
+
+    def run
+      @http.request(request)
+    end
+
+    private
+
+    def build_http
+      unless client.proxy_uri
+        http = Net::HTTP.new(client.host, client.port)
+      else
+        http = Net::HTTP.new(client.host, client.port, client.proxy_host, client.proxy_port)
+      end
+
+      if client.ssl
+        http.use_ssl = client.ssl
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      http
+    end
+
+    def build_request(method)
+      case method
+      when :get
+        Net::HTTP::Get.new(path)
+      when :post
+        Net::HTTP::Post.new(path)
+      when :put
+        Net::HTTP::Put.new(path)
+      when :delete
+        Net::HTTP::Delete.new(path)
+      when :propfind
+        Net::HTTP::Propfind.new(path)
+      when :proppatch
+        Net::HTTP::Proppatch.new(path)
+      when :report
+        Net::HTTP::Report.new(path)
+      when :mkcalendar
+        Net::HTTP::Mkcalendar.new(path)
+      when :mkcol
+        Net::HTTP::Mkcol.new(path)
+      else
+        raise SabredavClient::Errors::HTTPMethodNotSupportedError, method
+      end
+    end
+
+    def add_auth
+      unless client.authtype == 'digest'
+        request.basic_auth client.user, client.password
+      else
+        request.add_field 'Authorization', digestauth(method.to_s.upcase)
+      end
+    end
+
+    def digestauth
+      h = Net::HTTP.new client.duri.host, client.duri.port
+
+      if client.ssl
+        h.use_ssl = client.ssl
+        h.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      req = Net::HTTP::Get.new client.duri.request_uri
+      res = h.request req
+      # res is a 401 response with a WWW-Authenticate header
+
+      auth = client.digest_auth.auth_header client.duri, res['www-authenticate'], method
+
+      return auth
+    end
+  end
+end

data/lib/sabredav_client/version.rb

@@ -1,3 +1,3 @@
-module SabredavClient
-  VERSION="0.2.1"
-end
+module SabredavClient
+  VERSION="0.2.2"
+end

data/lib/sabredav_client/xml_request_builder.rb

@@ -1,7 +1,7 @@
-require 'builder'
-
-['base.rb', 'propfind_calendar.rb', 'mkcalendar.rb', 'post_sharing.rb', 'report_vevent.rb', 'report_vtodo.rb', 'mkcol_principal.rb',
-'report_event_changes.rb', 'propfind_owner.rb', 'proppatch_events_owner.rb', 'propfind_invite.rb', 'proppatch_principal.rb',
-'proppatch_calendar.rb'].each do |f|
-    require File.join( File.dirname(__FILE__), 'xml_request_builder', f )
-end
+require 'builder'
+
+['base.rb', 'propfind_calendar.rb', 'mkcalendar.rb', 'post_sharing.rb', 'report_vevent.rb', 'report_vtodo.rb', 'mkcol_principal.rb',
+'report_event_changes.rb', 'propfind_owner.rb', 'proppatch_events_owner.rb', 'propfind_invite.rb', 'proppatch_principal.rb',
+'proppatch_calendar.rb'].each do |f|
+    require File.join( File.dirname(__FILE__), 'xml_request_builder', f )
+end

data/lib/sabredav_client/xml_request_builder/base.rb

@@ -1,17 +1,17 @@
-module SabredavClient
-  module XmlRequestBuilder
-
-    NAMESPACE = {"xmlns:d" => 'DAV:'}
-    C_NAMESPACES = {"xmlns:d" => 'DAV:', "xmlns:c" => "urn:ietf:params:xml:ns:caldav"}
-    CS_NAMESPACES = {"xmlns:d" => 'DAV:', "xmlns:cs" => "http://calendarserver.org/ns/"}
-    SB_NAMESPACES = {"xmlns:d" => 'DAV:', "xmlns:sb" =>  "http://sabredav.org/ns"}
-
-    class Base
-      def initialize
-        @xml = Builder::XmlMarkup.new(indent: 2)
-        @xml.instruct!
-      end
-      attr :xml
-    end
-  end
-end
+module SabredavClient
+  module XmlRequestBuilder
+
+    NAMESPACE = {"xmlns:d" => 'DAV:'}
+    C_NAMESPACES = {"xmlns:d" => 'DAV:', "xmlns:c" => "urn:ietf:params:xml:ns:caldav"}
+    CS_NAMESPACES = {"xmlns:d" => 'DAV:', "xmlns:cs" => "http://calendarserver.org/ns/"}
+    SB_NAMESPACES = {"xmlns:d" => 'DAV:', "xmlns:sb" =>  "http://sabredav.org/ns"}
+
+    class Base
+      def initialize
+        @xml = Builder::XmlMarkup.new(indent: 2)
+        @xml.instruct!
+      end
+      attr :xml
+    end
+  end
+end

data/lib/sabredav_client/xml_request_builder/mkcalendar.rb

@@ -1,25 +1,25 @@
-module SabredavClient
-  module XmlRequestBuilder
-
-    class Mkcalendar < Base
-      attr_accessor :displayname, :description
-
-      def initialize(displayname = nil, description = nil)
-        @displayname = displayname
-        @description = description
-        super()
-      end
-
-      def to_xml
-        xml.c :mkcalendar, C_NAMESPACES do
-          xml.d :set do
-            xml.d :prop do
-              xml.d :displayname, displayname unless displayname.to_s.empty?
-              xml.tag! "c:calendar-description", description, "xml:lang" => "en" unless description.to_s.empty?
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module SabredavClient
+  module XmlRequestBuilder
+
+    class Mkcalendar < Base
+      attr_accessor :displayname, :description
+
+      def initialize(displayname = nil, description = nil)
+        @displayname = displayname
+        @description = description
+        super()
+      end
+
+      def to_xml
+        xml.c :mkcalendar, C_NAMESPACES do
+          xml.d :set do
+            xml.d :prop do
+              xml.d :displayname, displayname unless displayname.to_s.empty?
+              xml.tag! "c:calendar-description", description, "xml:lang" => "en" unless description.to_s.empty?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sabredav_client/xml_request_builder/mkcol_principal.rb

@@ -1,28 +1,28 @@
-module SabredavClient
-  module XmlRequestBuilder
-
-    class MkcolPrincipal < Base
-      attr_accessor  :email, :displayname
-
-      def initialize(email,displayname)
-        @email = email
-        @displayname = displayname
-        super()
-      end
-
-      def to_xml
-        xml.d :mkcol, SB_NAMESPACES do
-          xml.d :set do
-            xml.d :prop do
-              xml.d :resourcetype do
-               xml.d :principal
-             end
-              xml.d :displayname, displayname unless displayname.to_s.empty?
-              xml.tag! "sb:email-address", email
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module SabredavClient
+  module XmlRequestBuilder
+
+    class MkcolPrincipal < Base
+      attr_accessor  :email, :displayname
+
+      def initialize(email,displayname)
+        @email = email
+        @displayname = displayname
+        super()
+      end
+
+      def to_xml
+        xml.d :mkcol, SB_NAMESPACES do
+          xml.d :set do
+            xml.d :prop do
+              xml.d :resourcetype do
+               xml.d :principal
+             end
+              xml.d :displayname, displayname unless displayname.to_s.empty?
+              xml.tag! "sb:email-address", email
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sabredav_client/xml_request_builder/post_sharing.rb

@@ -1,41 +1,41 @@
-module SabredavClient
-  module XmlRequestBuilder
-
-    class PostSharing < Base
-      attr_accessor :adds, :removes, :summary, :privilege, :common_name
-
-      def initialize(adds, summary, common_name, privilege, removes)
-        @adds = adds
-        @summary = summary
-        @privilege = privilege
-        @common_name = common_name
-        @removes = removes
-        super()
-      end
-
-      def to_xml
-        xml.cs :share, CS_NAMESPACES do
-          unless adds.empty?
-            adds.each do |add|
-              add = "mailto:#{add}"
-              xml.cs :set do
-                xml.d :href, add
-                xml.cs :summary, summary unless summary.nil?
-                xml.tag! "cs:common-name", common_name unless common_name.nil?
-                xml.tag! "cs:#{privilege}"
-              end
-            end
-          end
-          unless removes.empty?
-            removes.each do |remove|
-              remove = "mailto:#{remove}"
-              xml.cs :remove do
-                xml.d :href, remove
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module SabredavClient
+  module XmlRequestBuilder
+
+    class PostSharing < Base
+      attr_accessor :adds, :removes, :summary, :privilege, :common_name
+
+      def initialize(adds, summary, common_name, privilege, removes)
+        @adds = adds
+        @summary = summary
+        @privilege = privilege
+        @common_name = common_name
+        @removes = removes
+        super()
+      end
+
+      def to_xml
+        xml.cs :share, CS_NAMESPACES do
+          unless adds.empty?
+            adds.each do |add|
+              add = "mailto:#{add}"
+              xml.cs :set do
+                xml.d :href, add
+                xml.cs :summary, summary unless summary.nil?
+                xml.tag! "cs:common-name", common_name unless common_name.nil?
+                xml.tag! "cs:#{privilege}"
+              end
+            end
+          end
+          unless removes.empty?
+            removes.each do |remove|
+              remove = "mailto:#{remove}"
+              xml.cs :remove do
+                xml.d :href, remove
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sabredav_client/xml_request_builder/propfind_calendar.rb

@@ -1,41 +1,41 @@
-module SabredavClient
-  module XmlRequestBuilder
-    class PROPFINDCalendar < Base
-      attr_reader :properties
-
-      PROPERTIES = {
-        displayname: :d,
-        getctag: :cs,
-        sync_token: :d
-      }
-
-      def initialize(properties:)
-        @properties = properties
-        super()
-      end
-
-      def to_xml
-        xml.d :propfind, CS_NAMESPACES do
-          xml.d :prop do
-            build_properties
-          end
-        end
-      end
-
-      def build_properties
-        properties.each do |property|
-          raise SabredavClient::Errors::PropertyNotSupportedError, "Known properties are #{PROPERTIES}" unless PROPERTIES.keys.include?(property)
-
-          readable_property = property.to_s.gsub('_', '-').to_sym
-
-          case PROPERTIES[property]
-          when :d
-            xml.d readable_property
-          when :cs
-            xml.cs readable_property
-          end
-        end
-      end
-    end
-  end
-end
+module SabredavClient
+  module XmlRequestBuilder
+    class PROPFINDCalendar < Base
+      attr_reader :properties
+
+      PROPERTIES = {
+        displayname: :d,
+        getctag: :cs,
+        sync_token: :d
+      }
+
+      def initialize(properties:)
+        @properties = properties
+        super()
+      end
+
+      def to_xml
+        xml.d :propfind, CS_NAMESPACES do
+          xml.d :prop do
+            build_properties
+          end
+        end
+      end
+
+      def build_properties
+        properties.each do |property|
+          raise SabredavClient::Errors::PropertyNotSupportedError, "Known properties are #{PROPERTIES}" unless PROPERTIES.keys.include?(property)
+
+          readable_property = property.to_s.gsub('_', '-').to_sym
+
+          case PROPERTIES[property]
+          when :d
+            xml.d readable_property
+          when :cs
+            xml.cs readable_property
+          end
+        end
+      end
+    end
+  end
+end