viewpoint 0.1.26 → 0.1.27

data/lib/model/generic_folder.rb

@@ -93,7 +93,7 @@ module Viewpoint
       # @return [Array<String>] Return an Array of folder names.
       # @raise [EwsError] raised when the backend SOAP method returns an error.
       def self.folder_names(root = :msgfolderroot)
-        resp = (Viewpoint::EWS::EWS.instance).ews.find_folder([:msgfolderroot], 'Shallow')
+        resp = (Viewpoint::EWS::EWS.instance).ews.find_folder([root], 'Shallow')
         if(resp.status == 'Success')
           flds = []
           resp.items.each do |f|
@@ -249,6 +249,7 @@ module Viewpoint
       def find_items(opts = {})
         opts = opts.clone # clone the passed in object so we don't modify it in case it's being used in a loop
         item_shape = opts.has_key?(:item_shape) ? opts.delete(:item_shape) : {:base_shape => 'Default'}
+        shallow = item_shape[:base_shape] != 'AllProperties'
         unless item_shape.has_key?(:additional_properties) # Don't overwrite if specified by caller
           item_shape[:additional_properties] = {:field_uRI => ['item:ParentFolderId']}
         end
@@ -258,7 +259,7 @@ module Viewpoint
           items = []
           resp.items.each do |i|
             i_type = i.keys.first
-            items << (eval "#{i_type.to_s.camel_case}.new(i[i_type])")
+            items << (eval "#{i_type.to_s.camel_case}.new(i[i_type], :shallow => #{shallow})")
           end
           return items
         else
@@ -383,6 +384,7 @@ module Viewpoint
       #   See: http://msdn.microsoft.com/en-us/library/aa565609.aspx
       def sync_items!(sync_amount = 256, sync_all = false, opts = {})
         item_shape = opts.has_key?(:item_shape) ? opts.delete(:item_shape) : {:base_shape => 'Default'}
+        shallow = item_shape[:base_shape] != 'AllProperties'
         resp = (Viewpoint::EWS::EWS.instance).ews.sync_folder_items(@folder_id, @sync_state, sync_amount, item_shape)
         parms = resp.items.shift
         @sync_state = parms[:sync_state]
@@ -395,12 +397,20 @@ module Viewpoint
             items[key] << i[key][:item_id]
           else
             i_type = i[key].keys.first
-            items[key] << (eval "#{i_type.to_s.camel_case}.new(i[key][i_type])")
+            next if !i_type
+            items[key] << (eval "#{i_type.to_s.camel_case}.new(i[key][i_type], :shallow => #{shallow})")
           end
         end
         items
       end
 
+      # Fetch current synced state (comes from synchronizing elements).
+      # @return [Boolean] Current synchronization state, i.e. whether sync_items! needs to be called
+      #         again to finish the pending rounds of synchronization requests.
+      def synced
+        @synced
+      end
+
       # This is basically a work-around for Microsoft's BPOS hosted Exchange, which does not support
       # subscriptions at the time of this writing.  This is the best way I could think of to get
       # items from a specific period of time and track changes.

data/lib/model/item.rb

@@ -32,12 +32,13 @@ module Viewpoint
       # @return [Item] Returns an Item or subclass of Item
       # @todo Add support to fetch an item with a ChangeKey
       def self.get_item(item_id, shape = :default)
-        item_shape = {:base_shape => shape.to_s.camelcase}
+        item_shape = {:base_shape => shape.to_s.camel_case}
+        shallow = item_shape[:base_shape] != 'AllProperties'
         resp = (Viewpoint::EWS::EWS.instance).ews.get_item([item_id], item_shape)
         if(resp.status == 'Success')
           item = resp.items.shift
           type = item.keys.first
-          eval "#{type.to_s.camel_case}.new(item[type])"
+          eval "#{type.to_s.camel_case}.new(item[type], :shallow => #{shallow})"
         else
           raise EwsError, "Could not retrieve item. #{resp.code}: #{resp.message}"
         end

data/lib/model/model.rb

@@ -187,7 +187,7 @@ module Viewpoint
             self.instance_eval <<-EOF
             def #{var}
               return @#{var} if defined?(@#{var})
-              deepen!
+              deepen! if !@ews_item[:#{var}]
               if( (@ews_item[:#{var}][:mailbox]).is_a?(Hash) )
                 @#{var} = [MailboxUser.new(@ews_item[:#{var}][:mailbox])]
               elsif( (@ews_item[:#{var}][:mailbox]).is_a?(Array) )
@@ -214,7 +214,7 @@ module Viewpoint
             @ews_methods << var
             self.instance_eval <<-EOF
             def #{var}
-              deepen!
+              deepen! if !@ews_item[:#{var}]
               @#{var} ||= MailboxUser.new(@ews_item[:#{var}][:mailbox])
             end
             EOF

data/lib/soap/handsoap/ews_service.rb

@@ -90,7 +90,14 @@ module Viewpoint
         end
 
         def on_http_error(response)
-          raise EwsLoginError, "Failed to login to EWS at #{uri}. Please check your credentials." if(response.status == 401)
+          case response.status
+          when 401
+            raise EwsLoginError, "Failed to login to EWS at #{uri}. Please check your credentials."
+          when 404
+            raise EwsError, "File not found (404): #{uri} Please check the endpoint URL. Body: #{response.body}"
+          else
+            raise EwsError, "Unknown error (#{response.status}): #{uri} : Body: #{response.body}"
+          end
         end
 
         # ********** End Hooks **********
@@ -227,12 +234,28 @@ module Viewpoint
           parse!(resp)
         end
 
-        def convert_id
+        # Converts item and folder identifiers between formats that are accepted by Microsoft Exchange
+        # @see http://msdn.microsoft.com/en-us/library/bb799665.aspx
+        #
+        # @param [String] id identifier to convert
+        # @param [String] mailbox mailbox where is located the item
+        # @param [String] alternate_id_format Format of the identifier to be converted, by default Exchange Web Services identifier
+        # @param [String] destination_format Destination format, by default Outlook identifier
+        def convert_id(id, mailbox, alternate_id_format = 'EwsId', destination_format = 'HexEntryId')
           action = "#{SOAP_ACTION_PREFIX}/ConvertId"
-          resp = invoke("#{NS_EWS_MESSAGES}:ConvertId", action) do |convert_id|
-            build_convert_id!(convert_id)
+          resp = invoke("#{NS_EWS_MESSAGES}:ConvertId", action) do |root|
+            build!(root) do
+              root.set_attr('DestinationFormat', destination_format)
+              root.add("#{NS_EWS_MESSAGES}:SourceIds") do |source_ids|
+                source_ids.add("#{NS_EWS_TYPES}:AlternateId") do |alternate_id|
+                  alternate_id.set_attr('Format', alternate_id_format)
+                  alternate_id.set_attr('Id', id)
+                  alternate_id.set_attr('Mailbox', mailbox)
+                end
+              end
+            end
           end
-          parse_convert_id(resp)
+          parse!(resp)
         end
 
         # Creates folders, calendar folders, contacts folders, tasks folders, and search folders.

data/lib/soap/handsoap/parsers/ews_parser.rb

@@ -225,8 +225,9 @@ module Viewpoint
           resolution_set = []
           (@response/"//#{NS_EWS_MESSAGES}:ResolutionSet/*").each do |r|
             mbox_hash    = mailbox((r/"#{NS_EWS_TYPES}:Mailbox").first)
-            contact_hash = contact((r/"#{NS_EWS_TYPES}:Contact").first)
-            resolution_set << mbox_hash.merge(contact_hash)
+            contact_xml  = (r/"#{NS_EWS_TYPES}:Contact").first
+            next if !contact_xml
+            resolution_set << mbox_hash.merge(contact(contact_xml))
           end
           resolution_set
         end

metadata

@@ -1,92 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: viewpoint
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.27
   prerelease: 
-  version: 0.1.26
 platform: ruby
-authors: 
+authors:
 - Dan Wanek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: handsoap
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &7373740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *7373740
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &7373180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *7373180
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &7372740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubyntlm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *7372740
+- !ruby/object:Gem::Dependency
+  name: rubyntlm
+  requirement: &7372240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: icalendar
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *7372240
+- !ruby/object:Gem::Dependency
+  name: icalendar
+  requirement: &7371700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.5
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *7371700
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &7371180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
-  version_requirements: *id006
-description: "A Ruby client access library for Microsoft Exchange Web Services (EWS).  Examples can be found here: http://distributed-frostbite.blogspot.com"
+  prerelease: false
+  version_requirements: *7371180
+description: ! 'A Ruby client access library for Microsoft Exchange Web Services (EWS).  Examples
+  can be found here: http://distributed-frostbite.blogspot.com'
 email: dan.wanek@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Changelog.txt
 - README
 - TODO
@@ -126,34 +124,30 @@ files:
 - lib/extensions/string.rb
 homepage: http://github.com/zenchild/Viewpoint
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -x
 - test/
 - -x
 - examples/
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A Ruby client access library for Microsoft Exchange Web Services (EWS)
 test_files: []
-
-has_rdoc: