RubyGems - ruby-gmail - Versions diffs - 0.1.1 → 0.2.0 - Mend

ruby-gmail 0.1.1 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/README.markdown CHANGED

@@ -1,9 +1,3 @@
-# This fork
-contains a fix to a bug in the initializer, which was discussed [here](http://github.com/dcparker/ruby-gmail/issues#issue/7/comment/141607)
-* * * *
 # ruby-gmail
 * Homepage: [http://dcparker.github.com/ruby-gmail/](http://dcparker.github.com/ruby-gmail/)
@@ -89,7 +83,7 @@ A Rubyesque interface to Gmail, with all the tools you'll need. Search, read and
     end
     # delete emails from X...
-    gmail.inbox.emails(:from => "x-fiancé").each do |email|
+    gmail.inbox.emails(:from => "x-fiancé@gmail.com").each do |email|
       email.delete!
     end

data/Rakefile CHANGED

@@ -13,7 +13,7 @@ begin
     gem.authors = ["BehindLogic"]
     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('tmail', '>= 1.2.3')
+    gem.add_dependency('mail', '>= 2.2.1')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.1.1
1	+ 0.2.0

data/lib/gmail.rb CHANGED

@@ -1,116 +1,145 @@
 require 'net/imap'
-require 'net/smtp'
-require 'smtp_tls'
 class Gmail
   VERSION = '0.0.9'
   class NoLabel < RuntimeError; end
+  ##################################
+  #  Gmail.new(username, password)
+  ##################################
   def initialize(username, password)
     # This is to hide the username and password, not like it REALLY needs hiding, but ... you know.
     # Could be helpful when demoing the gem in irb, these bits won't show up that way.
-    meta = class << self
+    class << self
       class << self
         attr_accessor :username, :password
       end
-      self
     end
     meta.username = username =~ /@/ ? username : username + '@gmail.com'
     meta.password = password
     @imap = Net::IMAP.new('imap.gmail.com',993,true,nil,false)
-    @imap.login(username, password)
     if block_given?
+      login # This is here intentionally. Normally, we get auto logged-in when first needed.
       yield self
       logout
     end
   end
-  # Accessors for IMAP things
-  def mailbox(name)
-    mailboxes[name] ||= Mailbox.new(self, name)
-  end
+  ###########################
+  #  READING EMAILS
+  #
+  #  gmail.inbox
+  #  gmail.label('News')
+  #
+  ###########################
-  # Accessors for Gmail things
   def inbox
-    mailbox('inbox')
+    in_label('inbox')
   end
-  # Accessor for @imap, but ensures that it's logged in first.
-  def imap
-    if @imap.disconnected?
-      meta = class << self; self end
-      @imap.login(meta.username, meta.password)
-      at_exit { logout } # Set up auto-logout for later.
-    end
-    @imap
-  end
-  # Log out of gmail
-  def logout
-    @imap.logout unless @imap.disconnected?
-  end
   def create_label(name)
     imap.create(name)
   end
   # List the available labels
   def labels
-    (@imap.list("", "%") + @imap.list("[Gmail]/", "%")).inject([]) { |labels,label|
+    (imap.list("", "%") + imap.list("[Gmail]/", "%")).inject([]) { |labels,label|
       label[:name].each_line { |l| labels << l }; labels }
   end
-  def in_mailbox(mailbox, &block)
-    raise ArgumentError, "Must provide a code block" unless block_given?
-    mailbox_stack << mailbox
-    unless @selected == mailbox.name
-      imap.select(mailbox.name)
-      @selected = mailbox.name
-    end
-    value = block.arity == 1 ? block.call(mailbox) : block.call
-    mailbox_stack.pop
-    # Select previously selected mailbox if there is one
-    if mailbox_stack.last
-      imap.select(mailbox_stack.last.name)
-      @selected = mailbox.name
-    end
-    return value
+  # gmail.label(name)
+  def label(name)
+    mailboxes[name] ||= Mailbox.new(self, mailbox)
   end
-  alias :in_label :in_mailbox
+  alias :mailbox :label
-  def open_smtp(&block)
-    raise ArgumentError, "This method is to be used with a block." unless block_given?
-    meta = class << self; self end
-    puts "Opening SMTP..."
-    Net::SMTP.start('smtp.gmail.com', 587, 'localhost.localdomain', meta.username, meta.password, 'plain', true) do |smtp|
-      puts "SMTP open."
-      block.call(lambda {|to, body|
-        from = meta.username
-        puts "Sending from #{from} to #{to}:\n#{body}"
-        smtp.send_message(body.to_s, from, to)
-      })
-      puts "SMTP closing."
-    end
-    puts "SMTP closed."
+  ###########################
+  #  MAKING EMAILS
+  #
+  #  gmail.generate_message do
+  #    ...inside Mail context...
+  #  end
+  #
+  #  gmail.deliver do ... end
+  #
+  #  mail = Mail.new...
+  #  gmail.deliver!(mail)
+  ###########################
+  def generate_message(&block)
+    require 'net/smtp'
+    require 'smtp_tls'
+    require 'mail'
+    mail = Mail.new(&block)
+    mail.delivery_method(*smtp_settings)
+    mail
   end
-  def new_message
-    MIME::Message.generate
+  def deliver(mail=nil, &block)
+    require 'net/smtp'
+    require 'smtp_tls'
+    require 'mail'
+    mail = Mail.new(&block) if block_given?
+    mail.delivery_method(*smtp_settings)
+    mail.from = meta.username unless mail.from
+    mail.deliver!
   end
-  def send_email(to, body=nil)
-    meta = class << self; self end
-    if to.is_a?(MIME::Message)
-      to.headers['from'] = meta.username
-      to.headers['date'] = Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")
-      body = to.to_s
-      to = to.to
+  ###########################
+  #  LOGIN
+  ###########################
+  def login
+    res = @imap.login(meta.username, meta.password)
+    @logged_in = true if res.name == 'OK'
+  end
+  def logged_in?
+    !!@logged_in
+  end
+  # Log out of gmail
+  def logout
+    if logged_in?
+      res = @imap.logout
+      @logged_in = false if res.name == 'OK'
     end
-    raise ArgumentError, "Please supply (to, body) to Gmail#send_email" if body.nil?
-    open_smtp do |smtp|
-      smtp.call to, body
+  end
+  def in_mailbox(mailbox, &block)
+    if block_given?
+      mailbox_stack << mailbox
+      unless @selected == mailbox.name
+        imap.select(mailbox.name)
+        @selected = mailbox.name
+      end
+      value = block.arity == 1 ? block.call(mailbox) : block.call
+      mailbox_stack.pop
+      # Select previously selected mailbox if there is one
+      if mailbox_stack.last
+        imap.select(mailbox_stack.last.name)
+        @selected = mailbox.name
+      end
+      return value
+    else
+      mailboxes[name] ||= Mailbox.new(self, mailbox)
     end
   end
+  alias :in_label :in_mailbox
+  ###########################
+  #  Other...
+  ###########################
+  def inspect
+    "#<Gmail:#{'0x%x' % (object_id << 1)} (#{meta.username}) #{'dis' if !logged_in?}connected>"
+  end
+  # Accessor for @imap, but ensures that it's logged in first.
+  def imap
+    unless logged_in?
+      login
+      at_exit { logout } # Set up auto-logout for later.
+    end
+    @imap
+  end
   private
     def mailboxes
       @mailboxes ||= {}
@@ -118,6 +147,21 @@ class Gmail
     def mailbox_stack
       @mailbox_stack ||= []
     end
+    def meta
+      class << self; self end
+    end
+    def domain
+      meta.username.split('@')[0]
+    end
+    def smtp_settings
+      [:smtp, {:address => "smtp.gmail.com",
+      :port => 587,
+      :domain => domain,
+      :user_name => meta.username,
+      :password => meta.password,
+      :authentication => 'plain',
+      :enable_starttls_auto => true}]
+    end
 end
 require 'gmail/mailbox'

data/lib/gmail/message.rb CHANGED

@@ -16,37 +16,17 @@ class Gmail
       @uid ||= @gmail.imap.uid_search(['HEADER', 'Message-ID', message_id])[0]
     end
-    def message_id
-      @message_id || begin
-        @gmail.in_mailbox(@mailbox) do
-          @message_id = @gmail.imap.uid_fetch(@uid, ['ENVELOPE'])[0].attr['ENVELOPE'].message_id
-        end
-      end
-      @message_id
-    end
-    def body
-      @body ||= @gmail.in_mailbox(@mailbox) do
-        @gmail.imap.uid_fetch(uid, "RFC822")[0].attr["RFC822"]
-      end
-    end
-    # Parsed MIME message object
-    def message
-      @message ||= MIME::Message.new(body)
-    end
     # IMAP Operations
     def flag(flg)
       @gmail.in_mailbox(@mailbox) do
         @gmail.imap.uid_store(uid, "+FLAGS", [flg])
-      end
+      end ? true : false
     end
     def unflag(flg)
       @gmail.in_mailbox(@mailbox) do
         @gmail.imap.uid_store(uid, "-FLAGS", [flg])
-      end
+      end ? true : false
     end
     # Gmail Operations
@@ -60,7 +40,7 @@ class Gmail
         flag(:Deleted)
       when :spam
         move_to('[Gmail]/Spam')
-      end
+      end ? true : false
     end
     def delete!
@@ -102,5 +82,23 @@ class Gmail
     def archive!
       move_to('[Gmail]/All Mail')
     end
+    private
+    # Parsed MIME message object
+    def message
+      require 'mail'
+      _body = @gmail.in_mailbox(@mailbox) { @gmail.imap.uid_fetch(uid, "RFC822")[0].attr["RFC822"] }
+      @message ||= Mail.new(_body)
+    end
+    # Delegate all other methods to the Mail message
+    def method_missing(*args, &block)
+      if block_given?
+        message.send(*args, &block)
+      else
+        message.send(*args)
+      end
+    end
   end
 end

data/lib/smtp_tls.rb CHANGED

@@ -11,8 +11,8 @@ Net::SMTP.class_eval do
   end
   def start( helo = 'localhost.localdomain',
-             user = nil, secret = nil, authtype = nil, use_tls = false ) # :yield: smtp
-    start_method = use_tls ? :do_tls_start : :do_start
+             user = nil, secret = nil, authtype = nil ) # :yield: smtp
+    start_method = starttls_auto? ? :do_tls_start : :do_start
     if block_given?
       begin
         send(start_method, helo, user, secret, authtype)

data/ruby-gmail.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{ruby-gmail}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BehindLogic"]
-  s.date = %q{2010-05-11}
+  s.date = %q{2010-05-14}
   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,11 +26,6 @@ Gem::Specification.new do |s|
      "lib/gmail.rb",
      "lib/gmail/mailbox.rb",
      "lib/gmail/message.rb",
-     "lib/ietf/rfc2045.rb",
-     "lib/ietf/rfc822.rb",
-     "lib/mime/entity.rb",
-     "lib/mime/entity_tmail.rb",
-     "lib/mime/message.rb",
      "lib/smtp_tls.rb",
      "ruby-gmail.gemspec",
      "test/test_gmail.rb",
@@ -57,14 +52,14 @@ Support me in making new and better gems:[0m [31;4mhttp://pledgie.com/campaign
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<shared-mime-info>, [">= 0"])
-      s.add_runtime_dependency(%q<tmail>, [">= 1.2.3"])
+      s.add_runtime_dependency(%q<mail>, [">= 2.2.1"])
     else
       s.add_dependency(%q<shared-mime-info>, [">= 0"])
-      s.add_dependency(%q<tmail>, [">= 1.2.3"])
+      s.add_dependency(%q<mail>, [">= 2.2.1"])
     end
   else
     s.add_dependency(%q<shared-mime-info>, [">= 0"])
-    s.add_dependency(%q<tmail>, [">= 1.2.3"])
+    s.add_dependency(%q<mail>, [">= 2.2.1"])
   end
 end

metadata CHANGED

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors:
 - BehindLogic
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-05-11 00:00:00 -04:00
+date: 2010-05-14 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -30,17 +30,17 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency
-  name: tmail
+  name: mail
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         segments:
-        - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 2
+        - 1
+        version: 2.2.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.
@@ -62,11 +62,6 @@ files:
 - lib/gmail.rb
 - lib/gmail/mailbox.rb
 - lib/gmail/message.rb
-- lib/ietf/rfc2045.rb
-- lib/ietf/rfc822.rb
-- lib/mime/entity.rb
-- lib/mime/entity_tmail.rb
-- lib/mime/message.rb
 - lib/smtp_tls.rb
 - ruby-gmail.gemspec
 - test/test_gmail.rb

data/lib/ietf/rfc2045.rb DELETED

@@ -1,29 +0,0 @@
-require 'ietf/rfc822'
-module IETF
-  module RFC2045
-    def self.parse_rfc2045_from(raw)
-      headers, raw = IETF::RFC822.parse_rfc822_from(raw)
-      if headers['content-type'] =~ /multipart\/(\w+); boundary=([\"\'])(.*)\2/ || headers['content-type'] =~ /multipart\/(\w+); boundary(=)(.*)$/
-        content = {}
-        content[:type] = $1
-        content[:boundary] = $3
-        content[:content] = IETF::RFC2045.parse_rfc2045_content_from(raw, content[:boundary])
-      else
-        content = raw
-      end
-      return [headers, content]
-    end
-    def self.parse_rfc2045_content_from(raw, boundary)
-      parts = ("\r\n" + raw).split(/#{CRLF.source}--#{boundary}(?:--)?(?:#{CRLF.source}|$)/)
-      parts.reject! {|p| p.gsub(/^[ \r\n#{HTAB}]?$/,'') == ''} # Remove any parts that are blank
-      puts "[RFC2045] PARTS:\n\t#{parts.map {|p| p.gsub(/\n/,"\n\t")}.join("\n---\n\t")}" if $DEBUG
-      parts.collect {|part|
-        puts "[RFC2045] Parsing PART with boundary #{boundary.inspect}:\n\t#{part.gsub(/\n/,"\n\t")}" if $DEBUG
-        IETF::RFC2045.parse_rfc2045_from(part)
-      }
-    end
-  end
-end

data/lib/ietf/rfc822.rb DELETED

@@ -1,22 +0,0 @@
-module IETF
-  CRLF = /\r\n/ # We can be a little lax about those carriage-returns.
-  TEXT = /.+?(?=#{CRLF.source}|$)/
-  HTAB = Regexp.new(11.chr)
-  LWSP_CHAR = /[ \t#{HTAB.source}]/
-  CTL = Regexp.new([(0...37).to_a,177].flatten.map {|i| i.chr}.join)
-  FIELD_BODY = /#{TEXT.source}(?:#{CRLF.source}#{LWSP_CHAR.source}#{TEXT.source})*/
-  FIELD_NAME = /^[^#{CTL.source} :]+/
-  FIELD = /(#{FIELD_NAME.source}):\s*(#{FIELD_BODY.source})/
-  module RFC822
-    def self.parse_rfc822_from(raw)
-      headers = {}
-      # Parse out rfc822 (headers)
-      head, remaining_raw = raw.split(/#{CRLF.source}#{CRLF.source}/,2)
-      puts "[RFC822] HEAD found:\n\t#{head.gsub(/\n/,"\n\t")}" if $DEBUG
-      head.scan(FIELD) do |field_name, field_body|
-        headers[field_name.downcase] = field_body
-      end
-      return [headers, remaining_raw]
-    end
-  end
-end

data/lib/mime/entity.rb DELETED

@@ -1,202 +0,0 @@
-require 'ietf/rfc2045'
-String::ALPHANUMERIC_CHARACTERS = ('a'..'z').to_a + ('A'..'Z').to_a unless defined? String::ALPHANUMERIC_CHARACTERS
-def String.random(size)
-  length = String::ALPHANUMERIC_CHARACTERS.length
-  (0...size).collect { String::ALPHANUMERIC_CHARACTERS[Kernel.rand(length)] }.join
-end
-module MIME
-  def self.capitalize_header(header_name)
-    header_name.gsub(/^(\w)/) {|m| m.capitalize}.gsub(/-(\w)/) {|n| '-' + n[1].chr.capitalize}
-  end
-  class Entity
-    def initialize(one=nil,two=nil)
-      if one.is_a?(Hash) || two.is_a?(Hash) # Intent is to generate a message from parameters
-        @headers = one.is_a?(Hash) ? one : two
-        set_content one if one.is_a?(String)
-        @encoding = 'quoted-printable' unless encoding
-      elsif one.is_a?(String) # Intent is to parse a message body
-        @raw = one.gsub(/\r/,'').gsub(/\n/, "\r\n") # normalizes end-of-line characters
-        from_parsed(IETF::RFC2045.parse_rfc2045_from(@raw))
-      end
-    end
-    def inspect
-      "<#{self.class.name}##{object_id} Headers:{#{headers.collect {|k,v| "#{k}=#{v}"}.join(' ')}} content:#{multipart? ? 'multipart' : 'flat'}>"
-    end
-    def parsed
-      IETF::RFC2045.parse_rfc2045_from(@raw)
-    end
-    # This means we have a structure from IETF::RFC2045.
-    # Entity is: [headers, content], while content may be an array of Entities.
-    # Or, {:type, :boundary, :content}
-    def from_parsed(parsed)
-      case parsed
-      when Array
-        if parsed[0].is_a?(Hash) && (parsed[1].is_a?(Hash) || parsed[1].is_a?(String))
-          @headers = parsed[0]
-          @content = parsed[1].is_a?(Hash) ? parsed[1][:content].collect {|p| Entity.new.from_parsed(p)} : parsed[1]
-          if parsed[1].is_a?(Hash)
-            @multipart_type = parsed[1][:type]
-            @multipart_boundary = parsed[1][:boundary]
-            raise "IETF PARSING FAIL! (empty boundary)" if @multipart_boundary == ''
-          end
-        else
-          raise "IETF PARSING FAIL! ('A' structure)"
-        end
-        return self
-      when Hash
-        if parsed.has_key?(:type) && parsed.has_key?(:boundary) && parsed.has_key?(:content)
-          @content = parsed[:content].is_a?(Array) ? parsed[:content].collect {|p| Entity.new.from_parsed(p)} : parsed[:content]
-        else
-          raise "IETF PARSING FAIL! ('H' structure)"
-        end
-        return self
-      end
-      raise ArgumentError, "Must pass in either: [an array with two elements: headers(hash) and content(string or array)] OR [a hash containing :type, :boundary, and :content(being the former or a string)]"
-    end
-    ##############
-    # ATTRIBUTES #
-    # An Entity has Headers.
-    def headers
-      @headers ||= {}
-    end
-    # An Entity has Content.
-    #   IF the Content-Type is a multipart type,
-    #   the content will be one or more Entities.
-    attr_reader :content, :multipart_type
-    #################
-    # Macro Methods #
-    def multipart?
-      !!(headers['content-type'] =~ /multipart\//) if headers['content-type']
-    end
-    def multipart_type
-      if headers['content-type'] =~ /multipart\/(\w+)/
-        $1
-      end if headers['content-type']
-    end
-    # Auto-generates a boundary if one doesn't yet exist.
-    def multipart_boundary
-      return nil unless multipart?
-      @multipart_boundary || begin
-        # Content-Type: multipart/mixed; boundary=000e0cd28d1282f4ba04788017e5
-        @multipart_boundary = String.random(25)
-        headers['content-type'] = "multipart/#{multipart_type}; boundary=#{@multipart_boundary}"
-        @multipart_boundary
-      end
-    end
-    def attachment?
-      headers['content-disposition'] =~ /^attachment(?=;|$)/ || headers['content-disposition'] =~ /^form-data;.* filename=[\"\']?[^\"\']+[\"\']?/ if headers['content-disposition']
-    end
-    alias :file? :attachment?
-    def part_filename
-      # Content-Disposition: attachment; filename="summary.txt"
-      if headers['content-disposition'] =~ /; filename=[\"\']?([^\"\']+)/
-        $1
-      end if headers['content-disposition']
-    end
-    def encoding
-      @encoding ||= headers['content-transfer-encoding'] || nil
-    end
-    attr_writer :encoding
-    alias :set_encoding :encoding=
-    def find_part(options)
-      find_parts(options).first
-    end
-    def find_parts(options)
-      parts = []
-      return nil unless (options[:content_type] && headers['content-type']) || (options[:content_disposition] && headers['content-disposition'])
-        # Do I match your search?
-        iam = true
-        iam = false if options[:content_type] && headers['content-type'] !~ /^#{options[:content_type]}(?=;|$)/
-        iam = false if options[:content_disposition] && headers['content-disposition'] !~ /^#{options[:content_disposition]}(?=;|$)/
-        parts << self if iam
-        # Do any of my children match your search?
-        content.each do |part|
-          parts.concat part.find_parts(options)
-        end if multipart?
-      return parts
-    end
-    def save_to_file(path=nil)
-      filename = path if path && !File.exists?(path) # If path doesn't exist, assume it's a filename
-      filename ||= path + '/' + part_filename if path && attachment? # If path does exist, and we're saving an attachment, use the attachment filename
-      filename ||= (attachment? ? part_filename : path) # If there is no path and we're saving an attachment, use the attachment filename; otherwise use path (whether it is present or not)
-      filename ||= '.' # No path supplied, and not saving an attachment. We'll just save it in the current directory.
-      if File.directory?(filename)
-        i = 0
-        begin
-          i += 1
-          filename = filename + "/attachment-#{i}"
-        end until !File.exists(filename)
-      end
-      # After all that trouble to get a filename to save to...
-      File.open(filename, 'w') do |file|
-        file << decoded_content
-      end
-    end
-    ##########################
-    # CONVERTING / RENDERING #
-    # Renders this data structure into a string, encoded
-    def to_s
-      multipart_boundary # initialize the boundary if necessary
-      headers_string = {'charset' => 'utf-8', 'content-transfer-encoding' => @encoding} \
-        .merge(headers) \
-        .inject('') {|a,(k,v)| a << "#{MIME.capitalize_header(k)}: #{v}\r\n" }
-      content_string = content.is_a?(Array) ?
-        content.to_s :
-        content.collect {|part| "--#{multipart_boundary}\r\n#{part.to_s}\r\n" }.join + "--#{multipart_boundary}--\r\n"
-      [headers_string, content_string].join("\r\n")
-    end
-    # Converts this data structure into a string, but decoded if necessary
-    def decoded_content
-      return nil if @content.is_a?(Array)
-      case encoding.to_s.downcase
-      when 'quoted-printable'
-        @content.unpack('M')[0]
-      when 'base64'
-        @content.unpack('m')[0]
-      # when '7bit'
-      #   # should get this 7bit encoding done too...
-      else
-        @content
-      end
-    end
-    # You can set new content, and it will be saved in encoded form.
-    def set_content(raw)
-      @content = raw.is_a?(Array) ? raw :
-        case encoding.to_s.downcase
-        when 'quoted-printable'
-          [raw].pack('M')
-        when 'base64'
-          [raw].pack('m')
-        else
-          raw
-        end
-    end
-    alias :content= :set_content
-    private
-      def transfer_to(other)
-        other.instance_variable_set(:@content, @content.dup) if @content
-        other.headers.clear
-        other.headers.merge!(Hash[*headers.dup.select {|k,v| k =~ /content/}.flatten])
-      end
-  end
-end

data/lib/mime/entity_tmail.rb DELETED

@@ -1,219 +0,0 @@
-require 'tmail'
-require 'ietf/rfc2045'
-String::ALPHANUMERIC_CHARACTERS = ('a'..'z').to_a + ('A'..'Z').to_a unless defined? String::ALPHANUMERIC_CHARACTERS
-def String.random(size)
-  length = String::ALPHANUMERIC_CHARACTERS.length
-  (0...size).collect { String::ALPHANUMERIC_CHARACTERS[Kernel.rand(length)] }.join
-end
-module MIME
-  def self.capitalize_header(header_name)
-    header_name.gsub(/^(\w)/) {|m| m.capitalize}.gsub(/-(\w)/) {|n| '-' + n[1].chr.capitalize}
-  end
-  class Entity
-    def initialize(one=nil,two=nil)
-      if one.is_a?(Hash) || two.is_a?(Hash) # Intent is to generate a message from parameters
-        @headers = one.is_a?(Hash) ? one : two
-        set_content one if one.is_a?(String)
-        @encoding = 'quoted-printable' unless encoding
-      elsif one.is_a?(String) # Intent is to parse a message body
-        @raw = one.gsub(/\r/,'').gsub(/\n/, "\r\n") # normalizes end-of-line characters
-        @tmail = TMail::Mail.parse(@raw)
-        from_tmail(@tmail)
-      elsif one.is_a?(TMail::Mail)
-        @tmail = one
-        from_tmail(@tmail)
-      end
-    end
-    def inspect
-      "<#{self.class.name}##{object_id} Headers:{#{headers.collect {|k,v| "#{k}=#{v}"}.join(' ')}} content:#{multipart? ? 'multipart' : 'flat'}>"
-    end
-    # This means we have a structure from IETF::RFC2045.
-    # Entity is: [headers, content], while content may be an array of Entities.
-    # Or, {:type, :boundary, :content}
-    def from_parsed(parsed)
-      case parsed
-      when Array
-        if parsed[0].is_a?(Hash) && (parsed[1].is_a?(Hash) || parsed[1].is_a?(String))
-          @headers = parsed[0]
-          @content = parsed[1].is_a?(Hash) ? parsed[1][:content].collect {|p| Entity.new.from_parsed(p)} : parsed[1]
-          if parsed[1].is_a?(Hash)
-            @multipart_type = parsed[1][:type]
-            @multipart_boundary = parsed[1][:boundary]
-            raise "IETF PARSING FAIL! (empty boundary)" if @multipart_boundary == ''
-          end
-        else
-          raise "IETF PARSING FAIL! ('A' structure)"
-        end
-        return self
-      when Hash
-        if parsed.has_key?(:type) && parsed.has_key?(:boundary) && parsed.has_key?(:content)
-          @content = parsed[:content].is_a?(Array) ? parsed[:content].collect {|p| Entity.new.from_parsed(p)} : parsed[:content]
-        else
-          raise "IETF PARSING FAIL! ('H' structure)"
-        end
-        return self
-      end
-      raise ArgumentError, "Must pass in either: [an array with two elements: headers(hash) and content(string or array)] OR [a hash containing :type, :boundary, and :content(being the former or a string)]"
-    end
-    # Parse a tmail object into our Entity object
-    def from_tmail(tmail)
-      raise ArgumentError, "Expecting a TMail::Mail object." unless tmail.is_a?(TMail::Mail)
-      @headers ||= Hash.new {|h,k| tmail.header[k].to_s }
-      if multipart?
-        @content = tmail.parts.collect { |tpart| Entity.new.from_tmail(tpart) }
-      else
-        set_content tmail.body # TMail has already decoded it, but we need it still encoded
-      end
-    end
-    ##############
-    # ATTRIBUTES #
-    # An Entity has Headers.
-    def headers
-      @headers ||= {}
-    end
-    # An Entity has Content.
-    #   IF the Content-Type is a multipart type,
-    #   the content will be one or more Entities.
-    attr_reader :content, :multipart_type
-    #################
-    # Macro Methods #
-    def multipart?
-      return @tmail.multipart? if @tmail
-      !!(headers['content-type'] =~ /multipart\//) if headers['content-type']
-    end
-    def multipart_type
-      if headers['content-type'] =~ /multipart\/(\w+)/
-        $1
-      end if headers['content-type']
-    end
-    # Auto-generates a boundary if one doesn't yet exist.
-    def multipart_boundary
-      return nil unless multipart?
-      unless @multipart_boundary ||= (@tmail && @tmail.header['content-type'] ? @tmail.header['content-type'].params['boundary'] : nil)
-        # Content-Type: multipart/mixed; boundary=000e0cd28d1282f4ba04788017e5
-        @multipart_boundary = String.random(25)
-        headers['content-type'] = "multipart/#{multipart_type}; boundary=#{@multipart_boundary}"
-        @multipart_boundary
-      end
-      @multipart_boundary
-    end
-    def attachment?
-      @tmail.disposition_is_attachment? || headers['content-disposition'] =~ /^form-data;.* filename=[\"\']?[^\"\']+[\"\']?/ if headers['content-disposition']
-    end
-    alias :file? :attachment?
-    def part_filename
-      # Content-Disposition: attachment; filename="summary.txt"
-      if headers['content-disposition'] =~ /; filename=[\"\']?([^\"\']+)/
-        $1
-      end if headers['content-disposition']
-    end
-    def encoding
-      @encoding ||= headers['content-transfer-encoding'] || nil
-    end
-    # Re-encodes content if necessary when a new encoding is set
-    def encoding=(new_encoding)
-      raw_content = decoded_content # nil if multipart
-      @encoding = new_encoding
-      set_content(raw_content) if raw_content # skips if multipart
-      @encoding
-    end
-    alias :set_encoding :encoding=
-    def find_part(options)
-      find_parts(options,true).first
-    end
-    def find_parts(options,find_only_one=false)
-      parts = []
-      return nil unless (options[:content_type] && headers['content-type']) || (options[:content_disposition] && headers['content-disposition'])
-        # Do I match your search?
-        iam = true
-        iam = false if options[:content_type] && headers['content-type'] !~ /^#{options[:content_type]}(?=;|$)/
-        iam = false if options[:content_disposition] && headers['content-disposition'] !~ /^#{options[:content_disposition]}(?=;|$)/
-        parts << self if iam
-        return parts unless parts.empty?
-        # Do any of my children match your search?
-        content.each do |part|
-          parts.concat part.find_parts(options,find_only_one)
-          return parts if !parts.empty? && find_only_one
-        end if multipart?
-      return parts
-    end
-    def save_to_file(path=nil)
-      filename = path if path && !File.exists?(path) # If path doesn't exist, assume it's a filename
-      filename ||= path + '/' + part_filename if path && attachment? # If path does exist, and we're saving an attachment, use the attachment filename
-      filename ||= (attachment? ? part_filename : path) # If there is no path and we're saving an attachment, use the attachment filename; otherwise use path (whether it is present or not)
-      filename ||= '.' # No path supplied, and not saving an attachment. We'll just save it in the current directory.
-      if File.directory?(filename)
-        i = 0
-        begin
-          i += 1
-          filename = filename + "/attachment-#{i}"
-        end until !File.exists(filename)
-      end
-      # After all that trouble to get a filename to save to...
-      File.open(filename, 'w') do |file|
-        file << decoded_content
-      end
-    end
-    ##########################
-    # CONVERTING / RENDERING #
-    # Renders this data structure into a string, encoded
-    def to_s
-      multipart_boundary # initialize the boundary if necessary, so it will be included in the headers
-      headers.inject('') {|a,(k,v)| a << "#{MIME.capitalize_header(k)}: #{v}\r\n"} + "\r\n" + if content.is_a?(Array)
-        "\r\n--#{multipart_boundary}\r\n" + content.collect {|part| part.to_s }.join("\r\n--#{multipart_boundary}\r\n") + "\r\n--#{multipart_boundary}--\r\n"
-      else
-        content.to_s
-      end
-    end
-    # Converts this data structure into a string, but decoded if necessary
-    def decoded_content
-      return nil if @content.is_a?(Array)
-      case encoding.to_s.downcase
-      when 'quoted-printable'
-        @content.unpack('M')[0]
-      when 'base64'
-        @content.unpack('m')[0]
-      # when '7bit'
-      #   # should get this 7bit encoding done too...
-      else
-        @content
-      end
-    end
-    # You can set new content, and it will be saved in encoded form.
-    def set_content(raw)
-      @content = raw.is_a?(Array) ? raw :
-        case encoding.to_s.downcase
-        when 'quoted-printable'
-          [raw].pack('M')
-        when 'base64'
-          [raw].pack('m')
-        else
-          raw
-        end
-    end
-    alias :content= :set_content
-    private
-      def transfer_to(other)
-        other.instance_variable_set(:@content, @content.dup) if @content
-        other.headers.clear
-        other.headers.merge!(Hash[*headers.dup.select {|k,v| k =~ /content/}.flatten])
-      end
-  end
-end

data/lib/mime/message.rb DELETED

@@ -1,82 +0,0 @@
-require 'mime/entity_tmail'
-module MIME
-  # A Message is really a MIME::Entity,
-  # but should be used for the outermost Entity, because
-  # it includes helper methods to access common data
-  # from an email message.
-  class Message < Entity
-    def self.generate
-      Message.new('content-type' => 'text/plain', 'mime-version' => '1.0')
-    end
-    def to(addressee=nil)
-      headers['to'] = addressee if addressee
-      headers['to'].match(/([A-Z0-9._%+-]+@[A-Z0-9._%+-]+\.[A-Z]+)/i)[1] if headers['to'].respond_to?(:match)
-    end
-    def subject(subj=nil)
-      headers['subject'] = subj if subj
-      headers['subject']
-    end
-    def from(dummy=nil)
-      raise "Can't set FROM address in the message - will be set automatically when the message is sent." if dummy
-      headers['from'].match(/([A-Z0-9._%+-]+@[A-Z0-9._%+-]+\.[A-Z]+)/i)[1] if headers['from'].respond_to?(:match)
-    end
-    def attachments
-      find_parts(:content_disposition => 'attachment')
-    end
-    def text
-      part = find_part(:content_type => 'text/plain')
-      part.content if part
-    end
-    def html
-      part = find_part(:content_type => 'text/html')
-      part.content if part
-    end
-    def save_attachments_to(path=nil)
-      attachments.each {|a| a.save_to_file(path) }
-    end
-    def generate_multipart(*content_types)
-      headers['content-type'] = 'multipart/alternative'
-      @content = content_types.collect { |content_type| Entity.new('content-type' => content_type) }
-    end
-    def attach_file(filename)
-      raise ArgumentError, "Currently the <filename> given must be a String (path to a file)." unless filename.is_a?(String)
-      short_filename = filename.match(/([^\\\/]+)$/)[1]
-      # Generate the attachment piece
-      require 'shared-mime-info'
-      attachment = Entity.new(
-        'content-type' => MIME.check(filename).type + "; \r\n  name=\"#{short_filename}\"",
-        'content-disposition' => "attachment; \r\n  filename=\"#{short_filename}\"",
-        'content-transfer-encoding' => 'base64'
-      )
-      attachment.content = File.read(filename)
-      # Enclose in a top-level multipart/mixed
-      if multipart? && multipart_type == 'mixed'
-        # If we're already dealing with a mixed multipart, all we have to do is add the attachment part
-        (@content ||= []) << attachment
-      else
-        # If there is no content yet, add a little message about the attachment(s).
-        set_content 'See attachment(s)' if @content.nil?
-        # Generate the new top-level multipart, transferring what is here already into a child object
-        new_content = Entity.new
-        # Whatever it is, since it's not multipart/mixed, transfer it into a child object and add the attachment.
-        transfer_to(new_content)
-        headers.reject! {|k,v| k =~ /content/}
-        headers['content-type'] = 'multipart/mixed'
-        headers.delete 'content-transfer-encoding' # because we don't need a transfer-encoding on a multipart package.
-        @content = [new_content, attachment]
-      end
-      attachment
-    end
-  end
-end