Merge branch 'master' of https://github.com/elberskirch/ruby-gmail in…

…to elberskirch-master

Rakefile

@@ -14,6 +14,7 @@ begin
     gem.post_install_message = "\n\033[34mIf ruby-gmail saves you TWO hours of work, want to compensate me for, like, a half-hour?\nSupport me in making new and better gems:\033[0m \033[31;4mhttp://pledgie.com/campaigns/7087\033[0m\n\n"
     gem.add_dependency('shared-mime-info', '>= 0')
     gem.add_dependency('mail', '>= 2.2.1')
+    gem.add_dependency('mime', '>= 0.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

lib/gmail.rb

@@ -50,7 +50,7 @@ def labels
 
   # gmail.label(name)
   def label(name)
-    mailboxes[name] ||= Mailbox.new(self, mailbox)
+    mailboxes[name] ||= Mailbox.new(self, name)
   end
   alias :mailbox :label
 
@@ -119,7 +119,7 @@ def in_mailbox(mailbox, &block)
       end
       return value
     else
-      mailboxes[name] ||= Mailbox.new(self, mailbox)
+      mailboxes[mailbox] ||= Mailbox.new(self, mailbox)
     end
   end
   alias :in_label :in_mailbox

ruby-gmail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-gmail}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BehindLogic"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-11-07}
   s.description = %q{A Rubyesque interface to Gmail, with all the tools you'll need. Search, read and send multipart emails; archive, mark as read/unread, delete emails; and manage labels.}
   s.email = %q{gems@behindlogic.com}
   s.extra_rdoc_files = [
@@ -39,7 +39,7 @@ Support me in making new and better gems: http://pledgie.com/campaign
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Rubyesque interface to Gmail, with all the tools you'll need.}
   s.test_files = [
     "test/test_gmail.rb",
@@ -50,16 +50,19 @@ Support me in making new and better gems: http://pledgie.com/campaign
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<shared-mime-info>, [">= 0"])
       s.add_runtime_dependency(%q<mail>, [">= 2.2.1"])
+      s.add_runtime_dependency(%q<mime>, [">= 0.1"])
     else
       s.add_dependency(%q<shared-mime-info>, [">= 0"])
       s.add_dependency(%q<mail>, [">= 2.2.1"])
+      s.add_dependency(%q<mime>, [">= 0.1"])
     end
   else
     s.add_dependency(%q<shared-mime-info>, [">= 0"])
     s.add_dependency(%q<mail>, [">= 2.2.1"])
+    s.add_dependency(%q<mime>, [">= 0.1"])
   end
 end