viewpoint 0.1.4 → 0.1.5fix

data/Rakefile

@@ -33,7 +33,8 @@ GEMSPEC = Gem::Specification.new do |gem|
   gem.add_runtime_dependency  'nokogiri'
   gem.add_runtime_dependency  'httpclient'
   gem.add_runtime_dependency  'rubyntlm'
-  gem.add_runtime_dependency  'icalendar'
+  gem.add_runtime_dependency  'icalendar', '>= 1.1.5'
+  gem.add_runtime_dependency  'mail', '>= 2.2.5'
 end
  
 Rake::GemPackageTask.new(GEMSPEC) do |pkg|

data/TODO

@@ -1,10 +1,17 @@
+h2. TODOS
 
-- Automate "deepening" of Model objects by over-riding method_missing
-  … if object.is_shallow? && all_methods.index(method)
-      deepen!
-    else
-      raise the NoMethod error
+* Automate "deepening" of Model objects by over-riding method_missing
 
-- Clean-up exceptions.  There is exception raising in the Model that will never ocurr because it is already being checked for in the Parser
+<pre>
+if object.is_shallow? && all_methods.index(method)
+  deepen!
+else
+  raise the NoMethod error
+</pre>
 
-- Refactor #find_folders methods.  There is a lot of duplicate code right now and it could be simplified quite a bit.
+* Clean-up exceptions.  There is exception raising in the Model that will never ocurr because it is already being checked for in the Parser
+
+* Refactor #find_folders methods.  There is a lot of duplicate code right now and it could be simplified quite a bit.
+
+* Test TODO
+** Test for undefined methods and make sure the method_missing method isn't causing problems

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5fix

data/lib/model/file_attachment.rb

@@ -24,6 +24,7 @@ module Viewpoint
     # to a file withthe #save_to_file method.
     class FileAttachment < Attachment
 
+      attr_reader :file_name, :content
       # @param [String] attachment_id The unique ID for the attachment.
       def initialize(attachment_id)
         @id = attachment_id

data/lib/model/generic_folder.rb

@@ -214,20 +214,27 @@ module Viewpoint
 
       def todays_items
         #opts = {:query_string => ["Received:today"]}
-        items_since(Date.today.to_datetime)
+        #This is a bit convoluted for pre-1.9.x ruby versions that don't support to_datetime
+        items_since(DateTime.parse(Date.today.to_s))
       end
 
       def items_since(date_time)
         restr = {:restriction =>
           {:is_greater_than_or_equal_to => 
-            {:field_uRI => {:field_uRI=>'item:DateTimeReceived'}, :field_uRI_or_constant =>{:constant => {:value=>date_time}}}}}
+            [{:field_uRI => {:field_uRI=>'item:DateTimeReceived'}},
+            {:field_uRI_or_constant =>{:constant => {:value=>date_time}}}]
+          }}
         find_items(restr)
       end
 
       def items_between(start_date, end_date)
         restr = {:restriction =>  {:and => [
-          {:is_greater_than_or_equal_to => {:field_uRI => {:field_uRI=>'item:DateTimeReceived'},:field_uRI_or_constant=>{:constant => {:value =>start_date}}}},
-          {:is_less_than_or_equal_to => {:field_uRI => {:field_uRI=>'item:DateTimeReceived'},:field_uRI_or_constant=>{:constant => {:value =>end_date}}}}
+          {:is_greater_than_or_equal_to => 
+            [{:field_uRI => {:field_uRI=>'item:DateTimeReceived'}},
+            {:field_uRI_or_constant=>{:constant => {:value =>start_date}}}]},
+          {:is_less_than_or_equal_to =>
+            [{:field_uRI => {:field_uRI=>'item:DateTimeReceived'}},
+            {:field_uRI_or_constant=>{:constant => {:value =>end_date}}}]}
         ]}}
         find_items(restr)
       end

data/lib/model/item.rb

@@ -55,7 +55,7 @@ module Viewpoint
         {:id => resp.items.first[:attachment_id][:root_item_id], :change_key => resp.items.first[:attachment_id][:root_item_change_key]}
       end
 
-      attr_reader :item_id, :change_key, :body_type
+      attr_reader :item_id, :change_key
       alias :id :item_id
 
       # Initialize an Exchange Web Services item
@@ -118,20 +118,26 @@ module Viewpoint
       # Return the attachments for this Item
       # @return [Array,Attachment] An array of Attachments for this Item
       def attachments
+        # TODO: should an exception be raised if someone calls this method without first
+        # checking has_attachments?
         return [] unless has_attachments?
+
+        # If we've already called this don't waste the time to process attachments again.
+        return @attachments if defined?(@attachments)
+
         deepen!
-        attmts = []
+        @attachments = []
         @ews_item[:attachments].each_pair do |k,v|
           # k should be file_attachment or item_attachment
           if(v.is_a?(Hash))
-            attmts << (eval "#{k.to_s.camel_case}.new(v[:attachment_id][:id])")
+            @attachments << (eval "#{k.to_s.camel_case}.new(v[:attachment_id][:id])")
           else
             v.each do |att|
-              attmts << (eval "#{k.to_s.camel_case}.new(att[:attachment_id][:id])")
+              @attachments << (eval "#{k.to_s.camel_case}.new(att[:attachment_id][:id])")
             end
           end
         end
-        attmts
+        @attachments
       end
 
       # Delete this item
@@ -181,6 +187,7 @@ module Viewpoint
         define_str_var :subject, :sensitivity, :body, :item_class, :importance, :in_reply_to, :unique_body
         define_str_var :display_cc, :display_to, :culture, :last_modified_name, :mime_content
         define_str_var :web_client_read_form_query_string, :web_client_edit_form_query_string
+        define_attr_str_var :body, :body_type
         define_int_var :size, :reminder_minutes_before_start
         define_bool_var :has_attachments, :is_submitted, :is_draft, :is_from_me, :is_resend, :is_unmodified, :reminder_is_set, :is_associated
         define_datetime_var :date_time_sent, :date_time_created, :date_time_received, :reminder_due_by, :last_modified_time
@@ -192,6 +199,7 @@ module Viewpoint
           send(m, *args, &block)
         else
           warn "!!! No such method: #{m}"
+          nil
         end
       end
 

data/lib/model/message.rb

@@ -73,6 +73,7 @@ module Viewpoint
       def headers
         deepen! if @shallow
         return @headers if defined?(@headers) && !@headers.empty?
+        return nil unless @ews_item.has_key?(:internet_message_headers)
         @headers = {}
         # @todo When ruby 1.9 becomes more pervasive the Enumerator#each_with_object
         #@headers ||= @ews_item[:internet_message_headers][:internet_message_header].each_with_object({}) do |h,obj|
@@ -82,6 +83,40 @@ module Viewpoint
         @headers
       end
 
+
+      # This creates an object of type Mail (mail gem) and allows us to
+      # manipulate and output Message Items in standards compliant ways.
+      # @see http://www.ietf.org/rfc/rfc2822.txt
+      def to_mail
+        mail = Mail.new
+        unless(headers.nil?)
+          mail.received  headers['Received']
+          mail.content_type headers['Content-Type']
+          mail.content_transfer_encoding headers['Content-Transfer-Encoding']
+        end
+        mail.message_id internet_message_id unless internet_message_id.nil?
+        mail.in_reply_to in_reply_to unless in_reply_to.nil?
+        mail.references references unless references.nil?
+        mail.subject subject unless subject.nil?
+        mail.return_path = sender.email_address unless sender.nil?
+        mail.to to_recipients.map {|r| r.email_address} unless to_recipients.nil?
+        mail.cc cc_recipients.map {|r| r.email_address} unless cc_recipients.nil?
+        mail.from from.email_address unless from.nil?
+        # Because the mail gem does not pass an object to the block there are some issues with using self
+        msg = self
+        if(body_type == "HTML")
+          mail.html_part do
+            body msg.body
+          end
+        else
+          mail.text_part do
+            body msg.body
+          end
+        end
+        mail
+      end
+
+
       private
 
       def init_methods

data/lib/model/model.rb

@@ -44,12 +44,19 @@ module Viewpoint
 
       protected
 
+      # Define a method that returns a string.  The vars are the keys in the 
+      # hash that contain a :text key.  In the original SOAP packet this would
+      # look something like this:
+      # @example
+      #   <method_name>
+      #      This is the text
+      #   </method_name>
       def define_str_var(*vars)
         vars.each do |var|
           if(@ews_item[var])
             @ews_methods << var
             self.instance_eval <<-EOF
-            def #{var.to_s}
+            def #{var}
               @ews_item[:#{var}][:text]
             end
             EOF
@@ -58,7 +65,30 @@ module Viewpoint
           end
         end
       end
+
+      # This is similar to the #define_str_var method except of the text value
+      # is from an XML attribute in the original SOAP so the text won't be pointed
+      # to by :text.  In the orignal SOAP it may have looked like this:
+      # @example
+      #   <node my_method='this is the text'/>
+      # @param
+      def define_attr_str_var(parent, *vars)
+        return unless @ews_item[parent]
+        vars.each do |var|
+          if(@ews_item[parent][var])
+            @ews_methods << var
+            self.instance_eval <<-EOF
+            def #{var}
+              @ews_item[:#{parent}][:#{var}]
+            end
+            EOF
+          else
+            @ews_methods_undef << var
+          end
+        end
+      end
       
+
       def define_int_var(*vars)
         vars.each do |var|
           if(@ews_item[var])

data/lib/soap/handsoap/ews_service.rb

@@ -32,6 +32,7 @@ module Viewpoint
         SOAP_ACTION_PREFIX = "http://schemas.microsoft.com/exchange/services/2006/messages"
 
         @@raw_soap = false
+        @@http_options = nil
 
         def initialize()
           if $DEBUG
@@ -50,6 +51,15 @@ module Viewpoint
           @@raw_soap = true
         end
 
+        # Set various HTTP options like ssl_ca_trust, etc
+        def self.set_http_options(option_hash)
+          if @@http_options.nil?
+            @@http_options = option_hash
+          else
+            @@http_options.merge!(option_hash)
+          end
+        end
+
         # ********* Begin Hooks *********
 
 
@@ -94,7 +104,7 @@ module Viewpoint
         #   it's numerical ID.  @see http://msdn.microsoft.com/en-us/library/aa565998.aspx
         def resolve_names(name, full_contact_data = true, opts = {})
           action = "#{SOAP_ACTION_PREFIX}/ResolveNames"
-          resp = invoke("#{NS_EWS_MESSAGES}:ResolveNames", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:ResolveNames", action) do |root|
             build!(root) do
               root.set_attr('ReturnFullContactData',full_contact_data)
               root.add("#{NS_EWS_MESSAGES}:UnresolvedEntry",name)
@@ -112,7 +122,7 @@ module Viewpoint
         #   taking an e-mail address as an argument
         def expand_dl(dist_email)
           action = "#{SOAP_ACTION_PREFIX}/ExpandDL"
-          resp = invoke("#{NS_EWS_MESSAGES}:ExpandDL", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:ExpandDL", action) do |root|
             build!(root) do
               mailbox!(root, {:email_address => {:text => dist_email}})
             end
@@ -134,7 +144,7 @@ module Viewpoint
         # @param [Hash] opts optional parameters to this method
         def find_folder(parent_folder_ids = [:root], traversal = 'Shallow', folder_shape = {:base_shape => 'Default'}, opts = {})
           action = "#{SOAP_ACTION_PREFIX}/FindFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:FindFolder", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:FindFolder", action) do |root|
             build!(root) do
               restriction = opts.delete(:restriction)
               root.set_attr('Traversal', traversal)
@@ -164,7 +174,7 @@ module Viewpoint
         #   {:calendar_view => {:max_entries_returned => 2, :start => <DateTime Obj>, :end => <DateTime Obj>}}
         def find_item(parent_folder_ids, traversal = 'Shallow', item_shape = {:base_shape => 'Default'}, opts = {})
           action = "#{SOAP_ACTION_PREFIX}/FindItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:FindItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:FindItem", action) do |root|
             build!(root) do
               root.set_attr('Traversal', traversal)
               item_shape!(root, item_shape)
@@ -202,7 +212,7 @@ module Viewpoint
         # @param [Hash] opts optional parameters to this method
         def get_folder(folder_ids, folder_shape = {:base_shape => 'Default'}, act_as = nil)
           action = "#{SOAP_ACTION_PREFIX}/GetFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetFolder", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetFolder", action) do |root|
             build!(root) do
               folder_shape!(root, folder_shape)
               folder_ids!(root, folder_ids, act_as)
@@ -213,7 +223,7 @@ module Viewpoint
 
         def convert_id
           action = "#{SOAP_ACTION_PREFIX}/ConvertId"
-          resp = invoke("#{NS_EWS_MESSAGES}:ConvertId", :soap_action => action) do |convert_id|
+          resp = invoke("#{NS_EWS_MESSAGES}:ConvertId", action) do |convert_id|
             build_convert_id!(convert_id)
           end
           parse_convert_id(resp)
@@ -227,7 +237,7 @@ module Viewpoint
         # @param [Array,String] folder_name The display name for the new folder or folders
         def create_folder(parent_folder_id, folder_name)
           action = "#{SOAP_ACTION_PREFIX}/CreateFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateFolder", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateFolder", action) do |root|
             build!(root) do
               root.add("#{NS_EWS_MESSAGES}:ParentFolderId") do |pfid|
                 folder_id!(pfid, parent_folder_id)
@@ -251,7 +261,7 @@ module Viewpoint
         # @param [String,nil] delete_type Type of delete to do: HardDelete/SoftDelete/MoveToDeletedItems
         def delete_folder(folder_id, delete_type = 'MoveToDeletedItems')
           action = "#{SOAP_ACTION_PREFIX}/DeleteFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:DeleteFolder", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:DeleteFolder", action) do |root|
             build!(root) do
               root.set_attr('DeleteType', delete_type)
               folder_id = (folder_id.is_a?(Array)) ? folder_id : [folder_id]
@@ -263,7 +273,7 @@ module Viewpoint
 
         def update_folder
           action = "#{SOAP_ACTION_PREFIX}/UpdateFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:UpdateFolder", :soap_action => action) do |update_folder|
+          resp = invoke("#{NS_EWS_MESSAGES}:UpdateFolder", action) do |update_folder|
             build_update_folder!(update_folder)
           end
           parse_update_folder(resp)
@@ -271,7 +281,7 @@ module Viewpoint
 
         def move_folder
           action = "#{SOAP_ACTION_PREFIX}/MoveFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:MoveFolder", :soap_action => action) do |move_folder|
+          resp = invoke("#{NS_EWS_MESSAGES}:MoveFolder", action) do |move_folder|
             build_move_folder!(move_folder)
           end
           parse_move_folder(resp)
@@ -279,7 +289,7 @@ module Viewpoint
 
         def copy_folder
           action = "#{SOAP_ACTION_PREFIX}/CopyFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:CopyFolder", :soap_action => action) do |copy_folder|
+          resp = invoke("#{NS_EWS_MESSAGES}:CopyFolder", action) do |copy_folder|
             build_copy_folder!(copy_folder)
           end
           parse_copy_folder(resp)
@@ -299,7 +309,7 @@ module Viewpoint
         #   the PullSubscriptionRequest element.
         def subscribe(folder_ids, event_types, timeout = 10)
           action = "#{SOAP_ACTION_PREFIX}/Subscribe"
-          resp = invoke("#{NS_EWS_MESSAGES}:Subscribe", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:Subscribe", action) do |root|
             build!(root) do
               pull_subscription_request!(folder_ids, event_types, timeout)
             end
@@ -311,7 +321,7 @@ module Viewpoint
         # @see http://msdn.microsoft.com/en-us/library/aa566188.aspx Subscribe on MSDN
         def push_subscribe(folder_ids, event_types, url, watermark=nil, status_frequency=5)
           action = "#{SOAP_ACTION_PREFIX}/Subscribe"
-          resp = invoke("#{NS_EWS_MESSAGES}:Subscribe", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:Subscribe", action) do |root|
             build!(root) do
               push_subscription_request!(folder_ids, event_types, url, watermark, status_frequency)
             end
@@ -326,7 +336,7 @@ module Viewpoint
         # @param [String] subscription_id The Id of the subscription
         def unsubscribe(subscription_id)
           action = "#{SOAP_ACTION_PREFIX}/Unsubscribe"
-          resp = invoke("#{NS_EWS_MESSAGES}:Unsubscribe", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:Unsubscribe", action) do |root|
             build!(root) do
               subscription_id!(root, subscription_id)
             end
@@ -341,7 +351,7 @@ module Viewpoint
         # @param [String] watermark Event bookmark in the events queue
         def get_events(subscription_id, watermark)
           action = "#{SOAP_ACTION_PREFIX}/GetEvents"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetEvents", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetEvents", action) do |root|
             build!(root) do
               subscription_id!(root, subscription_id)
               watermark!(root, watermark)
@@ -352,7 +362,7 @@ module Viewpoint
 
         def sync_folder_hierarchy
           action = "#{SOAP_ACTION_PREFIX}/SyncFolderHierarchy"
-          resp = invoke("#{NS_EWS_MESSAGES}:SyncFolderHierarchy", :soap_action => action) do |sync_folder_hierarchy|
+          resp = invoke("#{NS_EWS_MESSAGES}:SyncFolderHierarchy", action) do |sync_folder_hierarchy|
             build_sync_folder_hierarchy!(sync_folder_hierarchy)
           end
           parse_sync_folder_hierarchy(resp)
@@ -375,7 +385,7 @@ module Viewpoint
         # @param [Hash] opts optional parameters to this method
         def sync_folder_items(folder_id, sync_state = nil, max_changes = 256, item_shape = {:base_shape => 'Default'}, opts = {})
           action = "#{SOAP_ACTION_PREFIX}/SyncFolderItems"
-          resp = invoke("#{NS_EWS_MESSAGES}:SyncFolderItems", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:SyncFolderItems", action) do |root|
             build!(root) do
               item_shape!(root, item_shape)
               root.add("#{NS_EWS_MESSAGES}:SyncFolderId") do |sfid|
@@ -400,7 +410,7 @@ module Viewpoint
         # @param [Hash] opts optional parameters to this method
         def get_item(item_ids, item_shape = {:base_shape => 'Default'})
           action = "#{SOAP_ACTION_PREFIX}/GetItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetItem", action) do |root|
             build!(root) do
               item_shape!(root, item_shape)
               item_ids!(root, item_ids)
@@ -423,7 +433,7 @@ module Viewpoint
         #   See: http://msdn.microsoft.com/en-us/library/aa565209.aspx
         def create_message_item(folder_id, items, message_disposition = 'SaveOnly')
           action = "#{SOAP_ACTION_PREFIX}/CreateItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", :soap_action => action) do |node|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", action) do |node|
             build!(node) do
               create_item!(folder_id, items, message_disposition, send_invites=false, 'message')
             end
@@ -442,7 +452,7 @@ module Viewpoint
         # @param [String] send_invites "SendToNone/SendOnlyToAll/SendToAllAndSaveCopy"
         def create_calendar_item(folder_id, items, send_invites = 'SendToAllAndSaveCopy')
           action = "#{SOAP_ACTION_PREFIX}/CreateItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", :soap_action => action) do |node|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", action) do |node|
             build!(node) do
               create_item!(folder_id, items, message_disposition=false, send_invites, 'calendar')
             end
@@ -464,7 +474,7 @@ module Viewpoint
         #   See: http://msdn.microsoft.com/en-us/library/aa565209.aspx
         def create_task_item(folder_id, items, message_disposition = 'SaveOnly')
           action = "#{SOAP_ACTION_PREFIX}/CreateItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", :soap_action => action) do |node|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", action) do |node|
             build!(node) do
               create_item!(folder_id, items, message_disposition, false, 'task')
             end
@@ -484,7 +494,7 @@ module Viewpoint
         #   This Hash will eventually be passed to add_hierarchy! in the builder so it is in that format.
         def create_contact_item(folder_id, items)
           action = "#{SOAP_ACTION_PREFIX}/CreateItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", :soap_action => action) do |node|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateItem", action) do |node|
             build!(node) do
               create_item!(folder_id, items, nil, false, 'contact')
             end
@@ -502,7 +512,7 @@ module Viewpoint
         #   This is really only related to tasks and can be nil otherwise, which is the default.
         def delete_item(item_ids, delete_type, send_meeting_cancellations = nil, affected_task_occurrences = nil)
           action = "#{SOAP_ACTION_PREFIX}/DeleteItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:DeleteItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:DeleteItem", action) do |root|
             build!(root) do
               root.set_attr('DeleteType', delete_type)
               root.set_attr('SendMeetingCancellations', send_meeting_cancellations) unless send_meeting_cancellations.nil?
@@ -515,7 +525,7 @@ module Viewpoint
 
         def update_item
           action = "#{SOAP_ACTION_PREFIX}/UpdateItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:UpdateItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:UpdateItem", action) do |root|
             build!(root) do
             end
           end
@@ -533,7 +543,7 @@ module Viewpoint
         #   it blank for the default :sentitems
         def send_item(item_ids, save_item=true, saved_item_folder=nil)
           action = "#{SOAP_ACTION_PREFIX}/SendItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:SendItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:SendItem", action) do |root|
             build!(root) do
               root.set_attr('SaveItemToFolder', save_item)
               item_ids!(root,item_ids)
@@ -550,7 +560,7 @@ module Viewpoint
         #   (must me a Symbol) or a FolderId (String)
         def move_item(item_ids, folder_id)
           action = "#{SOAP_ACTION_PREFIX}/MoveItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:MoveItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:MoveItem", action) do |root|
             build!(root) do
               to_folder_id!(root, folder_id)
               item_ids!(root, item_ids)
@@ -566,7 +576,7 @@ module Viewpoint
         #   (must me a Symbol) or a FolderId (String)
         def copy_item(item_ids, folder_id)
           action = "#{SOAP_ACTION_PREFIX}/CopyItem"
-          resp = invoke("#{NS_EWS_MESSAGES}:CopyItem", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:CopyItem", action) do |root|
             build!(root) do
               to_folder_id!(root, folder_id)
               item_ids!(root, item_ids)
@@ -587,7 +597,7 @@ module Viewpoint
         # @todo Need to implement attachment of Item types
         def create_attachment(parent_id, files = [], items = [])
           action = "#{SOAP_ACTION_PREFIX}/CreateAttachment"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateAttachment", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateAttachment", action) do |root|
             build!(root) do
               item_id!(root, parent_id, "#{NS_EWS_MESSAGES}:ParentItemId")
               attachments!(root, files, items)
@@ -598,7 +608,7 @@ module Viewpoint
 
         def delete_attachment
           action = "#{SOAP_ACTION_PREFIX}/DeleteAttachment"
-          resp = invoke("#{NS_EWS_MESSAGES}:DeleteAttachment", :soap_action => action) do |delete_attachment|
+          resp = invoke("#{NS_EWS_MESSAGES}:DeleteAttachment", action) do |delete_attachment|
             build_delete_attachment!(delete_attachment)
           end
           parse_delete_attachment(resp)
@@ -609,7 +619,7 @@ module Viewpoint
         # @param [Array] attachment_ids Attachment Ids to fetch
         def get_attachment(attachment_ids)
           action = "#{SOAP_ACTION_PREFIX}/GetAttachment"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetAttachment", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetAttachment", action) do |root|
             build!(root) do
               attachment_shape!(root)
               attachment_ids!(root, attachment_ids)
@@ -620,7 +630,7 @@ module Viewpoint
 
         def create_managed_folder
           action = "#{SOAP_ACTION_PREFIX}/CreateManagedFolder"
-          resp = invoke("#{NS_EWS_MESSAGES}:CreateManagedFolder", :soap_action => action) do |create_managed_folder|
+          resp = invoke("#{NS_EWS_MESSAGES}:CreateManagedFolder", action) do |create_managed_folder|
             build_create_managed_folder!(create_managed_folder)
           end
           parse_create_managed_folder(resp)
@@ -632,7 +642,7 @@ module Viewpoint
         # @param [String] owner The user that is delegating permissions
         def get_delegate(owner)
           action = "#{SOAP_ACTION_PREFIX}/GetDelegate"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetDelegate", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetDelegate", action) do |root|
             root.set_attr('IncludePermissions', 'true')
             build!(root) do
               mailbox!(root, {:email_address => {:text => owner}})
@@ -650,7 +660,7 @@ module Viewpoint
         #   This Hash will eventually be passed to add_hierarchy! in the builder so it is in that format.
         def add_delegate(owner, delegate, permissions)
           action = "#{SOAP_ACTION_PREFIX}/AddDelegate"
-          resp = invoke("#{NS_EWS_MESSAGES}:AddDelegate", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:AddDelegate", action) do |root|
             build!(root) do
               add_delegate!(owner, delegate, permissions)
             end
@@ -665,7 +675,7 @@ module Viewpoint
         # @param [String] delegate The user that is being given delegate permission
         def remove_delegate(owner, delegate)
           action = "#{SOAP_ACTION_PREFIX}/RemoveDelegate"
-          resp = invoke("#{NS_EWS_MESSAGES}:RemoveDelegate", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:RemoveDelegate", action) do |root|
             build!(root) do
               remove_delegate!(owner, delegate)
             end
@@ -682,7 +692,7 @@ module Viewpoint
         #   This Hash will eventually be passed to add_hierarchy! in the builder so it is in that format.
         def update_delegate(owner, delegate, permissions)
           action = "#{SOAP_ACTION_PREFIX}/UpdateDelegate"
-          resp = invoke("#{NS_EWS_MESSAGES}:UpdateDelegate", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:UpdateDelegate", action) do |root|
             build!(root) do
               add_delegate!(owner, delegate, permissions)
             end
@@ -695,7 +705,7 @@ module Viewpoint
         # @see http://msdn.microsoft.com/en-us/library/aa564001.aspx
         def get_user_availability
           action = "#{SOAP_ACTION_PREFIX}/GetUserAvailability"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetUserAvailability", :soap_action => action) do |get_user_availability|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetUserAvailability", action) do |get_user_availability|
             build_get_user_availability!(get_user_availability)
           end
           parse_get_user_availability(resp)
@@ -705,7 +715,7 @@ module Viewpoint
         # @see http://msdn.microsoft.com/en-us/library/aa563465.aspx
         def get_user_oof_settings(mailbox)
           action = "#{SOAP_ACTION_PREFIX}/GetUserOofSettings"
-          resp = invoke("#{NS_EWS_MESSAGES}:GetUserOofSettingsRequest", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:GetUserOofSettingsRequest", action) do |root|
             build!(root) do
               mailbox!(root,mailbox[:mailbox],NS_EWS_TYPES)
             end
@@ -717,7 +727,7 @@ module Viewpoint
         # @see http://msdn.microsoft.com/en-us/library/aa580294.aspx
         def set_user_oof_settings(mailbox, oof_state, ext_audience, dt_start, dt_end, int_msg, ext_mg)
           action = "#{SOAP_ACTION_PREFIX}/SetUserOofSettings"
-          resp = invoke("#{NS_EWS_MESSAGES}:SetUserOofSettings", :soap_action => action) do |root|
+          resp = invoke("#{NS_EWS_MESSAGES}:SetUserOofSettings", action) do |root|
             build!(root)
           end
           parse!(resp)
@@ -736,6 +746,11 @@ module Viewpoint
           EwsParser.new(response).parse(opts)
         end
 
+        # Override the superclasses' invoke so we can add http_options to each request
+        def invoke(msg, action)
+          super(msg, {:soap_action => action, :http_options => @@http_options})
+        end
+
       end # class ExchangeWebService
     end # module SOAP
   end # EWS

data/lib/viewpoint.rb

@@ -55,6 +55,9 @@ require 'model/task'
 require 'model/attachment'
 require 'model/file_attachment'
 require 'model/item_attachment'
+# Third Party Libraries
+require 'mail' # used to convert Message items to RFC822 compliant messages
+require 'icalendar' # used to convert Calendar items to iCalendar objects
 
 # Load the Exception classes
 require 'exceptions/exceptions'
@@ -107,13 +110,20 @@ module Viewpoint
         Handsoap.http_driver = driver
       end
 
+      # Sets the CA path to a certificate or hashed certificate directory.
+      # This is the same as HTTPClient::SSLConfig.set_trust_ca
+      # @param [String] ca_path A path to an OpenSSL::X509::Certificate or a 'c-rehash'ed directory
+      def self.set_trust_ca(ca_path)
+        SOAP::ExchangeWebService.set_http_options(:trust_ca_file => ca_path) && true
+      end
+
       def initialize
         @ews = SOAP::ExchangeWebService.new
       end
 
       # The MailboxUser object that represents the user connected to EWS.
       def me
-        @me ||= MailboxUser.find_user("#{@@user}@")
+        @me ||= MailboxUser.find_user((@@user.include?('@') ? @@user : "#{@@user}@"))
       end
 
     end # class EWS