ews-api 0.1.0.a → 0.1.0

data/Rakefile

@@ -8,11 +8,11 @@ begin
     gem.summary = 'Exchange Web Services API'
     gem.description = "Exchange Web Services API. It doesn't use soap4r."
     gem.email = "jeremy.burks@gmail.com"
-    gem.homepage = "http://github.com/jrun/ews-api"
+    gem.homepage = "http://jrun.github.com/ews-api/ews"
     gem.authors = ["jrun"]
     gem.add_dependency 'httpclient'
     gem.add_dependency 'rubyntlm'
-    gem.add_dependency 'handsoap', '1.1.4'
+    gem.add_dependency 'handsoap', '1.1.6'
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
 

data/VERSION

@@ -1 +1 @@
-0.1.0.a
+0.1.0

data/ews-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ews-api}
-  s.version = "0.1.0.a"
+  s.version = "0.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jrun"]
-  s.date = %q{2009-12-17}
+  s.date = %q{2010-01-25}
   s.description = %q{Exchange Web Services API. It doesn't use soap4r.}
   s.email = %q{jeremy.burks@gmail.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,10 @@ Gem::Specification.new do |s|
      "ews-api.gemspec",
      "lib/ews-api.rb",
      "lib/ews/attachment.rb",
+     "lib/ews/builder.rb",
+     "lib/ews/builders/resolve_names_builder.rb",
+     "lib/ews/builders/shape_builder.rb",
+     "lib/ews/distinguished_folders.rb",
      "lib/ews/error.rb",
      "lib/ews/folder.rb",
      "lib/ews/message.rb",
@@ -33,6 +37,9 @@ Gem::Specification.new do |s|
      "lib/ews/parser.rb",
      "lib/ews/service.rb",
      "spec/ews/attachment_spec.rb",
+     "spec/ews/builder_spec.rb",
+     "spec/ews/builders/resolve_names_builder_spec.rb",
+     "spec/ews/builders/shape_builder_spec.rb",
      "spec/ews/folder_spec.rb",
      "spec/ews/message_spec.rb",
      "spec/ews/model_spec.rb",
@@ -52,7 +59,7 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/jrun/ews-api}
+  s.homepage = %q{http://jrun.github.com/ews-api/ews}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
@@ -62,9 +69,12 @@ Gem::Specification.new do |s|
      "spec/integration.rb",
      "spec/ews/parser_spec.rb",
      "spec/ews/message_spec.rb",
+     "spec/ews/builder_spec.rb",
      "spec/ews/attachment_spec.rb",
      "spec/ews/folder_spec.rb",
      "spec/ews/service_spec.rb",
+     "spec/ews/builders/resolve_names_builder_spec.rb",
+     "spec/ews/builders/shape_builder_spec.rb",
      "spec/ews/model_spec.rb"
   ]
 
@@ -75,20 +85,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_runtime_dependency(%q<rubyntlm>, [">= 0"])
-      s.add_runtime_dependency(%q<handsoap>, ["= 1.1.4"])
+      s.add_runtime_dependency(%q<handsoap>, ["= 1.1.6"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<httpclient>, [">= 0"])
       s.add_dependency(%q<rubyntlm>, [">= 0"])
-      s.add_dependency(%q<handsoap>, ["= 1.1.4"])
+      s.add_dependency(%q<handsoap>, ["= 1.1.6"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<httpclient>, [">= 0"])
     s.add_dependency(%q<rubyntlm>, [">= 0"])
-    s.add_dependency(%q<handsoap>, ["= 1.1.4"])
+    s.add_dependency(%q<handsoap>, ["= 1.1.6"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0"])
   end

data/lib/ews-api.rb

@@ -2,10 +2,14 @@ require 'net/ntlm'
 require 'handsoap'
 
 require 'ews/error'
+require "ews/distinguished_folders"
 require 'ews/model'
 require 'ews/attachment'
 require 'ews/message'
 require 'ews/folder'
+require "ews/builders/shape_builder"
+require "ews/builders/resolve_names_builder"
+require 'ews/builder'
 require 'ews/parser'
 require 'ews/service'
 

data/lib/ews/builder.rb

@@ -0,0 +1,107 @@
+require 'forwardable'
+
+module EWS
+  
+  # AdditionalProperties
+  # @see http://msdn.microsoft.com/en-us/library/aa580545(EXCHG.80).aspx
+  # BaseShape  
+  # @see http://msdn.microsoft.com/en-us/library/aa565622(EXCHG.80).aspx
+  # BodyType
+  # @see http://msdn.microsoft.com/en-us/library/aa580499(EXCHG.80).aspx
+  # IncludeMimeContent  
+  class Builder
+    extend Forwardable
+
+    def_delegators :@resolve_names_builder,
+                   :unresolved_entry!,
+                   :return_full_contact_data!
+
+    def_delegators :@shape_builder,
+                   :item_shape!,
+                   :folder_shape!,
+                   :attachment_shape!
+    
+    def initialize(action_node, opts, &block)
+      @action_node, @opts = action_node, opts
+      @resolve_names_builder = ResolveNamesBuilder.new(action_node)
+      @shape_builder = ShapeBuilder.new(action_node, opts)
+      instance_eval(&block) if block_given?
+    end
+        
+    def item_id_container!(container_node_name, item_ids)
+      id_container!(container_node_name, item_ids) do |container_node, id|
+        item_id! container_node, id, @opts
+      end
+    end
+
+    def folder_id_container!(container_node_name, folder_ids)
+      id_container!(container_node_name, folder_ids) do |container_node, id|
+        folder_id! container_node, id, @opts
+      end
+    end
+
+    def attachment_ids!(attachment_ids)
+      id_container!('tns:AttachmentIds', attachment_ids) do |container_node, id|
+        id_node! container_node, 't:AttachmentId', id
+      end
+    end
+    
+    def id_container!(container_node_name, ids)
+      @action_node.add(container_node_name) do |container_node|
+        to_a(ids).each {|id| yield container_node, id }
+      end
+    end
+
+    def traversal!
+      @action_node.set_attr 'Traversal', (@opts[:traversal] || :Shallow) 
+    end        
+        
+    # @see http://msdn.microsoft.com/en-us/library/aa580234(EXCHG.80).aspx
+    # ItemId
+    def item_id!(container_node, item_id, opts = {})
+      id_node! container_node, 't:ItemId', item_id, opts
+    end
+        
+    # @param parent [Handsoap::XmlMason::Node]
+    #
+    # @param folder_id [String, Symbol] When a EWS::DistinguishedFolder a
+    # DistinguishedFolderId is created otherwise FolderId is used
+    #
+    # @param [Hash] opts
+    # @option opts [Symbol] :change_key
+    #
+    # @see http://msdn.microsoft.com/en-us/library/aa580808(EXCHG.80).aspx
+    # DistinguishedFolderId
+    #   
+    # @see http://msdn.microsoft.com/en-us/library/aa579461(EXCHG.80).aspx
+    # FolderId
+    def folder_id!(container_node, folder_id, opts = {})
+      node_name = if DistinguishedFolders.include?(folder_id)
+        't:DistinguishedFolderId'
+      else
+        't:FolderId'
+      end
+      id_node! container_node, node_name, folder_id, opts
+    end
+
+    # @param opts [Hash] Still an argument so opts can remain optional
+    def id_node!(container_node, id_node_name, id, opts = {})
+      container_node.add(id_node_name) do |id_node|
+        id_node.set_attr 'Id', id        
+        id_node.set_attr 'ChangeKey', opts[:change_key] if opts[:change_key]
+      end 
+    end
+
+    # TODO: core_ext?
+    def to_a(ids)
+      case ids
+      when Enumerable
+        ids
+      else
+        [ids]
+      end
+    end
+
+  end
+  
+end

data/lib/ews/builders/resolve_names_builder.rb

@@ -0,0 +1,15 @@
+module EWS
+  class ResolveNamesBuilder
+    def initialize(action_node)
+      @action_node = action_node
+    end
+
+    def unresolved_entry!(entry)
+      @action_node.add('tns:UnresolvedEntry', entry)
+    end
+
+    def return_full_contact_data!(return_full_contact_data)
+      @action_node.set_attr 'ReturnFullContactData', return_full_contact_data
+    end    
+  end
+end

data/lib/ews/builders/shape_builder.rb

@@ -0,0 +1,71 @@
+module EWS
+  class ShapeBuilder
+    def initialize(action_node, opts = {})
+      @action_node, @opts = action_node, opts
+      @shape_node = nil
+    end
+
+    # @param [Hash] opts
+    # @option opts [String, Symbol] :base_shape (Default) IdOnly, Default, AllProperties
+    # @option opts [true, false] :include_mime_content
+    # @option opts [String, Symbol] :body_type Best, HTML or Text
+    # @option opts [Symbol] :additional_properties  
+    def item_shape!
+      set_shape_node 'tns:ItemShape'
+      base_shape!
+      include_mime_content!
+      body_type!
+      additional_properties!      
+    end
+    
+    # @param [Hash] opts
+    # @option opts [String, Symbol] :base_shape (Default) IdOnly, Default, AllProperties
+    # @option opts [Symbol] :additional_properties
+    def folder_shape!
+      set_shape_node 'tns:FolderShape'
+      base_shape!
+      additional_properties!
+    end
+    
+    # @param [Hash] opts
+    # @option opts [true, false] :include_mime_type
+    # @option opts [String, Symbol] :body_type Best, HTML or Text
+    # @option opts [Symbol] :additional_properties
+    #
+    # @see http://msdn.microsoft.com/en-us/library/aa563727(EXCHG.80).aspx
+    # AttachmentShape
+    def attachment_shape!
+      set_shape_node 'tns:AttachmentShape'
+      include_mime_content!
+      body_type!
+      additional_properties!
+    end
+    
+    private
+    def set_shape_node(name)
+      @action_node.add(name) do |shape_node|
+        @shape_node = shape_node
+      end      
+    end
+    
+    def base_shape!
+      @opts[:base_shape] ||= :Default      
+      @shape_node.add 't:BaseShape', @opts[:base_shape]
+    end
+    
+    def include_mime_content!
+      if @opts.has_key?(:include_mime_content)
+        @shape_node.add 't:IncludeMimeContent', @opts[:include_mime_content]
+      end
+    end    
+
+    def body_type!
+      if @opts.has_key?(:body_type)
+        @shape_node.add 't:BodyType', @opts[:body_type]
+      end
+    end
+    
+    def additional_properties!
+    end
+  end
+end

data/lib/ews/distinguished_folders.rb

@@ -0,0 +1,17 @@
+module EWS
+  DistinguishedFolders = [:calendar,
+                          :contacts,
+                          :deleteditems,
+                          :drafts,
+                          :inbox,
+                          :journal,
+                          :notes,
+                          :outbox,
+                          :sentitems,
+                          :tasks,
+                          :msgfolderroot,
+                          :root,
+                          :junkemail,
+                          :searchfolders,
+                          :voicemail ].freeze
+end

data/lib/ews/parser.rb

@@ -1,6 +1,10 @@
 module EWS
   
   class Parser
+    def parse_resolve_names(doc)
+      raise 'TODO'
+    end
+    
     def parse_find_folder(doc)
       doc.xpath('//t:Folders/child::*').map do |node|
         parse_exchange_folder node.xpath('.') # force NodeSelection

data/lib/ews/service.rb

@@ -27,16 +27,19 @@ module EWS
     end
     
     def on_create_document(doc)
-      # register namespaces for the request
-      doc.alias 'tns', 'http://schemas.microsoft.com/exchange/services/2006/messages'
-      doc.alias 't', 'http://schemas.microsoft.com/exchange/services/2006/types'
+      register_aliases! doc    
     end
     
     def on_response_document(doc)
       apply_namespaces! doc
       parser.parse_response_message doc
     end
-
+    
+    def register_aliases!(doc)
+      doc.alias 'tns', 'http://schemas.microsoft.com/exchange/services/2006/messages'
+      doc.alias 't', 'http://schemas.microsoft.com/exchange/services/2006/types'
+    end
+    
     def apply_namespaces!(doc)
       doc.add_namespace 'soap', '"http://schemas.xmlsoap.org/soap/envelope'
       doc.add_namespace 't', 'http://schemas.microsoft.com/exchange/services/2006/types'
@@ -44,11 +47,15 @@ module EWS
     end
     # public methods
   
-    def resolve_names!
+    def resolve_names!(unresolved_entry, return_full_contact_data = true)
       soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/ResolveNames'
-      response = invoke('tns:ResolveNames', soap_action) do |message|
-        raise "TODO"
+      response = invoke('tns:ResolveNames', soap_action) do |resolve_names|
+        builder(resolve_names) do
+          unresolved_entry! unresolved_entry
+          return_full_contact_data! return_full_contact_data
+        end
       end
+      parser.parse_resolve_names response.document
     end
     
     def expand_dl!
@@ -82,20 +89,14 @@ module EWS
     # @todo Support options
     #   Traversal: +Shallow, Deep, SoftDeleted+
     #   FolderShape: +IdOnly, Default, AllProperties+
-    def find_folder(parent_folder_name = :root, opts = {})
-      soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/FindFolder'
-      opts[:base_shape] ||= :Default
-      
+    def find_folder(folder_ids = :root, opts = {})
+      soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/FindFolder'     
       response = invoke('tns:FindFolder', soap_action) do |find_folder|
-        find_folder.set_attr 'Traversal', 'Deep'
-        find_folder.add('tns:FolderShape') do |shape|
-          shape.add 't:BaseShape', opts[:base_shape]
-        end
-        find_folder.add('tns:ParentFolderIds') do |ids|
-          ids.add('t:DistinguishedFolderId') do |id|
-            id.set_attr 'Id', parent_folder_name.to_s.downcase
-          end
-        end
+        builder(find_folder, opts) do
+          traversal!
+          folder_shape!
+          folder_id_container! 'tns:ParentFolderIds', folder_ids
+        end        
       end
       parser.parse_find_folder response.document
     end
@@ -118,16 +119,12 @@ module EWS
     # @see http://msdn.microsoft.com/en-us/library/aa580274.aspx
     # MSDN - GetFolder operation
     #
-    def get_folder(name = :root, opts = {})
-      soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/GetFolder'
-      opts[:base_shape] ||= :Default
-      
+    def get_folder(folder_id = :root, opts = {})
+      soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/GetFolder'      
       response = invoke('tns:GetFolder', soap_action) do |get_folder|
-        get_folder.add('tns:FolderShape') do |shape|
-          shape.add 't:BaseShape', opts[:base_shape]
-        end
-        get_folder.add('tns:FolderIds') do |ids|
-          ids.add('t:DistinguishedFolderId') { |id| id.set_attr 'Id', name }
+        builder(get_folder, opts) do 
+          folder_shape!
+          folder_id_container! 'tns:FolderIds', folder_id
         end
       end
       parser.parse_get_folder response.document
@@ -241,19 +238,13 @@ module EWS
     #
     # @see http://msdn.microsoft.com/en-us/library/aa580545.aspx
     # BaseShape    
-    def find_item(parent_folder_name = :root, opts = {})
-      soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/FindItem'      
-      opts[:base_shape] ||= :IdOnly
-      
+    def find_item(folder_ids = :root, opts = {})
+      soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/FindItem'
       response = invoke('tns:FindItem', soap_action) do |find_item|
-        find_item.set_attr 'Traversal', 'Shallow'
-        find_item.add('tns:ItemShape') do |shape|
-          shape.add 't:BaseShape', opts[:base_shape]
-        end
-        find_item.add('tns:ParentFolderIds') do |ids|
-          ids.add('t:DistinguishedFolderId') do |folder_id|
-            folder_id.set_attr 'Id', parent_folder_name.to_s.downcase
-          end
+        builder(find_item, opts) do
+          traversal!
+          item_shape!
+          folder_id_container! 'tns:ParentFolderIds', folder_ids         
         end
       end
       parser.parse_find_item response.document
@@ -285,29 +276,22 @@ module EWS
     # ItmeIds
     def get_item(item_id, opts = {})
       soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/GetItem'
-      opts[:base_shape] ||= :Default
-      
       response = invoke('tns:GetItem', soap_action) do |get_item|
-        get_item.add('tns:ItemShape') do |shape|
-          shape.add 't:BaseShape', opts[:base_shape]
-          shape.add 't:IncludeMimeContent', false
-        end
-        get_item.add('tns:ItemIds') do |ids|
-          ids.add('t:ItemId') do |item|
-            item.set_attr 'Id', item_id
-            if opts[:change_key]
-              item.set_attr 'ChangeKey', opts[:change_key]
-            end
-          end
+        builder(get_item, opts) do
+          item_shape!
+          item_id_container! 'tns:ItemIds', item_id
         end
       end
       parser.parse_get_item response.document
     end
     
-    def create_item!
+    def create_item!(item, destination_folder_id, opts = {})
       soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/CreateItem'
-      response = invoke('tns:CreateItem', soap_action) do |message|
-        raise "TODO"
+      response = invoke('tns:CreateItem', soap_action) do |create_item|
+        builder(create_item, opts) do
+          folder_id_container! 'SavedItemFolderId', destination_folder_id
+        end
+        raise 'TODO'
       end
     end
     
@@ -352,20 +336,12 @@ module EWS
     # @see http://msdn.microsoft.com/en-us/library/aa580808%28EXCHG.80%29.aspx
     # DistinguishedFolderId
     #
-    def move_item!(folder_id, item_ids)
+    def move_item!(folder_id, item_id, opts = {})
       soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/MoveItem'
       response = invoke('tns:MoveItem', soap_action) do |move_item|
-        move_item.add('tns:ToFolderId') do |to_folder|
-
-          # TODO: Support both FolderID and DistinguishedFolderId
-          to_folder.add('t:FolderId') do |folder_id_node|
-            folder_id_node.set_attr 'Id', folder_id
-          end          
-        end
-        move_item.add('tns:ItemIds') do |ids|
-          item_ids.each do |item_id|
-            ids.add('t:ItemId') {|item_node| item_node.set_attr 'Id', item_id }
-          end
+        builder(move_item, opts) do
+          folder_id_container! 'tns:ToFolderId', folder_id
+          item_id_container! 'tns:ItemIds', item_id
         end
       end
     end
@@ -402,14 +378,12 @@ module EWS
     #
     # @see http://msdn.microsoft.com/en-us/library/aa494316.aspx
     # GetAttachment
-    def get_attachment(attachment_id)
+    def get_attachment(attachment_id, opts = {})
       soap_action = 'http://schemas.microsoft.com/exchange/services/2006/messages/GetAttachment'
       response = invoke('tns:GetAttachment', soap_action) do |get_attachment|
-        get_attachment.add('tns:AttachmentShape')
-        get_attachment.add('tns:AttachmentIds') do |ids|
-          ids.add('t:AttachmentId') do |attachment|
-            attachment.set_attr 'Id', attachment_id
-          end
+        builder(get_attachment, opts) do
+          attachment_shape!
+          attachment_ids! attachment_id
         end
       end
       parser.parse_get_attachment response.document
@@ -468,9 +442,9 @@ module EWS
     def parser
       @parser ||= Parser.new      
     end
-    
-    # helpers
-    
-    # TODO
+
+    def builder(action_node, opts = {}, &block)
+      Builder.new(action_node, opts, &block)
+    end
   end
 end

data/spec/ews/builder_spec.rb

@@ -0,0 +1,125 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+module BuilderHelper
+  def builder(opts = {})
+    EWS::Builder.new(@doc, opts)
+  end
+end
+
+describe EWS::Builder do
+  include BuilderHelper
+  
+  before(:each) do
+    @doc = new_document
+  end      
+  
+  context '#item_id! should build ItemId' do
+    def expected_item_id
+      %Q|<t:ItemId #{TNS} Id="XYZ" />|
+    end
+
+    def expected_item_id_with_change_key
+      %Q|<t:ItemId #{TNS} ChangeKey="123" Id="XYZ" />|
+    end
+    
+    it "given an id" do
+      builder.item_id!(@doc, 'XYZ')
+      @doc.to_s.should == expected_item_id
+    end
+
+    it "with a ChangeKey whe the :change_key option is given" do
+      builder.item_id!(@doc, 'XYZ', :change_key => '123')
+      @doc.to_s.should == expected_item_id_with_change_key
+    end
+  end
+  
+  context '#folder_id!' do
+    context 'should build FolderId' do
+      def expected_folder_id
+        %Q|<t:FolderId #{TNS} Id="XYZ" />|
+      end
+
+      def expected_folder_id_with_change_key
+        %Q|<t:FolderId #{TNS} ChangeKey="123" Id="XYZ" />|
+      end
+      
+      it "given an id" do
+        builder.folder_id!(@doc, 'XYZ')
+        @doc.to_s.should == expected_folder_id
+      end
+      
+      it "with a ChangeKey whe the :change_key option is given" do
+        builder.folder_id!(@doc, 'XYZ', :change_key => '123')
+        @doc.to_s.should == expected_folder_id_with_change_key
+      end
+    end
+  
+    context "should build a DistinguishedFolderId" do
+      def expected_distinguished_folder_id(id)
+        %Q|<t:DistinguishedFolderId #{TNS} Id="#{id}" />|
+      end
+      
+      def expected_distinguished_folder_id_with_change_key
+        %Q|<t:DistinguishedFolderId #{TNS} ChangeKey="222" Id="inbox" />|
+      end
+    
+      EWS::DistinguishedFolders.each do |folder|
+        it "given #{folder.inspect}" do
+          builder.folder_id!(@doc, folder)
+          @doc.to_s.should == expected_distinguished_folder_id(folder)
+        end
+      end
+      
+      it "with a ChangeKey when given the :change_key option" do
+        builder.folder_id!(@doc, :inbox, :change_key => '222')
+        @doc.to_s.should == expected_distinguished_folder_id_with_change_key
+      end
+    end
+  end
+  
+  context "#folder_id_container should bulid the container node" do
+    def expected_parent_folder_ids_with_one
+      (<<-EOS
+<tns:ParentFolderIds #{MNS}>
+  <t:FolderId #{TNS} Id="111" />
+</tns:ParentFolderIds>
+EOS
+      ).chomp
+    end
+
+    def expected_parent_folder_ids_with_one_distinguished
+          (<<-EOS
+<tns:ParentFolderIds #{MNS}>
+  <t:DistinguishedFolderId #{TNS} Id="inbox" />
+</tns:ParentFolderIds>
+EOS
+      ).chomp  
+    end
+    
+    def expected_parent_folder_ids_with_more
+      (<<-EOS
+<tns:ParentFolderIds #{MNS}>
+  <t:FolderId #{TNS} Id="111" />
+  <t:DistinguishedFolderId #{TNS} Id="inbox" />
+</tns:ParentFolderIds>
+EOS
+       ).chomp
+    end
+        
+    it "when given one id" do
+      builder.folder_id_container! 'tns:ParentFolderIds', '111'
+      @doc.to_s.should == expected_parent_folder_ids_with_one
+    end
+
+    it "when given one distinguished folder" do
+      builder.folder_id_container! 'tns:ParentFolderIds', :inbox
+      @doc.to_s.should == expected_parent_folder_ids_with_one_distinguished
+    end
+
+    it "when given an array of ids" do
+      builder.folder_id_container! 'tns:ParentFolderIds', ['111', :inbox]
+      @doc.to_s.should == expected_parent_folder_ids_with_more
+    end
+  end
+  
+end

data/spec/ews/builders/resolve_names_builder_spec.rb

@@ -0,0 +1,42 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+module EWS
+  describe ResolveNamesBuilder do
+    before(:each) do      
+      @action_node = Handsoap::XmlMason::Element.new(new_document, 'tns', 'ResolveNames')
+      @builder = ResolveNamesBuilder.new(@action_node)
+    end
+
+    context "#unresolved_entry!" do
+      def expected_unresolved_entry_xml
+        (<<-EOS
+<tns:ResolveNames #{MNS}>
+  <tns:UnresolvedEntry>Stark</tns:UnresolvedEntry>
+</tns:ResolveNames>
+EOS
+         ).chomp
+      end
+      
+      it "should build a UnresolvedEntry node" do
+        @builder.unresolved_entry!('Stark')       
+        @action_node.to_s.should == expected_unresolved_entry_xml
+      end
+    end
+
+    context "#return_full_contact_data!" do
+      it "should add attribute when true" do
+        @builder.return_full_contact_data!(true)
+
+        expected_xml = %Q|<tns:ResolveNames ReturnFullContactData="true" #{MNS} />|
+        @action_node.to_s.should == expected_xml
+      end
+
+      it "should add attribute when false" do
+        @builder.return_full_contact_data!(false)
+
+        expected_xml = %Q|<tns:ResolveNames ReturnFullContactData="false" #{MNS} />|
+        @action_node.to_s.should == expected_xml
+      end
+    end
+  end
+end

data/spec/ews/builders/shape_builder_spec.rb

@@ -0,0 +1,140 @@
+require File.join(File.dirname(__FILE__), '..', '..', 'spec_helper')
+
+module EWS
+  describe ShapeBuilder do
+    before(:each) do
+      @doc = new_document
+    end
+
+    def builder(opts = {})
+      ShapeBuilder.new(@doc, opts)
+    end
+    
+    context "#item_shape!  should build an ItemShape node" do
+      def expected_item_shape(base_shape)
+      ( <<-EOS
+<tns:ItemShape #{MNS}>
+  <t:BaseShape #{TNS}>#{base_shape}</t:BaseShape>
+</tns:ItemShape>
+EOS
+        ).chomp
+      end
+    
+      def expected_include_mime_type(include_mime_type)
+        ( <<-EOS
+<tns:ItemShape #{MNS}>
+  <t:BaseShape #{TNS}>Default</t:BaseShape>
+  <t:IncludeMimeContent #{TNS}>#{include_mime_type}</t:IncludeMimeContent>
+</tns:ItemShape>
+EOS
+          ).chomp
+      end
+      
+      it "with the BaseShape of 'Default' when no :base_shape option is given" do
+        builder.item_shape!
+        @doc.to_s.should == expected_item_shape('Default')
+      end
+    
+      it "with the BaseShape of 'Default'" do
+        builder.item_shape!
+        @doc.to_s.should == expected_item_shape('Default')
+      end
+
+      it "with the BaseShape of 'AllProperties'" do
+        builder(:base_shape => 'AllProperties').item_shape!
+        @doc.to_s.should == expected_item_shape('AllProperties')      
+      end
+      
+      it "with the BaseShape of  'IdOnly'" do
+        builder(:base_shape => 'IdOnly').item_shape!
+        @doc.to_s.should == expected_item_shape('IdOnly')      
+      end
+
+      it "with IncludeMimeContent false" do
+        builder(:include_mime_content => false).item_shape!
+        @doc.to_s.should == expected_include_mime_type(false)
+      end
+
+      it "with IncludeMimeContent true" do
+        builder(:include_mime_content => true).item_shape!
+        @doc.to_s.should == expected_include_mime_type(true)
+      end      
+    end
+
+    context "#folder_shape! should build an FolderShape node" do
+      def expected_folder_shape(base_shape)
+        ( <<-EOS
+<tns:FolderShape #{MNS}>
+  <t:BaseShape #{TNS}>#{base_shape}</t:BaseShape>
+</tns:FolderShape>
+EOS
+          ).chomp
+      end
+
+      it "with the BaseShape of 'Default' when no :base_shape option is given" do
+        builder.folder_shape!
+        @doc.to_s.should == expected_folder_shape('Default')
+      end
+    
+      it "with the BaseShape of 'Default'" do
+        builder.folder_shape!
+        @doc.to_s.should == expected_folder_shape('Default')
+      end
+
+      it "with the BaseShape of 'AllProperties'" do
+        builder(:base_shape => 'AllProperties').folder_shape!
+        @doc.to_s.should == expected_folder_shape('AllProperties')      
+      end
+
+      it "with the BaseShape of  'IdOnly'" do
+        builder(:base_shape => 'IdOnly').folder_shape!
+        @doc.to_s.should == expected_folder_shape('IdOnly')      
+      end
+    end  
+  
+    context "#attachment_shape! should build an AttachmentShape node" do
+      def expected_empty_shape
+        "<tns:AttachmentShape #{MNS} />"
+      end
+                
+      def expected_include_mime_type(include_mime_type)
+        ( <<-EOS
+<tns:AttachmentShape #{MNS}>
+  <t:IncludeMimeContent #{TNS}>#{include_mime_type}</t:IncludeMimeContent>
+</tns:AttachmentShape>
+EOS
+          ).chomp
+      end
+
+      def expected_body_type(body_type)
+        ( <<-EOS
+<tns:AttachmentShape #{MNS}>
+  <t:BodyType #{TNS}>#{body_type}</t:BodyType>
+</tns:AttachmentShape>
+EOS
+          ).chomp  
+      end
+      
+      it "an empty shape when no options are given" do
+        builder.attachment_shape!
+        @doc.to_s.should == expected_empty_shape
+    end
+    
+      it "with IncludeMimeContent false" do
+        builder(:include_mime_content => false).attachment_shape!
+        @doc.to_s.should == expected_include_mime_type(false)
+      end
+
+      it "with IncludeMimeContent true" do
+        builder(:include_mime_content => true).attachment_shape!
+        @doc.to_s.should == expected_include_mime_type(true)
+      end
+    
+      it "with BodyType Best" do
+        builder(:body_type => :Best).attachment_shape!
+        @doc.to_s.should == expected_body_type(:Best)      
+      end
+    end
+    
+  end
+end

data/spec/integration.rb

@@ -35,6 +35,14 @@ end
 EWS::Service.logger = $stdout
 
 describe 'Integration Tests' do
+  context "resolve_names" do
+    it "should resolve names" do
+      lambda do
+        EWS::Service.resolve_names! EWS_CONFIG['resolve_names']
+      end.should_not raise_error
+    end    
+  end
+  
   context 'find_folder' do
     it "should find the folder without errors" do
       lambda do
@@ -42,11 +50,10 @@ describe 'Integration Tests' do
       end.should_not raise_error
     end
 
-    it "should raise a Fault when the item does not exist" do
-      error_msg = /The value 'does-not-exist' is invalid according to its datatype/
+    it "should raise a ResponseError when the folder does not exist" do
       lambda do
         EWS::Service.find_folder('does-not-exist')
-      end.should raise_error(Handsoap::Fault,  error_msg)
+      end.should raise_error(EWS::ResponseError, /Id is malformed/)
     end
   end
 
@@ -64,11 +71,10 @@ describe 'Integration Tests' do
       EWS::Service.get_folder(:inbox).should be_instance_of(EWS::Folder)
     end
     
-    it "should raise a SoapError when the ResponseMessage is an Error" do
-      error_msg = /The value 'does-not-exist' is invalid according to its datatype/
+    it "should raise a ResponseError when the folder does not exist" do
       lambda do
         EWS::Service.get_folder('does-not-exist')
-      end.should raise_error(Handsoap::Fault,  error_msg)
+      end.should raise_error(EWS::ResponseError, /Id is malformed/)
     end
   end
 
@@ -83,11 +89,10 @@ describe 'Integration Tests' do
       items.should be_instance_of(Array)
     end
     
-    it "should raise a Fault when the item does not exist" do
-      error_msg = /The value 'does-not-exist' is invalid according to its datatype/
+    it "should raise a ResponseError when the item does not exist" do
       lambda do
         EWS::Service.find_item('does-not-exist')
-      end.should raise_error(Handsoap::Fault,  error_msg)
+      end.should raise_error(EWS::ResponseError, /Id is malformed/)
     end
   end
   
@@ -130,9 +135,8 @@ describe 'Integration Tests' do
 
   context 'move_item' do
     #it "should move the item" do
-    #  folder_id = 'AQAUAHRlc3RxZHNib3VuY2VAcWcuY29tAC4AAAMXckeXPuMKT4uj0fYRoj0SAQAUIOj2Wr1iR63wVBJuRuVLABU0TWDnAAAA'
-    #  
-    #  id = 'AAAUAHRlc3RxZHNib3VuY2VAcWcuY29tAEYAAAAAABdyR5c+4wpPi6PR9hGiPRIHABQg6PZavWJHrfBUEm5G5UsAFTRNedwAABQg6PZavWJHrfBUEm5G5UsAFTRNhHAAAA=='
+    #  folder_id =
+    #  id = 
     #
     #  EWS::Service.move_item!(folder_id, [id])
     # end

data/spec/spec_helper.rb

@@ -4,7 +4,10 @@ require 'ews-api'
 require 'spec'
 require 'spec/autorun'
 
-module EWS::SpecHelper
+TNS = %q|xmlns:t="http://schemas.microsoft.com/exchange/services/2006/types"|
+MNS = %q|xmlns:tns="http://schemas.microsoft.com/exchange/services/2006/messages"|  
+
+module EWS::SpecHelper  
   def fixtures
     @fixtures ||= Dir[File.dirname(__FILE__) + '/fixtures/*.xml'].inject({}) do |fixtures, f|
       fixtures[File.basename(f).chomp('.xml')] = File.expand_path(f)
@@ -54,6 +57,13 @@ module EWS::SpecHelper
 </soap:Envelope>
 EOS
   end
+  
+  def new_document
+    doc = Handsoap::XmlMason::Document.new
+    doc.xml_header = nil
+    EWS::Service.register_aliases! doc
+    doc
+  end
 end
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ews-api
 version: !ruby/object:Gem::Version 
-  version: 0.1.0.a
+  version: 0.1.0
 platform: ruby
 authors: 
 - jrun
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -06:00
+date: 2010-01-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.4
+        version: 1.1.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -81,6 +81,10 @@ files:
 - ews-api.gemspec
 - lib/ews-api.rb
 - lib/ews/attachment.rb
+- lib/ews/builder.rb
+- lib/ews/builders/resolve_names_builder.rb
+- lib/ews/builders/shape_builder.rb
+- lib/ews/distinguished_folders.rb
 - lib/ews/error.rb
 - lib/ews/folder.rb
 - lib/ews/message.rb
@@ -88,6 +92,9 @@ files:
 - lib/ews/parser.rb
 - lib/ews/service.rb
 - spec/ews/attachment_spec.rb
+- spec/ews/builder_spec.rb
+- spec/ews/builders/resolve_names_builder_spec.rb
+- spec/ews/builders/shape_builder_spec.rb
 - spec/ews/folder_spec.rb
 - spec/ews/message_spec.rb
 - spec/ews/model_spec.rb
@@ -107,7 +114,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/jrun/ews-api
+homepage: http://jrun.github.com/ews-api/ews
 licenses: []
 
 post_install_message: 
@@ -123,9 +130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []
 
@@ -139,7 +146,10 @@ test_files:
 - spec/integration.rb
 - spec/ews/parser_spec.rb
 - spec/ews/message_spec.rb
+- spec/ews/builder_spec.rb
 - spec/ews/attachment_spec.rb
 - spec/ews/folder_spec.rb
 - spec/ews/service_spec.rb
+- spec/ews/builders/resolve_names_builder_spec.rb
+- spec/ews/builders/shape_builder_spec.rb
 - spec/ews/model_spec.rb