rexchange 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,10 @@
+-- 0.1.4:
+* Moved Folder::normalize_folder_name to String#normalize, and added support for MixedCase sources.
+* Fixed a bug where the normalized folder name was being used for the Folder#to_s result.
+* Moved the meat of Folder#messages to Message::find
+* Added Message#to_s
+* Modified Folder#get_folders to return a hash instead of an array, providing both the original, and normalized names.
+
 -- 0.1.3: Bugfixes
 * Fixed several nasty bugs.
 

data/RAKEFILE

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 require 'pscp'
 
-PACKAGE_VERSION = '0.1.3'
+PACKAGE_VERSION = '0.1.4'
 
 PACKAGE_FILES = FileList[
   'README',

data/lib/rexchange/extensions.rb

@@ -6,4 +6,8 @@ class String
   def ensure_ends_with(partial)
     self.ends_with?(partial) ? self : self + partial
   end
+  
+  def normalize
+    self.split(/(?=[A-Z][a-z]*)/).join('_').tr('- ', '_').squeeze('_').downcase
+  end
 end 

data/lib/rexchange/folder.rb

@@ -22,8 +22,8 @@ module RExchange
     # Used to access subfolders. If the subfolder does not
     # exist, then old_method_missing is called.
     def method_missing(sym, *args)
-      if subfolder_exist?(sym.to_s)
-        Folder.new(@credentials, self, sym )
+      if folders.has_key?(sym.to_s)
+        Folder.new(@credentials, self, folders[sym.to_s] )
       else
         old_method_missing(sym, args)
       end
@@ -49,35 +49,8 @@ module RExchange
       end.messages
     end
     
-    # Retrieve an Array of messages in this folder
     def messages
-    
-      body = <<DABODY
-				<?xml version="1.0"?>
-				<D:searchrequest xmlns:D = "DAV:">
-					 <D:sql>
-					 SELECT "DAV:href", 
-              "urn:schemas:httpmail:from", "urn:schemas:httpmail:to", "urn:schemas:mailheader:message-id",
-							"urn:schemas:httpmail:subject", "DAV:href", "urn:schemas:httpmail:date",
-							"urn:schemas:httpmail:importance", "urn:schemas:httpmail:hasattachment",
-							"urn:schemas:httpmail:textdescription", "urn:schemas:httpmail:htmldescription"
-					 FROM SCOPE('shallow traversal of "#{to_s}"')
-					 WHERE "DAV:ishidden" = false
-						 AND "DAV:isfolder" = false
-						 AND "DAV:contentclass" = 'urn:content-classes:message'
-            </D:sql>
-				</D:searchrequest>
-DABODY
-      
-      response = DavSearchRequest.execute(@credentials, :body => body)
-      
-      mail_messages = []
-      xpath_query = "//a:propstat[a:status/text() = 'HTTP/1.1 200 OK']/a:prop"
-      Document.new(response.body).elements.each(xpath_query) do |m| 
-        mail_messages << Message.new(@credentials, m)
-      end
-      
-      return mail_messages
+      RExchange::Message::find(@credentials, to_s)
     end
     
     # Join the strings passed in with '/'s between them
@@ -90,20 +63,12 @@ DABODY
       @folders ||= get_folders
     end
     
-    # Check to see if a particular subfolder exists
-    def subfolder_exist?(folder)
-      folders.include? normalize_folder_name(folder)    
-    end
-    
     # Return the absolute path to this folder (but not the full URI)
     def to_s
       Folder.join(@parent, @folder)
     end
     
     private
-    def normalize_folder_name(folder)
-      folder.to_s.tr('- ', '_').squeeze('_').downcase
-    end
     
     def get_folders
       request_body = <<DA_QUERY
@@ -120,12 +85,12 @@ DA_QUERY
       
       response = DavSearchRequest.execute(@credentials, :body => request_body)
       
-      folders = []
+      folders = {}
       
       # iterate through folders query and add each normalized name to the folders array.
       xpath_query = "//a:propstat[a:status/text() = 'HTTP/1.1 200 OK']/a:prop"
       Document.new(response.body).elements.each(xpath_query) do |m| 
-        folders << normalize_folder_name(m.elements['a:displayname'].text)
+        folders[m.elements['a:displayname'].text.normalize] = m.elements['a:displayname'].text
       end
       
       return folders

data/lib/rexchange/message.rb

@@ -9,6 +9,10 @@ module RExchange
     
     attr_accessor :attributes  
     
+    def to_s
+      "To: #{to}, From: #{from}, Subject: #{subject}"
+    end
+    
     # Used to access the attributes of the message as a hash.
     def [](key)
       return @attributes[key]
@@ -62,5 +66,36 @@ module RExchange
       DavMoveRequest.execute(@session, source, destination)
     end
     
+    # Retrieve an Array of messages in this folder
+    def Message.find(credentials, path)
+    
+      body = <<DABODY
+				<?xml version="1.0"?>
+				<D:searchrequest xmlns:D = "DAV:">
+					 <D:sql>
+					 SELECT "DAV:href", "urn:schemas:httpmail:from", "urn:schemas:httpmail:to",
+					   "urn:schemas:mailheader:message-id", "urn:schemas:httpmail:subject",
+					   "urn:schemas:httpmail:date", "urn:schemas:httpmail:importance",
+					   "urn:schemas:httpmail:hasattachment", "urn:schemas:httpmail:textdescription",
+					   "urn:schemas:httpmail:htmldescription"
+					 FROM SCOPE('shallow traversal of "#{path}"')
+					 WHERE "DAV:ishidden" = false
+						 AND "DAV:isfolder" = false
+						 AND "DAV:contentclass" = 'urn:content-classes:message'
+                    </D:sql>
+				</D:searchrequest>
+DABODY
+      
+      response = DavSearchRequest.execute(credentials, :body => body)
+      
+      mail_messages = []
+      xpath_query = "//a:propstat[a:status/text() = 'HTTP/1.1 200 OK']/a:prop"
+      
+      Document.new(response.body).elements.each(xpath_query) do |m|
+        mail_messages << Message.new(credentials, m)
+      end
+      
+      return mail_messages
+    end
   end
 end

metadata

@@ -1,63 +1,58 @@
-!ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+--- !ruby/object:Gem::Specification 
+rubygems_version: 0.8.10
 specification_version: 1
 name: rexchange
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-02-01 00:00:00 -06:00
-summary: A simple wrapper around Microsoft Exchange Server's WebDAV API
+  version: 0.1.4
+date: 2006-02-01
+summary: "A simple wrapper around Microsoft Exchange Server's WebDAV API"
 require_paths: 
-- lib
+  - lib
 email: ssmoot@gmail.com; bauer.mail@gmail.com
 homepage: http://substantiality.net
 rubyforge_project: rexchange
-description: Connect, browse, and iterate through folders and messages on an Exchange Server
+description: "Connect, browse, and iterate through folders and messages on an Exchange Server"
 autorequire: rexchange
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
+    - 
+      - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
   version: 
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
-- Sam Smoot
-- Scott Bauer
+  - Sam Smoot
+  - Scott Bauer
 files: 
-- README
-- CHANGELOG
-- RAKEFILE
-- lib/rexchange.rb
-- lib/rexchange/credentials.rb
-- lib/rexchange/dav_move_request.rb
-- lib/rexchange/dav_search_request.rb
-- lib/rexchange/exchange_request.rb
-- lib/rexchange/extensions.rb
-- lib/rexchange/folder.rb
-- lib/rexchange/message.rb
-- lib/rexchange/session.rb
-- test/functional.rb
+  - README
+  - CHANGELOG
+  - RAKEFILE
+  - lib/rexchange.rb
+  - lib/rexchange/credentials.rb
+  - lib/rexchange/dav_move_request.rb
+  - lib/rexchange/dav_search_request.rb
+  - lib/rexchange/exchange_request.rb
+  - lib/rexchange/extensions.rb
+  - lib/rexchange/folder.rb
+  - lib/rexchange/message.rb
+  - lib/rexchange/session.rb
+  - test/functional.rb
 test_files: []
-
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --main
-- README
+  - "--line-numbers"
+  - "--inline-source"
+  - "--main"
+  - README
 extra_rdoc_files: 
-- README
-- CHANGELOG
-- RAKEFILE
+  - README
+  - CHANGELOG
+  - RAKEFILE
 executables: []
-
 extensions: []
-
 requirements: 
-- none
-dependencies: []
-
+  - none
+dependencies: []