ruby-gmail 0.2.1 → 0.3.0

data/README.markdown

@@ -1,3 +1,9 @@
+# Notice
+
+First, the gem on rubygems.org is out of date. I am trying to gain ownership over that gem, but it is proving difficult - I may have to rename the gem.
+
+Second, this gem needs to get back on track. I am looking for people to help go through issues and fix bugs. I want to push a solid, stable release first, then look at charting out the future of the gem. Please email me at <myobie@gmail.com> if you want to help or just get started on the issues.
+
 # ruby-gmail
 
 * Homepage: [http://dcparker.github.com/ruby-gmail/](http://dcparker.github.com/ruby-gmail/)
@@ -74,6 +80,10 @@ A Rubyesque interface to Gmail, with all the tools you'll need. Search, read and
     # Remember that every message in a conversation/thread will come as a separate message.
     gmail.inbox.emails(:unread, :before => Date.parse("2010-04-20"), :from => "myboss@gmail.com")
 
+    # Get messages without marking them as read on the server.
+    gmail.peek = true
+    gmail.inbox.emails(:unread, :before => Date.parse("2010-04-20"), :from => "myboss@gmail.com")
+    
 ### 4) Work with emails!
 
     # any news older than 4-20, mark as read and archive it...
@@ -90,8 +100,8 @@ A Rubyesque interface to Gmail, with all the tools you'll need. Search, read and
     # Save all attachments in the "Faxes" label to a folder
     folder = "/where/ever"
     gmail.mailbox("Faxes").emails.each do |email|
-      if !email.attachments.empty?
-        email.save_attachments_to(folder)
+      if !email.message.attachments.empty?
+        email.message.save_attachments_to(folder)
       end
     end
 

data/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

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/gmail.rb

@@ -28,16 +28,16 @@ class Gmail
 
   ###########################
   #  READING EMAILS
-  # 
+  #
   #  gmail.inbox
   #  gmail.label('News')
-  #  
+  #
   ###########################
 
   def inbox
     in_label('inbox')
   end
-  
+
   def create_label(name)
     imap.create(name)
   end
@@ -50,10 +50,13 @@ class Gmail
 
   # gmail.label(name)
   def label(name)
-    mailboxes[name] ||= Mailbox.new(self, mailbox)
+    mailboxes[name] ||= Mailbox.new(self, name)
   end
   alias :mailbox :label
 
+  # don't mark emails as read on the server when downloading them
+  attr_accessor :peek
+
   ###########################
   #  MAKING EMAILS
   # 
@@ -84,13 +87,13 @@ class Gmail
     mail.from = meta.username unless mail.from
     mail.deliver!
   end
-  
+
   ###########################
   #  LOGIN
   ###########################
   def login
     res = @imap.login(meta.username, meta.password)
-    @logged_in = true if res.name == 'OK'
+    @logged_in = true if res && res.name == 'OK'
   end
   def logged_in?
     !!@logged_in
@@ -99,9 +102,15 @@ class Gmail
   def logout
     if logged_in?
       res = @imap.logout
-      @logged_in = false if res.name == 'OK'
+      @logged_in = false if res && res.name == 'OK'
     end
   end
+  
+  # Shutdown socket and disconnect
+  def disconnect
+    logout if logged_in?
+    @imap.disconnect unless @imap.disconnected?
+  end  
 
   def in_mailbox(mailbox, &block)
     if block_given?

data/lib/gmail/message.rb

@@ -1,4 +1,3 @@
-require 'mime/message'
 class Gmail
   class Message
     def initialize(gmail, mailbox, uid)
@@ -83,16 +82,14 @@ class Gmail
       move_to('[Gmail]/All Mail')
     end
 
-    def save_attachments_to(path=nil)
-      attachments.each {|a| a.save_to_file(path) }
-    end
-
     private
 
     # Parsed MIME message object
     def message
       require 'mail'
-      _body = @gmail.in_mailbox(@mailbox) { @gmail.imap.uid_fetch(uid, "RFC822")[0].attr["RFC822"] }
+      request,part = 'RFC822','RFC822'
+      request,part = 'BODY.PEEK[]','BODY[]' if @gmail.peek
+      _body = @gmail.in_mailbox(@mailbox) { @gmail.imap.uid_fetch(uid, request)[0].attr[part] }
       @message ||= Mail.new(_body)
     end
 

data/ruby-gmail.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-gmail}
-  s.version = "0.2.1"
+  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 = [
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
      "lib/gmail.rb",
      "lib/gmail/mailbox.rb",
      "lib/gmail/message.rb",
-     "lib/mail/part.rb",
      "lib/smtp_tls.rb",
      "ruby-gmail.gemspec",
      "test/test_gmail.rb",
@@ -40,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",
@@ -51,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
 

data/test/test_gmail.rb

@@ -6,20 +6,26 @@ class GmailTest < Test::Unit::TestCase
     Net::IMAP.expects(:new).with('imap.gmail.com', 993, true, nil, false).returns(imap)
     gmail = Gmail.new('test', 'password')
   end
-  
+
   def test_imap_does_login
     setup_mocks(:at_exit => true)
+    res = mock('res')
+    res.expects(:name).at_least(1).returns('OK')
 
-    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
-    @imap.expects(:login).with('test@gmail.com', 'password')
+    # @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    # TODO: figure why this was here in the first place
+    @imap.expects(:login).with('test@gmail.com', 'password').returns(res)
     @gmail.imap
   end
 
   def test_imap_does_login_only_once
     setup_mocks(:at_exit => true)
+    res = mock('res')
+    res.expects(:name).at_least(1).returns('OK')
 
-    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
-    @imap.expects(:login).with('test@gmail.com', 'password')
+    # @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    # TODO: figure why this was here in the first place
+    @imap.expects(:login).with('test@gmail.com', 'password').returns(res)
     @gmail.imap
     @gmail.imap
     @gmail.imap
@@ -27,46 +33,55 @@ class GmailTest < Test::Unit::TestCase
 
   def test_imap_does_login_without_appending_gmail_domain
     setup_mocks(:at_exit => true)
+    res = mock('res')
+    res.expects(:name).at_least(1).returns('OK')
 
-    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
-    @imap.expects(:login).with('test@gmail.com', 'password')
+    # @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    # TODO: figure why this was here in the first place
+    @imap.expects(:login).with('test@gmail.com', 'password').returns(res)
     @gmail.imap
   end
-  
+
   def test_imap_logs_out
     setup_mocks(:at_exit => true)
+    res = mock('res')
+    res.expects(:name).at_least(1).returns('OK')
 
-    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
-    @imap.expects(:login).with('test@gmail.com', 'password')
+    # @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    # TODO: figure why this was here in the first place
+    @imap.expects(:login).with('test@gmail.com', 'password').returns(res)
     @gmail.imap
-    @imap.expects(:logout).returns(true)
+    @imap.expects(:logout).returns(res)
     @gmail.logout
   end
 
   def test_imap_logout_does_nothing_if_not_logged_in
     setup_mocks
 
-    @imap.expects(:disconnected?).returns(true)
+    @gmail.expects(:logged_in?).returns(false)
     @imap.expects(:logout).never
     @gmail.logout
   end
-  
+
   def test_imap_calls_create_label
     setup_mocks(:at_exit => true)
-    @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
-    @imap.expects(:login).with('test@gmail.com', 'password')
+    res = mock('res')
+    res.expects(:name).at_least(1).returns('OK')
+    # @imap.expects(:disconnected?).at_least_once.returns(true).then.returns(false)
+    # TODO: figure out why this was here in the first place
+    @imap.expects(:login).with('test@gmail.com', 'password').returns(res)
     @imap.expects(:create).with('foo')
     @gmail.create_label('foo')
   end
-  
+
   private
   def setup_mocks(options = {})
     options = {:at_exit => false}.merge(options)
     @imap = mock('imap')
     Net::IMAP.expects(:new).with('imap.gmail.com', 993, true, nil, false).returns(@imap)
     @gmail = Gmail.new('test@gmail.com', 'password')
-    
+
     # need this for the at_exit block that auto-exits after this test method completes
     @imap.expects(:logout).at_least(0) if options[:at_exit]
   end
-end
+end

metadata

@@ -1,59 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-gmail
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - BehindLogic
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-14 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: shared-mime-info
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mail
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: mime
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
-  version_requirements: *id002
-description: 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.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
+description: 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.
 email: gems@behindlogic.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .autotest
-- .gitignore
 - History.txt
 - Manifest.txt
 - README.markdown
@@ -62,43 +77,34 @@ files:
 - lib/gmail.rb
 - lib/gmail/mailbox.rb
 - lib/gmail/message.rb
-- lib/mail/part.rb
 - lib/smtp_tls.rb
 - ruby-gmail.gemspec
 - test/test_gmail.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://dcparker.github.com/ruby-gmail
 licenses: []
-
-post_install_message: "\n\
-  \e[34mIf ruby-gmail saves you TWO hours of work, want to compensate me for, like, a half-hour?\n\
-  Support me in making new and better gems:\e[0m \e[31;4mhttp://pledgie.com/campaigns/7087\e[0m\n\n"
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+post_install_message: ! "\n\e[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:\e[0m
+  \e[31;4mhttp://pledgie.com/campaigns/7087\e[0m\n\n"
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Rubyesque interface to Gmail, with all the tools you'll need.
-test_files: 
-- test/test_gmail.rb
-- test/test_helper.rb
+test_files: []

data/.gitignore

@@ -1 +0,0 @@
-pkg

data/lib/mail/part.rb

@@ -1,24 +0,0 @@
-module Mail
-  class Message
-    def attachment?
-      !!find_attachment
-    end
-  end
-  class Part < Message
-    def save_to_file(path=nil)
-      return false unless attachment?
-      fname = path if path && !File.exists?(path) # If path doesn't exist, assume it's a filename
-      fname ||= path + '/' + filename if path && File.directory?(path) # If path does exist, and we're saving an attachment, use the attachment filename
-      fname ||= (path || filename) # Use the path, or the attachment filename
-      if File.directory?(fname)
-        i = 0
-        begin
-          i += 1
-          fname = fname + "/attachment-#{i}"
-        end until !File.exists(fname)
-      end
-      # After all that trouble to get a filename to save to...
-      File.open(fname, 'w') { |f| f << read }
-    end
-  end
-end