viewpoint 0.0.3 → 0.0.4

data/Rakefile

@@ -29,6 +29,7 @@ GEMSPEC = Gem::Specification.new do |gem|
   gem.required_ruby_version	= '>= 1.8.7'
   gem.add_runtime_dependency  'soap4r', '>=1.5.8'
   gem.add_runtime_dependency  'icalendar'
+  gem.add_runtime_dependency  'rubyntlm', '>=0.1.1'
   gem.post_install_message	= "Don't forget to create .viewpointrc.  See README"
 end
  

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/viewpoint.rb

@@ -1,4 +1,5 @@
 module Viewpoint
 end
 
+require 'viewpoint/errors'
 require 'viewpoint/exchwebserv'

data/lib/viewpoint/calendar.rb

@@ -116,5 +116,13 @@ class Viewpoint::CalendarFolder < Viewpoint::Folder
 	def get_item(item_id)
 		cali = super(item_id, "calendarItem", true)
 	end
+
+  def get_event(item_id)
+    begin
+      return CalendarItem.new(get_item(item_id), self)
+    rescue InvalidEWSItemError => e
+      return nil
+    end
+  end
 end
 

data/lib/viewpoint/calendar_item.rb

@@ -25,13 +25,12 @@ require 'item'
 class Viewpoint::CalendarItem < Viewpoint::Item
 	include Viewpoint
 
-	attr_reader :subject, :parent_folder, :sender
-	attr_reader :ews_item if $DEBUG
+  attr_reader :subject, :organizer, :location, :start, :end, :cal_item_type
 
 	# Initialize an Exchange Web Services item
 	def initialize(ews_item, parent_folder)
-		# keep this now for debuging
-		@ews_item = ews_item if $DEBUG
+    raise InvalidEWSItemError if ews_item.nil?
+
 		@subject = ews_item.subject # String
 		@location = ews_item.location if ews_item.location
 		@cal_item_type = ews_item.calendarItemType
@@ -50,6 +49,16 @@ class Viewpoint::CalendarItem < Viewpoint::Item
 	end
 
 
+  def body
+		get_calitem if @message == nil
+    @message.body
+  end
+
+  def sender
+    @organizer
+  end
+
+
 	# Convert item to iCal format: http://www.ietf.org/rfc/rfc2445.txt
 	# Returns Icalendar::Event object
 	def to_ical_event

data/lib/viewpoint/errors.rb

@@ -0,0 +1,34 @@
+#############################################################################
+# Copyright © 2009 Dan Wanek <dan.wanek@gmail.com>
+#
+#
+# This file is part of Viewpoint.
+# 
+# Viewpoint is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# Viewpoint is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with Viewpoint.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+$:.unshift(File.dirname(__FILE__))
+require 'viewpoint'
+
+class Viewpoint::InvalidEWSItemError < Exception
+  def message
+    "Invalid Item for Exchange Web Services"
+  end
+end
+
+
+class Viewpoint::NoSuchItemIdError < Exception
+  def message
+    "No such item_id found in Exchange"
+  end
+end

data/lib/viewpoint/folder.rb

@@ -39,6 +39,10 @@ class Viewpoint::Folder
 	# to check_subscription will use that id.
 	# Returns true if the operation is successful, false otherwise
 	def subscribe
+		# Refresh the subscription if already subscribed
+		if( subscribed? )
+			unsubscribe
+		end
 		subscribe = SubscribeType.new
 		pull = PullSubscriptionRequestType.new
 
@@ -69,6 +73,10 @@ class Viewpoint::Folder
 		return (resp.responseCode == "NoError")? true: false
 	end
 
+	def subscribed?
+			( @subscription_id.nil? or @watermark.nil? )? false : true
+	end
+
 
 	# unsubscribe from folder
 	# Returns true if unsubscription succeeds, false otherwise
@@ -88,6 +96,9 @@ class Viewpoint::Folder
 
 	# Fetch events with the subscription_id.  If one does not exists or is expired,
 	# call subscribe.
+  # Returns a hash with the event type as the key and an Array of Hashes that
+  # represent each event's data
+  # An :error key is set if there is a problem
 	def check_subscription
 		begin
 			if( @subscription_id == nil or @watermark == nil) then
@@ -102,40 +113,77 @@ class Viewpoint::Folder
 
 			notifications = resp.first.notification
 
+      notif_hash = {}
 			# Process Notifications
 			if( notifications.copiedEvent != nil)
-				notifications.copiedEvent .each do |note|
+        notif_hash[:copiedEvent] = []
+				notifications.copiedEvent.each do |note|
 					@watermark = note.watermark
+          item = {}
+          item.store(:old_item_id,note.oldItemId.xmlattr_Id) if note.itemId
+          item.store(:old_folder_id,note.oldParentFolderId.xmlattr_Id) if note.oldParentFolderId
+          item.store(:item_id,note.itemId.xmlattr_Id) if note.itemId
+          item.store(:folder_id,note.parentFolderId.xmlattr_Id) if note.parentFolderId
+          notif_hash[:copiedEvent] << item
 				end
 			end
 
 			if( notifications.createdEvent != nil)
+        notif_hash[:createdEvent] = []
 				notifications.createdEvent.each do |note|
 					@watermark = note.watermark
+          item = {}
+          item.store(:item_id,note.itemId.xmlattr_Id) if note.itemId
+          item.store(:folder_id,note.parentFolderId.xmlattr_Id) if note.parentFolderId
+          notif_hash[:createdEvent] << item
 				end
 			end
 
 			if( notifications.deletedEvent != nil)
+        notif_hash[:deletedEvent] = []
 				notifications.deletedEvent.each do |note|
 					@watermark = note.watermark
+          item = {}
+          item.store(:item_id,note.itemId.xmlattr_Id) if note.itemId
+          item.store(:folder_id,note.parentFolderId.xmlattr_Id) if note.parentFolderId
+          notif_hash[:deletedEvent] << item
 				end
 			end
 
 			if( notifications.modifiedEvent != nil)
+        notif_hash[:modifiedEvent] = []
 				notifications.modifiedEvent.each do |note|
 					@watermark = note.watermark
+          item = {}
+          item.store(:item_id,note.itemId.xmlattr_Id) if note.itemId
+          item.store(:folder_id,note.folderId.xmlattr_Id) if note.folderId
+          item.store(:parent_folder_id,note.parentFolderId.xmlattr_Id) if note.parentFolderId
+          item.store(:unreadCount,note.unreadCount)
+          notif_hash[:modifiedEvent] << item
 				end
 			end
 
 			if( notifications.movedEvent != nil)
+        notif_hash[:movedEvent] = []
 				notifications.movedEvent.each do |note|
 					@watermark = note.watermark
+          item = {}
+          item.store(:old_item_id,note.oldItemId.xmlattr_Id) if note.oldItemId
+          item.store(:old_folder_id,note.oldParentFolderId.xmlattr_Id) if note.oldParentFolderId
+          item.store(:item_id,note.itemId.xmlattr_Id) if note.itemId
+          item.store(:folder_id,note.parentFolderId.xmlattr_Id) if note.parentFolderId
+          notif_hash[:movedEvent] << item
 				end
 			end
 
 			if( notifications.newMailEvent!= nil)
+        notif_hash[:newMailEvent] = []
 				notifications.newMailEvent.each do |note|
 					@watermark = note.watermark
+          item = {}
+          item.store(:item_id,note.itemId.xmlattr_Id) if note.itemId
+          item.store(:folder_id,note.parentFolderId.xmlattr_Id) if note.parentFolderId
+          notif_hash[:newMailEvent] << item
 				end
 			end
 
@@ -145,9 +193,17 @@ class Viewpoint::Folder
 				end
 			end
 
+    rescue NoMethodError
+      # This ocurrs if something bad happened to the subscription.
+      # This is handled by resubscribing to the subscription and returning
+      # an error key.
+      self.subscribe
+      return {:error => "Something bad happened to your subscription.  You have been re-subscribed" }
 		end
 
-		return resp
+		#return resp
+    notif_hash[:resp] = resp
+		return notif_hash
 	end
 
 

data/lib/viewpoint/item.rb

@@ -25,12 +25,16 @@
 class Viewpoint::Item
 	include Viewpoint
 
-	attr_accessor :item_id
+	attr_accessor :item_id, :parent_folder, :item_class
+	attr_reader :ews_item if $DEBUG
 
 	# Initialize an Exchange Web Services item
 	def initialize(ews_item, parent_folder)
+		@ews_item = ews_item if $DEBUG
+
 		@item_id = ews_item.itemId.xmlattr_Id
 		@parent_folder = parent_folder
+    @item_class = ews_item.itemClass
 	end
 
 	# Takes an object of type Viewpoint::Folder as an argument
@@ -43,26 +47,28 @@ class Viewpoint::Item
 	end
 
 
+  def entry_id
+    convert_id(IdFormatType::EntryId)
+  end
+
 	# Return the OWA ID so we can link to webmail
+	# Example usage: uri = "https://host/owa/?ae=Item&a=open&id=" + owa_id
 	def owa_id
-		vp = ExchWebServ.instance
-		altids_ar = NonEmptyArrayOfAlternateIdsType.new
-		
-		altid_t = AlternateIdType.new
-		altid_t.xmlattr_Format = IdFormatType::EwsId
-		altid_t.xmlattr_Id = @item_id
-		altid_t.xmlattr_Mailbox = vp.email
-		altids_ar.alternateId << altid_t
-		
-		convertid_t = ConvertIdType.new(altids_ar)
-		convertid_t.xmlattr_DestinationFormat = IdFormatType::OwaId
-		
-		resp = vp.ews.convertId(convertid_t)
-		resp.responseMessages.convertIdResponseMessage.first.alternateId.xmlattr_Id
-		#uri = "https://host/owa/?ae=Item&a=open&id=" + owa_id
+		convert_id(IdFormatType::OwaId)
 	end
 
+  def ews_legacy_id
+		convert_id(IdFormatType::EwsLegacyId)
+  end
+
+  def hex_id
+		convert_id(IdFormatType::HexEntryId)
+  end
 
+  def store_id
+		convert_id(IdFormatType::StoreId)
+  end
+  
 	# Returns a boolean value, true if the delete ocurred, false otherwise.
 	def delete!
 		@parent_folder.delete_item(@item_id)
@@ -72,4 +78,24 @@ class Viewpoint::Item
 	def recycle!
 		@parent_folder.recycle_item(@item_id)
 	end
+
+
+  private
+  
+  def convert_id(dest_type)
+    vp = ExchWebServ.instance
+		altids_ar = NonEmptyArrayOfAlternateIdsType.new
+		
+		altid_t = AlternateIdType.new
+		altid_t.xmlattr_Format = IdFormatType::EwsId
+		altid_t.xmlattr_Id = @item_id
+		altid_t.xmlattr_Mailbox = vp.email
+		altids_ar.alternateId << altid_t
+		
+		convertid_t = ConvertIdType.new(altids_ar)
+		convertid_t.xmlattr_DestinationFormat = dest_type
+		
+		resp = vp.ews.convertId(convertid_t)
+		resp.responseMessages.convertIdResponseMessage.first.alternateId.xmlattr_Id
+  end
 end

data/lib/viewpoint/mail.rb

@@ -110,4 +110,8 @@ class Viewpoint::MailFolder < Viewpoint::Folder
 	def get_item(item_id)
 		msg = super(item_id, "message", true)
 	end
+
+  def get_message(item_id)
+    Message.new(get_item(item_id), self)
+  end
 end

data/lib/viewpoint/message.rb

@@ -23,13 +23,12 @@ require 'item'
 class Viewpoint::Message < Viewpoint::Item
 	include Viewpoint
 
-	attr_reader :subject, :parent_folder, :sender, :date_time_recieved
-	attr_reader :ews_item if $DEBUG
+	attr_reader :subject, :sender, :date_time_recieved
 
 	# Initialize an Exchange Web Services item of MessageType
 	def initialize(ews_item, parent_folder)
-		# keep this now for debuging
-		@ews_item = ews_item if $DEBUG
+    raise InvalidEWSItemError if ews_item.nil?
+
 		@subject = ews_item.subject # String
 		@sender = ews_item.sender.mailbox.name if ews_item.sender # String
 		@recipients = 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viewpoint
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dan Wanek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -06:00
+date: 2009-11-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyntlm
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+    version: 
 description: "  \tA Ruby client access library for Microsoft Exchange Web Services (EWS).  It is a work in progress.  Methods are still being added from the EWS API docs.  Please see them for further information: http://msdn.microsoft.com/en-us/library/bb204119.aspx\n"
 email: dan.wanek@gmail.com
 executables: []
@@ -97,6 +107,7 @@ files:
 - lib/viewpoint.rb
 - lib/viewpoint/calendar.rb
 - lib/viewpoint/calendar_item.rb
+- lib/viewpoint/errors.rb
 - lib/viewpoint/event.rb
 - lib/viewpoint/exchange_headers.rb
 - lib/viewpoint/exchwebserv.rb