mms2r 2.2.0 → 2.3.0

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 coverage/
 pkg/
+email.txt

data/History.txt

@@ -1,3 +1,24 @@
+### 2.3.0 / 2008-08-30 (Snakes 'n' Barrels Greatest Hits)
+* 5 new features
+  * detect smartphone status/type based on model metadata from jpeg and tiff
+    exif data using exifr gem, access exif data with MMS2R::Media#exif
+  * make MMS2R Rails gem packaging friendly with an init.rb - Scott Taylor,
+    smtlaissezfaire
+  * delegate missing methods to mms2r's tmail object so that mms2r behaves as
+    if it were a tmail object - Sai Emrys, saizai
+  * default_media can return an attachment of application content type -
+    Brendan Lim, brendanlim
+  * MMS2R.parse(raw_mail) convenience class method that parses and returns an
+    mms2r from a mail file - saizai
+
+* 4 minor enhancements
+  * make examples more 'mail' specific to enforce the fact that an mms is a
+    multipart email - saizai
+  * update for text in vzwpix.com default carrier message
+  * detecting smartphone (blackberries and iphones for now) is more versatile
+    from reading mail headers
+  * expanded filtering of carrier advertising text in mms from smartphones
+
 ### 2.2.0 / 2009-01-04 (Rikki Kixx - owner of a franchise of rehab centers)
 
 * 3 new features

data/Manifest.txt

@@ -40,6 +40,7 @@ conf/waw.plspictures.com.yml
 dev_tools/anonymizer.rb
 dev_tools/debug_sprint_hpricot_parsing.rb
 dev_tools/github.rb
+init.rb
 lib/mms2r.rb
 lib/mms2r/media.rb
 lib/mms2r/media/sprint.rb
@@ -74,6 +75,7 @@ test/fixtures/iconv-fr-text-01.mail
 test/fixtures/indosat-image-01.mail
 test/fixtures/indosat-image-02.mail
 test/fixtures/info2go-image-01.mail
+test/fixtures/iphone-image-01.mail
 test/fixtures/luxgsm-image-01.mail
 test/fixtures/maroctelecom-france-mms-01.mail
 test/fixtures/mediamessaging_o2_co_uk-image-01.mail
@@ -129,6 +131,7 @@ test/fixtures/vodacom4me-co-za-02.mail
 test/fixtures/vodacom4me-southafrica-mms-01.mail
 test/fixtures/vodacom4me-southafrica-mms-04.mail
 test/fixtures/vtext-text-01.mail
+test/fixtures/vzwpix.com-image-01.mail
 test/fixtures/waw.plspictures.com-image-01.mail
 test/test_1nbox_net.rb
 test/test_bell_canada.rb

data/README.txt

@@ -1,23 +1,23 @@
 = mms2r
 
+  http://mms2r.rubyforge.org/
   by Mike Mondragon
-  http://mms2r.rubyforge.org/ 
-  http://rubyforge.org/tracker/?group_id=3065 
+  http://rubyforge.org/tracker/?group_id=3065
   http://github.com/monde/mms2r/tree/master
   http://peepcode.com/products/mms2r-pdf
 
 == DESCRIPTION
-  
-MMS2R is a library that decodes the parts of an MMS message to disk while 
-stripping out advertising injected by the mobile carriers.  MMS messages are 
+
+MMS2R is a library that decodes the parts of an MMS message to disk while
+stripping out advertising injected by the mobile carriers.  MMS messages are
 multipart email and the carriers often inject branding into these messages.  Use
 MMS2R if you want to get at the real user generated content from a MMS without
 having to deal with the cruft from the carriers.
 
-If MMS2R is not aware of a particular carrier no extra processing is done to the 
+If MMS2R is not aware of a particular carrier no extra processing is done to the
 MMS other than decoding and consolidating its media.
 
-Contact the author to add additional carriers to be processed by the library.  
+Contact the author to add additional carriers to be processed by the library.
 Suggestions and patches appreciated and welcomed!
 
 Corpus of carriers currently processed by MMS2R:
@@ -25,7 +25,7 @@ Corpus of carriers currently processed by MMS2R:
 * 1nbox/Idea: 1nbox.net
 * 3 Ireland: mms.3ireland.ie
 * Alltel: mms.alltel.com
-* AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com, 
+* AT&T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,
   cingularme.com, mobile.mycingular.com pics.cingularme.com
 * Bell Canada: txt.bell.ca
 * Bell South / Suncom: bellsouth.net
@@ -50,7 +50,7 @@ Corpus of carriers currently processed by MMS2R:
 * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk, tmo.blackberry.net
 * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
 * UAE MMS: mms.ae
-* Unicel: unicel.com, info2go.com 
+* Unicel: unicel.com, info2go.com
   (note: mobile number is tucked away in a text/plain part for unicel.com)
 * Verizon: vzwpix.com, vtext.com
 * Virgin Mobile: vmpix.com
@@ -59,8 +59,8 @@ Corpus of carriers currently processed by MMS2R:
 
 == FEATURES
 
-* #default_media and #default_text methods return a File that can be used in 
-  attachment_fu 
+* #default_media and #default_text methods return a File that can be used in
+  attachment_fu
 * #process supports blocks to for enumerating over the content of the MMS
 * #process can be made lazy when :process => :lazy is passed to new
 * logging is enabled when :logger => your_logger is passed to new
@@ -79,59 +79,75 @@ http://peepcode.com/products/mms2r-pdf
   require 'tmail'
   require 'fileutils'
 
-  mail = TMail::Mail.parse(IO.readlines("sample-MMS.file").join)
-  mms = MMS2R::Media.new(mail)
+  mail = MMS2R.parse mail
+  # mail = MMS2R.parse File.read('some_saved_mail.file')
 
-  puts "MMS has default carrier subject" if mms.subject.empty?
+  puts "mail has default carrier subject" if mail.subject.empty?
 
   # access the sender's phone number
-  puts "MMS was from phone #{mms.number}"
+  puts "mail was from phone #{mail.number}"
 
-  # most MMS are either image or video, default_media will return the largest
+  # most mail are either image or video, default_media will return the largest
   # (non-advertising) video or image found
-  file = mms.default_media
-  puts "MMS had a media: #{file.inspect}" unless file.nil?
+  file = mail.default_media
+  puts "mail had a media: #{file.inspect}" unless file.nil?
 
   # finds the largest (non-advertising) text found
-  file = mms.default_text
-  puts "MMS had some text: #{file.inspect}" unless file.nil?
+  file = mail.default_text
+  puts "mail had some text: #{file.inspect}" unless file.nil?
 
-  # mms.media is a hash that is indexed by mime-type.
+  # mail.media is a hash that is indexed by mime-type.
   # The mime-type key returns an array of filepaths
-  # to media that were extract from the MMS and
+  # to media that were extract from the mail and
   # are of that type
-  mms.media['image/jpeg'].each {|f| puts "#{f}"}
-  mms.media['text/plain'].each {|f| puts "#{f}"}
+  mail.media['image/jpeg'].each {|f| puts "#{f}"}
+  mail.media['text/plain'].each {|f| puts "#{f}"}
 
-  # print the text (assumes MMS had text)
-  text = IO.readlines(mms.media['text/plain'].first).join
+  # print the text (assumes mail had text)
+  text = IO.readlines(mail.media['text/plain'].first).join
   puts text
 
-  # save the image (assumes MMS had a jpeg)
-  FileUtils.cp mms.media['image/jpeg'].first, '/some/where/useful', :verbose => true
+  # save the image (assumes mail had a jpeg)
+  FileUtils.cp mail.media['image/jpeg'].first, '/some/where/useful', :verbose => true
+
+  puts "does the mail have quicktime video? #{!mail.media['video/quicktime'].nil?}"
+
+  puts "plus run anything that TMail provides, e.g. #{mail.to.inspect}"
+
+  # check if the mail is from a mobile phone
+  puts "mail is from a mobile phone #{mail.is_mobile?}"
 
-  puts "does the MMS have quicktime video? #{!mms.media['video/quicktime'].nil?}"
+  # inspect default media's exif data if exifr gem is installed and default
+  # media is a jpeg or tiff
+  puts "mail is from a mobile phone #{mail.is_mobile?}"
+  puts "mail's default media's exif data is:"
+  puts mms.exif.inspect
 
   # Block support, process and receive all media types of video.
-  mms.process do |media_type, files|
+  mail.process do |media_type, files|
     # assumes a Clip model that is an AttachmentFu
     Clip.create(:uploaded_data => files.first, :title => "From phone") if media_type =~ /video/
   end
 
   # Another AttachmentFu example, Picture model is an AttachmentFu
   picture = Picture.new
-  picture.title = mms.subject
-  picture.uploaded_data = mms.default_media
+  picture.title = mail.subject
+  picture.uploaded_data = mail.default_media
   picture.save!
 
   #remove all the media that was put to temporary disk
-  mms.purge
+  mail.purge
 
 == REQUIREMENTS
 
 * Hpricot
 * TMail
 
+== OPTIONAL
+
+* exifr - install exifr for exif access on default jpeg or tiff media, and
+          smart phone detection
+
 == INSTALL
 
 conventional
@@ -146,13 +162,6 @@ github
 git clone git://github.com/monde/mms2r.git
 svn co svn://rubyforge.org/var/svn/mms2r/trunk mms2r
 
-== CONTRIBUTE
-
-If you contribute a patch that is accepted then you'll get developer rights 
-for the project on RubyForge.  Please ensure your work includes 100% test 
-converage.  The library is ZenTest autotest discovery enabled so running 
-autotest in the root of the project is very helpful during development.
-
 == AUTHORS
 
 Copyright (c) 2007-2008 by Mike Mondragon (blog[http://blog.mondragon.cc/])
@@ -174,6 +183,8 @@ MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 * Matt Conway
 * Kai Kai
 * Michael DelGaudio
+* Sai Emrys (blog[http://saizai.com])
+* Brendan Lim (github profile[http://github.com/brendanlim])
 
 == LICENSE
 

data/Rakefile

@@ -16,11 +16,11 @@ Hoe.new('mms2r', MMS2R::Media::VERSION) do |p|
   p.author = 'Mike Mondragon'
   p.email = 'mikemondragon@gmail.com'
   p.summary = 'Extract user media from MMS (and not carrier cruft)'
-  p.description = p.paragraphs_of('README.txt', 2..6).join("\n\n")
+  p.description = p.paragraphs_of('README.txt', 2..7).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 1).first.strip
-  p.changes = p.paragraphs_of('History.txt', 0..3).join("\n\n")
-  p.extra_deps << ['hpricot', '>= 0.6.0']
-  p.extra_deps << ['tmail', '>= 1.2.1']
+  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
+  p.extra_deps << ['hpricot']
+  p.extra_deps << ['tmail']
   p.clean_globs << 'coverage'
 end
 

data/conf/mms2r_media.yml

@@ -1,9 +1,13 @@
 ---
 ignore:
- text/plain:
- - /^\(no subject\)$/i
- multipart/mixed:
- - "/^Attachment: /i"
+  text/plain:
+  - /^\(no subject\)$/i
+  - /\ASent via BlackBerry (from|by) .*$/im
+  - /\ASent from my Verizon Wireless BlackBerry$/im
+  - /\ASent from (my|your) iPhone.?$/im
+  - /\ASent on the Sprint.* Now Network.*$/im
+  multipart/mixed:
+  - "/^Attachment: /i"
 transform: 
   text/plain: 
   - - /\A(.*?)Sent via BlackBerry (from|by) .*$/im
@@ -14,11 +18,14 @@ transform:
     - "\1"
   - - /\A(.*?)\s+image\/jpeg$/im
     - "\1"
+  - - /\A(.*?)Sent on the Sprint.* Now Network.*$/im
+    - "\1"
 device_types: 
-  headers: 
-    X-Mailer: 
-    - !ruby/regexp /^iPhone Mail/i
-    - :iphone
-    X-rim-org-msg-ref-id:
-    - !ruby/regexp /.+/
-    - :blackberry
+  headers:
+    x-mailer:
+      :iphone: !ruby/regexp /iPhone Mail/i
+      :blackberry: !ruby/regexp /Palm webOS/i
+    mime-version:
+      :iphone: !ruby/regexp /iPhone Mail/i
+    x-rim-org-msg-ref-id:
+      :blackberry: !ruby/regexp /.+/

data/conf/vzwpix.com.yml

@@ -1,8 +1,8 @@
 ---
 ignore:
   text/plain: 
-  - /\AThis message was sent using (the Picture and Video|PIX-FLIX) Messaging service from Verizon Wireless!.*/m
+  - /\AThis message was sent using .* from Verizon Wireless!.*/m
 transform: 
   text/plain: 
-  - - /\A(.+?)\s+This message was sent using (the Picture and Video|PIX-FLIX) Messaging service from Verizon Wireless!.*/m
+  - - /\A(.+?)\s+This message was sent using .* from Verizon Wireless!.*/m
     - "\1"

data/init.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + "/lib/mms2r"

data/lib/mms2r.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2007, 2008 by Mike Mondragon (mikemondragon@gmail.com)
+# Copyright (c) 2007-2010 by Mike Mondragon (mikemondragon@gmail.com)
 #
 # Please see the LICENSE file for licensing information.
 #++
@@ -39,14 +39,21 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
 
   end
 
+  # Simple convenience function to make it a one-liner:
+  # MMS2R.parse raw_mail or MMS2R.parse File.load(raw_mail)
+  # Combined w/ the method_missing delegation, this should behave as an enhanced TMail object, more or less.
+  def self.parse raw_mail
+    mail = TMail::Mail.parse raw_mail
+    MMS2R::Media.new(mail)
+  end
+
 end
 
 require 'rubygems'
-gem 'tmail', '>= 1.2.3'
 require 'tmail/mail'
 require 'fileutils'
 require 'pathname'

data/lib/mms2r/media.rb

@@ -1,22 +1,22 @@
 #--
-# Copyright (c) 2007, 2008 by Mike Mondragon (mikemondragon@gmail.com)
+# Copyright (c) 2007-2010 by Mike Mondragon (mikemondragon@gmail.com)
 #
-# Please see the LICENSE file for licensing information
+# Please see the LICENSE file for licensing information.
 #++
 
 ##
 # = Synopsis
 #
-# MMS2R is a library to collect media files from MMS messages.  MMS messages 
-# are multipart emails and mobile carriers often inject branding into these 
-# messages.  MMS2R strips the advertising from an MMS leaving the actual user 
+# MMS2R is a library to collect media files from MMS messages.  MMS messages
+# are multipart emails and mobile carriers often inject branding into these
+# messages.  MMS2R strips the advertising from an MMS leaving the actual user
 # generated media.
 #
-# The Tracker for MMS2R is located at 
+# The Tracker for MMS2R is located at
 # http://rubyforge.org/tracker/?group_id=3065
 # Please submit bugs and feature requests using the Tracker.
 #
-# If MMS from a carrier not known by MMS2R is encountered please submit a 
+# If MMS from a carrier not known by MMS2R is encountered please submit a
 # sample to the author for inclusion in this project.
 #
 # == Stand Alone Example
@@ -48,31 +48,31 @@
 # == Built In Configuration
 #
 # A custom configuration can be created for processing the MMS from carriers
-# that are not currently known by MMS2R.  In the  conf/ directory create a 
-# YAML file named by combining the domain name of the MMS sender plus a .yml 
-# extension.  For instance the configuration of senders from AT&T's cellular 
-# service with a Sender pattern of 2065551212@mms.att.net have a configuration 
+# that are not currently known by MMS2R.  In the  conf/ directory create a
+# YAML file named by combining the domain name of the MMS sender plus a .yml
+# extension.  For instance the configuration of senders from AT&T's cellular
+# service with a Sender pattern of 2065551212@mms.att.net have a configuration
 # named conf/mms.att.net.yml
 #
 # The YAML configuration contains a Hash with instructions for determining what
 # is content generated by the user and what is content inserted by the carrier.
 #
-# The root hash itself has two hashes under the keys 'ignore' and 'transform', 
+# The root hash itself has two hashes under the keys 'ignore' and 'transform',
 # and an array under the 'number' key.
 # Each hash is itself keyed by mime-type.  The value pointed to by the mime-type
-# key is an array.  The ignore arrays are first evaluated as a regular expressions 
+# key is an array.  The ignore arrays are first evaluated as a regular expressions
 # and if the evaluation fails as a equality for a string filename.  Ignores
 # work by filename for the multi-part of the MMS that is being inspected.  The
-# array pointed to by the 'number' key represents an alternate mail header where 
-# the sender's number can be found with a regular expression and replacement 
+# array pointed to by the 'number' key represents an alternate mail header where
+# the sender's number can be found with a regular expression and replacement
 # value for a gsub eval.
 #
 # The transform arrays are themselves an array of two element arrays.  The elements
 # are parameters for gsub and will be evaluated from within the ruby code.
 #
-# Ignore instructions are honored first then transform instructions.  In the sample, 
-# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a 
-# filename comparison.  The transform has a match and a replacement, see the gsub 
+# Ignore instructions are honored first then transform instructions.  In the sample,
+# masthead.jpg is ignored as a regular expression, and spacer.gif is ignored as a
+# filename comparison.  The transform has a match and a replacement, see the gsub
 # documentation for more information about match and replace.
 #
 # --
@@ -92,9 +92,9 @@
 #   - /^([^\s]+)\s.*/
 #   - "\1"
 #
-# Carriers often provide their services under many different domain names.  
-# The conf/aliases.yml is a YAML file with a hash that maps alternative or 
-# legacy carrier names to the most common name of their service.  For example 
+# Carriers often provide their services under many different domain names.
+# The conf/aliases.yml is a YAML file with a hash that maps alternative or
+# legacy carrier names to the most common name of their service.  For example
 # in terms of MMS2R txt.att.net is an alias for mms.att.net.  Therefore when
 # an MMS with a Sender of txt.att.net is processed MMS2R will use the
 # mms.att.net configuration to process the message.
@@ -114,20 +114,26 @@ module MMS2R
       end
     end
 
+    # Pass off everything we don't do to the TMail object
+    # TODO: refactor to explicit addition a la http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
+    def method_missing method, *args, &block
+      mail.send method, *args, &block
+    end
+
     ##
     # TMail object that the media files were derived from.
 
     attr_reader :mail
 
     ##
-    # media returns the hash of media.  The media hash is keyed by mime-type 
-    # such as 'text/plain' and the value mapped to the key is an array of 
+    # media returns the hash of media.  The media hash is keyed by mime-type
+    # such as 'text/plain' and the value mapped to the key is an array of
     # media that are of that type.
 
     attr_reader :media
 
     ##
-    # Carrier is the domain name of the carrier.  If the carrier is not known 
+    # Carrier is the domain name of the carrier.  If the carrier is not known
     # the carrier will be set to 'mms2r.media'
 
     attr_reader :carrier
@@ -143,14 +149,14 @@ module MMS2R
     MULTIPARTS_TO_SPLIT = [ 'multipart/related', 'multipart/alternative', 'multipart/mixed', 'multipart/appledouble' ]
 
     ##
-    # Factory method that creates MMS2R::Media products based on the domain 
-    # name of the carrier from which the MMS originated.  mail is a TMail 
+    # Factory method that creates MMS2R::Media products based on the domain
+    # name of the carrier from which the MMS originated.  mail is a TMail
     # object.
 
     def self.create(mail)
       d = lambda{ ['mms2r.media', MMS2R::Media] } #sets a default to detect
       from_domain = self.domain(mail)
-      processor = MMS2R::CARRIERS.detect(d) do |domain, klass| 
+      processor = MMS2R::CARRIERS.detect(d) do |domain, klass|
         return klass, domain if from_domain == domain
       end
       [MMS2R::Media, from_domain]
@@ -158,8 +164,8 @@ module MMS2R
 
     ##
     # Determine if return-path or from is going to be used to desiginate the
-    # origin carrier.  If the domain in the From header is listed in 
-    # conf/from.yaml then that is the carrier domain.  Else if there is a 
+    # origin carrier.  If the domain in the From header is listed in
+    # conf/from.yaml then that is the carrier domain.  Else if there is a
     # Return-Path header its address's domain is the carrier doamin, else
     # use From header's address domain.
 
@@ -211,7 +217,7 @@ module MMS2R
       log("#{self.class} created", :info)
       @carrier = opts[:domain]
       @dir_count = 0
-      @media_dir = File.join(self.tmp_dir(), 
+      @media_dir = File.join(self.tmp_dir(),
                      self.safe_message_id(@mail.message_id))
       @media = {}
       @was_processed = false
@@ -220,7 +226,7 @@ module MMS2R
       @body = nil
       @default_media = nil
       @default_text = nil
-      
+
       f = File.join(self.conf_dir(), "aliases.yml")
       @aliases = YAML::load_file(f) rescue {}
 
@@ -234,9 +240,9 @@ module MMS2R
     end
 
     ##
-    # Get the phone number associated with this MMS if it exists.  The value 
-    # returned is simplistic, it is just the user name of the from address 
-    # before the @ symbol.  Validation of the number is left to you.  Most 
+    # Get the phone number associated with this MMS if it exists.  The value
+    # returned is simplistic, it is just the user name of the from address
+    # before the @ symbol.  Validation of the number is left to you.  Most
     # carriers are using the real phone number as the username.
 
     def number
@@ -268,8 +274,8 @@ module MMS2R
       @subject
     end
 
-    # Convenience method that returns a string including all the text of the 
-    # first text/plain file found.  Returns empty string if no body text 
+    # Convenience method that returns a string including all the text of the
+    # first text/plain file found.  Returns empty string if no body text
     # is found.
 
     def body
@@ -279,22 +285,22 @@ module MMS2R
     end
 
     # Returns a File with the most likely candidate for the user-submitted
-    # media.  Given that most MMS messages only have one file attached, this 
-    # method will try to return that file.  Singleton methods are added to 
-    # the File object so it can be used in place of a CGI upload (local_path, 
+    # media.  Given that most MMS messages only have one file attached, this
+    # method will try to return that file.  Singleton methods are added to
+    # the File object so it can be used in place of a CGI upload (local_path,
     # original_filename, size, and content_type) such as in conjunction with
     # AttachementFu.  The largest file found in terms of bytes is returned.
     #
     # Returns nil if there are not any video or image Files found.
 
     def default_media
-      @default_media ||= attachment(['video', 'image', 'text'])
+      @default_media ||= attachment(['video', 'image', 'application', 'text'])
     end
 
     # Returns a File with the most likely candidate that is text, or nil
-    # otherwise.  It also adds singleton methods to the File object so it can be 
-    # used in place of a CGI upload (local_path, original_filename, size, and 
-    # content_type) such as in conjunction with AttachmentFu.  The largest file 
+    # otherwise.  It also adds singleton methods to the File object so it can be
+    # used in place of a CGI upload (local_path, original_filename, size, and
+    # content_type) such as in conjunction with AttachmentFu.  The largest file
     # found in terms of bytes is returned.
     #
     # Returns nil if there are not any text Files found
@@ -305,9 +311,9 @@ module MMS2R
 
     ##
     # process is a template method and collects all the media in a MMS.
-    # Override helper methods to this template to clean out advertising and/or 
-    # ignore media that are advertising.  This method should not be overridden 
-    # unless there is an extreme special case in processing the media of a MMS 
+    # Override helper methods to this template to clean out advertising and/or
+    # ignore media that are advertising.  This method should not be overridden
+    # unless there is an extreme special case in processing the media of a MMS
     # (like Sprint)
     #
     # Helper methods for the process template:
@@ -315,7 +321,7 @@ module MMS2R
     # * process_media -- retrieves media to temporary file, returns path to file.
     # * transform_text -- called by process_media, strips out advertising.
     # * temp_file -- creates a temporary filepath based on information from the part.
-    # 
+    #
     # Block support:
     # Call process() with a block to automatically iterate through media.
     # For example, to process and receive only media of video type:
@@ -329,11 +335,11 @@ module MMS2R
     def process() # :yields: media_type, file
       unless @was_processed
         log("#{self.class} processing", :info)
-  
+
         parts = mail.multipart? ? mail.parts : [mail]
-  
-        # Double check for multipart/related, if it exists replace it with its 
-        # children parts.  Do this twice as multipart/alternative can have 
+
+        # Double check for multipart/related, if it exists replace it with its
+        # children parts.  Do this twice as multipart/alternative can have
         # children and we want to fold everything down
         for i in 1..2
           flat = []
@@ -343,10 +349,10 @@ module MMS2R
             else
               flat << p
             end
-          end 
+          end
           parts = flat.dup
-        end 
-  
+        end
+
         # get to work
         parts.each do |p|
           t = p.part_type?
@@ -369,8 +375,8 @@ module MMS2R
     end
 
     ##
-    # Helper for process template method to determine if media contained in a 
-    # part should be ignored.  Producers should override this method to return 
+    # Helper for process template method to determine if media contained in a
+    # part should be ignored.  Producers should override this method to return
     # true for media such as images that are advertising, carrier logos, etc.
     # See the ignore section in the discussion of the built-in configuration.
 
@@ -379,18 +385,18 @@ module MMS2R
       ignore = ignores.detect{|test| filename?(part) == test}
       ignore ||= ignores.detect{|test| filename?(part) =~ eval(test) if test.index('/') == 0 }
       ignore ||= ignores.detect{|test| part.body.strip =~ eval(test) if test.index('/') == 0 }
-      ignore ||= (part.body.strip.size == 0 ? true : nil) 
+      ignore ||= (part.body.strip.size == 0 ? true : nil)
       ignore.nil? ? false : true
     end
 
     ##
-    # Helper for process template method to decode the part based on its type 
-    # and write its content to a temporary file.  Returns path to temporary 
-    # file that holds the content.  Parts with a main type of text will have 
+    # Helper for process template method to decode the part based on its type
+    # and write its content to a temporary file.  Returns path to temporary
+    # file that holds the content.  Parts with a main type of text will have
     # their contents transformed with a call to transform_text
     #
-    # Producers should only override this method if the parts of the MMS need 
-    # special treatment besides what is expected for a normal mime part (like 
+    # Producers should only override this method if the parts of the MMS need
+    # special treatment besides what is expected for a normal mime part (like
     # Sprint).
     #
     # Returns a tuple of content type, file path
@@ -399,7 +405,7 @@ module MMS2R
       # TMail body auto-magically decodes quoted
       # printable for text/html type.
       file = temp_file(part)
-      if part.main_type('text') == 'text' || 
+      if part.main_type('text') == 'text' ||
          part.content_type == 'application/smil'
         type, content = transform_text_part(part)
         mode = 'w'
@@ -421,11 +427,11 @@ module MMS2R
 
     ##
     # Helper for process_media template method to transform text.
-    # See the transform section in the discussion of the built-in 
+    # See the transform section in the discussion of the built-in
     # configuration.
 
     def transform_text(type, text, original_nencoding = 'ISO-8859-1')
-      return type, text unless transforms = config['transform'][type] 
+      return type, text unless transforms = config['transform'][type]
 
       #convert to UTF-8
       begin
@@ -441,7 +447,7 @@ module MMS2R
         r = transform.last
         utf_t = utf_t.gsub(eval(p), r) rescue utf_t
       end
-      
+
       return type, utf_t
     end
 
@@ -455,12 +461,12 @@ module MMS2R
     end
 
     ##
-    # Helper for process template method to name a temporary filepath based on 
-    # information in the part.  This version attempts to honor the name of the 
-    # media as labeled in the part header and creates a unique temporary 
+    # Helper for process template method to name a temporary filepath based on
+    # information in the part.  This version attempts to honor the name of the
+    # media as labeled in the part header and creates a unique temporary
     # directory for writing the file so filename collision does not occur.
-    # Consumers of this method expect the directory structure to the file 
-    # exists, if the method is overridden it is mandatory that this behavior is 
+    # Consumers of this method expect the directory structure to the file
+    # exists, if the method is overridden it is mandatory that this behavior is
     # retained.
 
     def temp_file(part)
@@ -469,7 +475,7 @@ module MMS2R
     end
 
     ##
-    # Purges the unique MMS2R::Media.media_dir directory created 
+    # Purges the unique MMS2R::Media.media_dir directory created
     # for this producer and all of the media that it contains.
 
     def purge()
@@ -486,7 +492,7 @@ module MMS2R
     end
 
     ##
-    # Helper to temp_file to create a unique temporary directory that is a 
+    # Helper to temp_file to create a unique temporary directory that is a
     # child of tmp_dir  This version is based on the message_id of the mail.
 
     def msg_tmp_dir()
@@ -519,7 +525,7 @@ module MMS2R
         base = File.basename(name, ext)
         name = "#{base[0, 255 - ext.size]}#{ext}"
       end
-      
+
       name
     end
 
@@ -528,28 +534,76 @@ module MMS2R
     end
 
     ##
-    # Best guess of the mobile device type.  Simple heuristics thus far for 
-    # :iphone :blackberry :handset :unknown .  Could be expanded for exif 
+    # Best guess of the mobile device type.  Simple heuristics thus far for
+    # :iphone :blackberry :handset :unknown .  Could be expanded for exif
     # probing or shifting mail header schemes
 
     def device_type?
+      begin
+        # rely on native exif first with exifr gem if its loaded
+        require 'exifr'
+        file = attachment(['image'])
+        if file
+          original = file.original_filename
+          @exif = case original
+                  when /\.jpg$/i
+                    EXIFR::JPEG.new(file)
+                  when /\.jepg$/i
+                    EXIFR::JPEG.new(file)
+                  when /\.tif$/i
+                    EXIFR::TIFF.new(file)
+                  when /\.tiff$/i
+                    EXIFR::TIFF.new(file)
+                  end
+          if @exif
+            # TODO do something about the assortment of camera models that have 
+            # been seen:
+            # 1.3 Megapixel, 2.0 Megapixel, BlackBerry, CU920, G'z One TYPE-S,
+            # Hermes, iPhone, LG8700, LSI_S5K4AAFA, Micron MT9M113 1.3MP YUV,
+            # Motorola Phone, Omni_vision-9650, Pre,
+            # Seoul Electronics & Telecom SIM120B 1.3M, SGH-T729, SGH-T819,
+            # SPH-M540, SPH-M800, SYSTEMLSI S5K4BAFB 2.0 MP, VX-9700
+            case @exif.model
+            when/iPhone/i
+              return :iphone
+            when/BlackBerry/i
+              return :blackberry
+            end
+          end
+        end
+      rescue LoadError => err
+      end
+
       headers = config['device_types']['headers'] rescue {}
       headers.keys.each do |header|
         if mail.header[header.downcase]
-          regex, type = headers[header]
-          return type if mail.header[header.downcase].to_s =~ regex
+          # headers[header] refers to a hash of smart phone types with regex values
+          # that if they match the header signals the type should be returned
+          headers[header].each do |type, regex|
+            # HACK to get at the full value of the header before TMail parses according to spec
+            # see @body in and ensure_parsed in lib/tmail/header.rb
+            return type if mail.header[header.downcase].instance_variable_get(:@body) =~ regex
+          end
         end
       end
 
       return :handset if File.exist?(File.join(self.conf_dir,
                                      "#{self.aliases[self.carrier] || self.carrier}.yml"))
-      
+
       :unknown
     end
 
+    ##
+    # exif object on default image from exifr gem
+
+    def exif
+      device_type? unless @exif
+      @exif
+    end
+
     ##
     # The source of the MMS was some sort of mobile or smart phone
-    
+
     def is_mobile?
       self.device_type? != :unknown
     end
@@ -596,7 +650,7 @@ module MMS2R
       if MMS2R::EXT[content_type]
         MMS2R::EXT[content_type]
       elsif content_type
-        content_type.split('/').last 
+        content_type.split('/').last
       end
     end
 
@@ -633,7 +687,7 @@ module MMS2R
 
     ##
     # convenience accessor for self.class.conf_dir
-    
+
     def conf_dir
       self.class.conf_dir
     end
@@ -654,14 +708,14 @@ module MMS2R
 
     ##
     # convenience accessor for self.class.safe_message_id
-    
+
     def safe_message_id(message_id)
       self.class.safe_message_id(message_id)
     end
 
     ##
     # convenience accessor for self.class.initialize_confg
-  
+
     def initialize_config(config)
       self.class.initialize_config(config)
     end
@@ -686,13 +740,13 @@ module MMS2R
 
     ##
     # used by #default_media and #text to return the biggest attachment type
-    # listed in the types array 
+    # listed in the types array
 
     def attachment(types)
 
       # get all the files that are of the major types passed in
       files = []
-      
+
       types.each do |type|
         media.keys.find_all{|k| type.include?("/") ? k == type : k.index(type) == 0 }.each do |key|
           files += media[key]
@@ -710,7 +764,7 @@ module MMS2R
         if File.size(f) > size
           size = File.size(f)
           file = File.new(f)
-          mime_type = media.detect{|type,files| files.detect{|fl| fl == f}}[0] 
+          mime_type = media.detect{|type,files| files.detect{|fl| fl == f}}[0]
         end
       end