mms2r 2.3.0 → 2.4.0

data/.gitignore

@@ -2,3 +2,4 @@
 coverage/
 pkg/
 email.txt
+coverage.info

data/History.txt

@@ -1,4 +1,15 @@
-### 2.3.0 / 2008-08-30 (Snakes 'n' Barrels Greatest Hits)
+### 2.4.0 / 2009-12-20 (Dr. Nanemiltred Philtendrieden - specialist on celebrity death)
+
+* 1 new feature
+  * replace Hpricot with Nokogiri for html parsing of Sprint data
+
+* 3 minor enhancements
+  * smartphone identities stored :
+  * identify Motorola Droid as a smartphone
+  * identify T-Mobile Dash as a smartphone
+  * use uuidtools for naming temp directories - kbaum
+
+### 2.3.0 / 2009-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

data/Manifest.txt

@@ -38,7 +38,7 @@ conf/vmpix.com.yml
 conf/vzwpix.com.yml
 conf/waw.plspictures.com.yml
 dev_tools/anonymizer.rb
-dev_tools/debug_sprint_hpricot_parsing.rb
+dev_tools/debug_sprint_nokogiri_parsing.rb
 dev_tools/github.rb
 init.rb
 lib/mms2r.rb

data/README.txt

@@ -3,7 +3,7 @@
   http://mms2r.rubyforge.org/
   by Mike Mondragon
   http://rubyforge.org/tracker/?group_id=3065
-  http://github.com/monde/mms2r/tree/master
+  http://github.com/monde/mms2r
   http://peepcode.com/products/mms2r-pdf
 
 == DESCRIPTION
@@ -17,6 +17,9 @@ 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
 MMS other than decoding and consolidating its media.
 
+MMS2R can be used to process any multipart email to conveniently access the
+parts the mail is comprised of.
+
 Contact the author to add additional carriers to be processed by the library.
 Suggestions and patches appreciated and welcomed!
 
@@ -64,6 +67,10 @@ Corpus of carriers currently processed by MMS2R:
 * #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
+* an mms instance acts like a tmail object, any methods not defined on the
+  instance are delegated to its underlying tmail object
+* #device_type? returns a symbol representing a device or smartphone type
+  Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid
 
 == BOOKS
 
@@ -117,9 +124,11 @@ http://peepcode.com/products/mms2r-pdf
   # check if the mail is from a mobile phone
   puts "mail is from a mobile phone #{mail.is_mobile?}"
 
+  # determine the device type of the phone
+  puts "mail is from a mobile phone of type #{mail.device_type?}"
+
   # 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
 
@@ -140,8 +149,9 @@ http://peepcode.com/products/mms2r-pdf
 
 == REQUIREMENTS
 
-* Hpricot
 * TMail
+* Nokogiri (for mms from Sprint)
+* UUIDTools
 
 == OPTIONAL
 
@@ -150,17 +160,11 @@ http://peepcode.com/products/mms2r-pdf
 
 == INSTALL
 
-conventional
 * sudo gem install mms2r
 
-github
-* sudo gem sources -a http://gems.github.com
-* sudo gem install monde-mms2r
-
 == SOURCE
 
 git clone git://github.com/monde/mms2r.git
-svn co svn://rubyforge.org/var/svn/mms2r/trunk mms2r
 
 == AUTHORS
 
@@ -177,14 +181,17 @@ MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 * Jason Haruska (blog[http://software.haruska.com/])
 * Dave Myron (company[http://contentfree.com/])
 * Vijay Yellapragada
-* Jesse Dp
+* Jesse Dp (github profile[http://github.com/jessedp])
 * David Alm
 * Jeremy Wilkins
-* Matt Conway
+* Matt Conway (github profile[http://github.com/wr0ngway])
 * Kai Kai
 * Michael DelGaudio
 * Sai Emrys (blog[http://saizai.com])
 * Brendan Lim (github profile[http://github.com/brendanlim])
+* Scott Taylor (github profile[http://github.com/smtlaissezfaire])
+* Jaap van der Meer (github profile[http://github.com/japetheape])
+* Karl Baum (github profile[http://github.com/kbaum])
 
 == LICENSE
 

data/Rakefile

@@ -13,14 +13,15 @@ require 'mms2r'
 
 Hoe.new('mms2r', MMS2R::Media::VERSION) do |p|
   p.rubyforge_name = 'mms2r'
-  p.author = 'Mike Mondragon'
-  p.email = 'mikemondragon@gmail.com'
+  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..7).join("\n\n")
+  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
   p.url = p.paragraphs_of('README.txt', 1).first.strip
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-  p.extra_deps << ['hpricot']
+  p.changes = p.paragraphs_of('History.txt', 0..2).join("\n\n")
+  p.extra_deps << ['nokogiri']
   p.extra_deps << ['tmail']
+  p.extra_deps << ['uuidtools']
   p.clean_globs << 'coverage'
 end
 

data/conf/mms2r_media.yml

@@ -29,3 +29,19 @@ device_types:
       :iphone: !ruby/regexp /iPhone Mail/i
     x-rim-org-msg-ref-id:
       :blackberry: !ruby/regexp /.+/
+  # 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
+  #
+  # NOTE: These model strings are stored in the exif model header of an image file
+  # created and sent by the device, the regex is used by mms2r to detect the
+  # model string
+  models:
+    :iphone: !ruby/regexp /iPhone/i
+    :blackberry: !ruby/regexp /BlackBerry/i
+    :dash: !ruby/regexp /T-Mobile Dash/i
+    :droid: !ruby/regexp /Droid/i

data/conf/vzwpix.com.yml

@@ -1,8 +1,8 @@
 ---
 ignore:
   text/plain: 
-  - /\AThis message was sent using .* from Verizon Wireless!.*/m
+  - /\AThis message (was|has been) sent using .* from Verizon Wireless!.*/m
 transform: 
   text/plain: 
-  - - /\A(.+?)\s+This message was sent using .* from Verizon Wireless!.*/m
+  - - /\A(.+?)\s+This message (was|has been) sent using .* from Verizon Wireless!.*/m
     - "\1"

data/dev_tools/{debug_sprint_hpricot_parsing.rb → debug_sprint_nokogiri_parsing.rb}

@@ -1,8 +1,8 @@
 require 'rubygems'
-require 'hpricot'
+require 'nokogiri'
 require 'net/http'
+require 'cgi'
 require 'rubygems'
-require 'hpricot'
 require 'pp'
 
 if ARGV[0].nil?
@@ -11,12 +11,12 @@ if ARGV[0].nil?
   exit
 end
 
-doc = open(ARGV[0]) { |f| Hpricot(f) }
+doc = open(ARGV[0]) { |f| Nokogiri(f) }
 
 puts "TITLE: #{doc.at('title').inner_html}"
 
 #phone number is tucked away in the comment in the head
-c = doc.search("/html/head/comment//").last
+c = doc.search("/html/head/comment()").last
 t = c.content.gsub(/\s+/m," ").strip
 number = / name="MDN">(\d+)</.match(t)[1]
 puts "NUMBER: #{number}"
@@ -26,16 +26,14 @@ puts "NUMBER: #{number}"
 text = doc.search("/html/body//pre").first.inner_html
 puts "TEXT: #{text}"
 
-# just see what they say this MMS is it really doesn't
-# mean anything, the content is in paux image with 
-# a RECIPIENT in its URI path
-trs = doc.search("/html/body//tr")
-text = trs[3].search("/td/p/font/b/")
+# just see what they say this MMS is it really doesn't mean anything, the 
+# content is in faux image with a RECIPIENT in its URI path
+text = doc.search("/html/body//tr[2]/td//b")
 case text.text
 when /You have a Video Mail from/
-  puts "it claims to be a video"
+  puts "it claims to be a video: #{text}"
 when /You have a Picture Mail from /
-  puts "it claims to be an image"
+  puts "it claims to be an image: #{text}"
 else
   puts "what is it? #{text.text}"
 end
@@ -59,15 +57,22 @@ puts "there are #{srcs.size} sources to fetch"
 cnt = 0
 srcs.each do |src|
   puts "--"
-  puts "FETCHING:\n  #{src}"
+  puts "FETCHING:\n  #{src.text}"
 
-   url = URI.parse(src)
-   #res = Net::HTTP.get_response(url)
-   agent = "Mozilla/5.0 (X11; U; Minix3 i686 (x86_64); en-US; rv:1.8.1.1) Gecko/20061208 Firefox/2.0.0.1"
-   res = Net::HTTP.start(url.host, url.port) { |http|
-     req = Net::HTTP::Get.new(url.request_uri, {'User-Agent' => agent})
-     http.request(req)
-   }
+  url = URI.parse(CGI.unescapeHTML(src.text))
+  query={}
+  url.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
+  query.delete_if{|k, v| k == 'limitsize' or k == 'squareoutput' }
+  url.query = query.map{|k,v| "#{k}=#{v}"}.join("&")
+  # sprint is a ghetto, they expect to see & for video request
+  url.query = url.query.gsub(/&/, "&") if @is_video
+
+  #res = Net::HTTP.get_response(url)
+  agent = "Mozilla/5.0 (X11; U; Minix3 i686 (x86_64); en-US; rv:1.8.1.1) Gecko/20061208 Firefox/2.0.0.1"
+  res = Net::HTTP.start(url.host, url.port) { |http|
+    req = Net::HTTP::Get.new(url.request_uri, {'User-Agent' => agent})
+    http.request(req)
+  }
 
   # prep and write a file
   base = /\/RECIPIENT\/([^\/]+)\//.match(src)[1]

data/lib/mms2r/media/sprint.rb

@@ -6,7 +6,7 @@
 
 require 'net/http'
 require 'rubygems'
-require 'hpricot'
+require 'nokogiri'
 require 'cgi'
 
 module MMS2R
@@ -46,7 +46,7 @@ module MMS2R
           doc = nil
           parts.each do |p|
             next unless p.part_type? == 'text/html'
-            d = Hpricot(p.body)
+            d = Nokogiri(p.body)
             title = d.at('title').inner_html
             if title =~ /You have new Picture Mail!/
               doc = d
@@ -115,6 +115,8 @@ module MMS2R
         imgs = doc.search("/html/body//img")
         imgs.each do |i|
           src = i.attributes['src']
+          next unless src
+          src = src.text
           # we don't want to double fetch content and we only
           # want to fetch media from the content server, you get
           # a clue about that as there is a RECIPIENT in the URI path

data/lib/mms2r/media.rb

@@ -218,7 +218,7 @@ module MMS2R
       @carrier = opts[:domain]
       @dir_count = 0
       @media_dir = File.join(self.tmp_dir(),
-                     self.safe_message_id(@mail.message_id))
+                     "#{self.safe_message_id(@mail.message_id)}_#{UUIDTools::UUID.random_create}")
       @media = {}
       @was_processed = false
       @number = nil
@@ -534,11 +534,16 @@ module MMS2R
     end
 
     ##
-    # 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
+    # Best guess of the mobile device type.  Simple heuristics thus far by 
+    # inspecting mail headers and jpeg/tiff exif metadata.
+    # Smart phone types are
+    # :iphone :blackberry :dash :droid
+    # If the message is from a carrier known to MMS2R, and not a smart phone
+    # its type is returned as :handset
+    # Otherwise device type is :unknown
 
     def device_type?
+
       begin
         # rely on native exif first with exifr gem if its loaded
         require 'exifr'
@@ -546,28 +551,15 @@ module MMS2R
         if file
           original = file.original_filename
           @exif = case original
-                  when /\.jpg$/i
-                    EXIFR::JPEG.new(file)
-                  when /\.jepg$/i
+                  when /\.je?pg$/i
                     EXIFR::JPEG.new(file)
-                  when /\.tif$/i
-                    EXIFR::TIFF.new(file)
-                  when /\.tiff$/i
+                  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
+            models = config['device_types']['models'] rescue {}
+            models.each do |model, regex|
+              return model if @exif.model =~ regex
             end
           end
         end

data/lib/mms2r.rb

@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '2.3.0'
+    VERSION = '2.4.0'
 
   end
 
@@ -59,6 +59,7 @@ require 'fileutils'
 require 'pathname'
 require 'tmpdir'
 require 'yaml'
+require 'uuidtools'
 
 require File.join(File.dirname(__FILE__), 'tmail_ext')
 require File.join(File.dirname(__FILE__), 'mms2r', 'media')

data/mms2r.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = "2.3.0"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]
-  s.date = %q{2009-08-31}
+  s.date = %q{2009-12-20}
   s.description = %q{== DESCRIPTION
 
 MMS2R is a library that decodes the parts of an MMS message to disk while
@@ -18,20 +18,17 @@ 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
 MMS other than decoding and consolidating its media.
 
-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:}
-  s.email = %q{mikemondragon@gmail.com}
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/from.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.vodacom4me.co.za.yml", "conf/mms2r_media.yml", "conf/mobile.indosat.net.id.yml", "conf/msg.telus.com.yml", "conf/orangemms.net.yml", "conf/pm.sprint.com.yml", "conf/pxt.vodafone.net.nz.yml", "conf/rci.rogers.com.yml", "conf/sms.sasktel.com.yml", "conf/tmomail.net.yml", "conf/txt.bell.ca.yml", "conf/unicel.com.yml", "conf/vmpix.com.yml", "conf/vzwpix.com.yml", "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", "lib/tmail_ext.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "test/fixtures/att-iphone-01.mail", "test/fixtures/att-iphone-02.mail", "test/fixtures/att-iphone-03.mail", "test/fixtures/att-text-01.mail", "test/fixtures/bell-canada-image-01.mail", "test/fixtures/cingularme-text-01.mail", "test/fixtures/cingularme-text-02.mail", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/generic.mail", "test/fixtures/helio-image-01.mail", "test/fixtures/helio-message-01.mail", "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", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mobile.mycingular.com-text-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "test/fixtures/nextel-image-01.mail", "test/fixtures/nextel-image-02.mail", "test/fixtures/nextel-image-03.mail", "test/fixtures/nextel-image-04.mail", "test/fixtures/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pics.cingularme.com-image-01.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "test/fixtures/sprint-two-images-01.mail", "test/fixtures/sprint-video-01.mail", "test/fixtures/sprint.mov", "test/fixtures/suncom-blackberry.mail", "test/fixtures/telus-image-01.mail", "test/fixtures/three-uk-image-01.mail", "test/fixtures/tmo.blackberry.net-image-01.mail", "test/fixtures/tmobile-blackberry-02.mail", "test/fixtures/tmobile-blackberry.mail", "test/fixtures/tmobile-image-01.mail", "test/fixtures/tmobile-image-02.mail", "test/fixtures/unicel-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/virgin.ca-text-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "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", "test/test_bellsouth_net.rb", "test/test_github.rb", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_mobile_indosat_net_id.rb", "test/test_msg_telus_com.rb", "test/test_orangemms_net.rb", "test/test_pm_sprint_com.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_rci_rogers_com.rb", "test/test_sms_sasktel_com.rb", "test/test_tmomail_net.rb", "test/test_unicel_com.rb", "test/test_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb"]
-  s.has_rdoc = true
+MMS2R can be used to process any multipart email to conveniently access the
+parts the mail is comprised of.}
+  s.email = ["mikemondragon@gmail.com"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt", "email.txt"]
+  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "conf/1nbox.net.yml", "conf/aliases.yml", "conf/bellsouth.net.yml", "conf/from.yml", "conf/mediamessaging.o2.co.uk.yml", "conf/messaging.nextel.com.yml", "conf/mms.3ireland.ie.yml", "conf/mms.ae.yml", "conf/mms.alltel.com.yml", "conf/mms.att.net.yml", "conf/mms.dobson.net.yml", "conf/mms.luxgsm.lu.yml", "conf/mms.mobileiam.ma.yml", "conf/mms.mtn.co.za.yml", "conf/mms.mycricket.com.yml", "conf/mms.myhelio.com.yml", "conf/mms.netcom.no.yml", "conf/mms.o2online.de.yml", "conf/mms.three.co.uk.yml", "conf/mms.vodacom4me.co.za.yml", "conf/mms2r_media.yml", "conf/mobile.indosat.net.id.yml", "conf/msg.telus.com.yml", "conf/orangemms.net.yml", "conf/pm.sprint.com.yml", "conf/pxt.vodafone.net.nz.yml", "conf/rci.rogers.com.yml", "conf/sms.sasktel.com.yml", "conf/tmomail.net.yml", "conf/txt.bell.ca.yml", "conf/unicel.com.yml", "conf/vmpix.com.yml", "conf/vzwpix.com.yml", "conf/waw.plspictures.com.yml", "dev_tools/anonymizer.rb", "dev_tools/debug_sprint_nokogiri_parsing.rb", "dev_tools/github.rb", "email.txt", "init.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.rb", "lib/tmail_ext.rb", "mms2r.gemspec", "test/fixtures/1nbox-2images-01.mail", "test/fixtures/1nbox-2images-02.mail", "test/fixtures/1nbox-2images-03.mail", "test/fixtures/1nbox-2images-04.mail", "test/fixtures/3ireland-mms-01.mail", "test/fixtures/alltel-image-01.mail", "test/fixtures/alltel-mms-01.mail", "test/fixtures/alltel-mms-03.mail", "test/fixtures/apple-double-image-01.mail", "test/fixtures/att-blackberry-02.mail", "test/fixtures/att-blackberry.mail", "test/fixtures/att-image-01.mail", "test/fixtures/att-image-02.mail", "test/fixtures/att-iphone-01.mail", "test/fixtures/att-iphone-02.mail", "test/fixtures/att-iphone-03.mail", "test/fixtures/att-text-01.mail", "test/fixtures/bell-canada-image-01.mail", "test/fixtures/cingularme-text-01.mail", "test/fixtures/cingularme-text-02.mail", "test/fixtures/dobson-image-01.mail", "test/fixtures/dot.jpg", "test/fixtures/generic.mail", "test/fixtures/helio-image-01.mail", "test/fixtures/helio-message-01.mail", "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", "test/fixtures/mmode-image-01.mail", "test/fixtures/mms.ae-image-01.mail", "test/fixtures/mms.mycricket.com-pic-and-text.mail", "test/fixtures/mms.mycricket.com-pic.mail", "test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail", "test/fixtures/mobile.mycingular.com-text-01.mail", "test/fixtures/mtn-southafrica-mms.mail", "test/fixtures/mycingular-image-01.mail", "test/fixtures/netcom-image-01.mail", "test/fixtures/nextel-image-01.mail", "test/fixtures/nextel-image-02.mail", "test/fixtures/nextel-image-03.mail", "test/fixtures/nextel-image-04.mail", "test/fixtures/o2-de-image-01.mail", "test/fixtures/orange-uk-image-01.mail", "test/fixtures/orangefrance-text-and-image.mail", "test/fixtures/orangepoland-text-01.mail", "test/fixtures/orangepoland-text-02.mail", "test/fixtures/pics.cingularme.com-image-01.mail", "test/fixtures/pxt-image-01.mail", "test/fixtures/rogers-canada-mms-01.mail", "test/fixtures/sasktel-image-01.mail", "test/fixtures/sprint-broken-image-01.mail", "test/fixtures/sprint-image-01.mail", "test/fixtures/sprint-pcs-text-01.mail", "test/fixtures/sprint-purged-image-01.mail", "test/fixtures/sprint-text-01.mail", "test/fixtures/sprint-two-images-01.mail", "test/fixtures/sprint-video-01.mail", "test/fixtures/sprint.mov", "test/fixtures/suncom-blackberry.mail", "test/fixtures/telus-image-01.mail", "test/fixtures/three-uk-image-01.mail", "test/fixtures/tmo.blackberry.net-image-01.mail", "test/fixtures/tmobile-blackberry-02.mail", "test/fixtures/tmobile-blackberry.mail", "test/fixtures/tmobile-image-01.mail", "test/fixtures/tmobile-image-02.mail", "test/fixtures/unicel-image-01.mail", "test/fixtures/verizon-blackberry.mail", "test/fixtures/verizon-image-01.mail", "test/fixtures/verizon-image-02.mail", "test/fixtures/verizon-image-03.mail", "test/fixtures/verizon-text-01.mail", "test/fixtures/verizon-video-01.mail", "test/fixtures/virgin-mobile-image-01.mail", "test/fixtures/virgin.ca-text-01.mail", "test/fixtures/vodacom4me-co-za-01.mail", "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", "test/test_bellsouth_net.rb", "test/test_github.rb", "test/test_helper.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_messaging_nextel_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms2r_media.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_alltel_com.rb", "test/test_mms_att_net.rb", "test/test_mms_dobson_net.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_mobileiam_ma.rb", "test/test_mms_mtn_co_za.rb", "test/test_mms_mycricket_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_netcom_no.rb", "test/test_mms_o2online_de.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_mobile_indosat_net_id.rb", "test/test_msg_telus_com.rb", "test/test_orangemms_net.rb", "test/test_pm_sprint_com.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_rci_rogers_com.rb", "test/test_sms_sasktel_com.rb", "test/test_tmomail_net.rb", "test/test_unicel_com.rb", "test/test_vmpix_com.rb", "test/test_vzwpix_com.rb", "test/test_waw_plspictures_com.rb", "vendor/plugins/mms2r/lib/autotest/discover.rb", "vendor/plugins/mms2r/lib/autotest/mms2r.rb"]
   s.homepage = %q{http://mms2r.rubyforge.org/
 }
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mms2r}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Extract user media from MMS (and not carrier cruft)}
   s.test_files = ["test/test_mms_o2online_de.rb", "test/test_helper.rb", "test/test_pm_sprint_com.rb", "test/test_sms_sasktel_com.rb", "test/test_mms_mobileiam_ma.rb", "test/test_msg_telus_com.rb", "test/test_messaging_sprintpcs_com.rb", "test/test_mms_myhelio_com.rb", "test/test_mms_3ireland_ie.rb", "test/test_mms_ae.rb", "test/test_mms_att_net.rb", "test/test_mediamessaging_o2_co_uk.rb", "test/test_bell_canada.rb", "test/test_mms_mtn_co_za.rb", "test/test_vmpix_com.rb", "test/test_github.rb", "test/test_vzwpix_com.rb", "test/test_bellsouth_net.rb", "test/test_unicel_com.rb", "test/test_waw_plspictures_com.rb", "test/test_mms_luxgsm_lu.rb", "test/test_mms_netcom_no.rb", "test/test_mms_mycricket_com.rb", "test/test_mms2r_media.rb", "test/test_rci_rogers_com.rb", "test/test_messaging_nextel_com.rb", "test/test_mms_vodacom4me_co_za.rb", "test/test_tmomail_net.rb", "test/test_1nbox_net.rb", "test/test_pxt_vodafone_net_nz.rb", "test/test_mobile_indosat_net_id.rb", "test/test_mms_three_co_uk.rb", "test/test_mms_alltel_com.rb", "test/test_mms_dobson_net.rb", "test/test_orangemms_net.rb"]
 
@@ -40,17 +37,20 @@ Corpus of carriers currently processed by MMS2R:}
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<tmail>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
     else
-      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<tmail>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.2"])
+      s.add_dependency(%q<uuidtools>, [">= 0"])
+      s.add_dependency(%q<hoe>, [">= 2.4.0"])
     end
   else
-    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<tmail>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.8.2"])
+    s.add_dependency(%q<uuidtools>, [">= 0"])
+    s.add_dependency(%q<hoe>, [">= 2.4.0"])
   end
 end

data/test/test_helper.rb

@@ -2,16 +2,18 @@ require 'set'
 require 'net/http'
 require 'net/https'
 require 'pp'
+require 'exifr'
+begin require 'redgreen'; rescue LoadError; end
 
 module MMS2R
   module TestHelper
-  
+
     def assert_file_size(file, size)
       assert_not_nil(file, "file was nil")
       assert(File::exist?(file), "file #{file} does not exist")
       assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
     end
-  
+
     def load_mail(file)
       IO.readlines(mail_fixture(file))
     end
@@ -19,6 +21,31 @@ module MMS2R
     def mail_fixture(file)
       "#{File.dirname(__FILE__)}/fixtures/#{file}"
     end
+
+    def smart_phone_mock(model_text = 'iPhone', jpeg = true)
+      mail = mock('mail')
+      mail.expects(:header).at_least_once.returns({'return-path' => '<joe@null.example.com>'})
+      mail.expects(:from).at_least_once.returns(['joe@example.com'])
+      mail.expects(:message_id).returns('abcd0123')
+      mail.expects(:multipart?).returns(true)
+      part = mock('part')
+      part.expects(:part_type?).at_least_once.returns("image/#{jpeg ? 'jpeg' : 'tiff'}")
+      part.expects(:sub_header).with('content-type', 'name').returns(nil)
+      part.expects(:sub_header).with('content-disposition', 'filename').returns(nil)
+      part.expects("[]".to_sym).with('content-location').at_least_once.returns("Photo_12.#{jpeg ? 'jpg' : 'tif'}")
+      part.expects(:main_type).with('text').returns(nil)
+      part.expects(:content_type).at_least_once.returns("image/#{jpeg ? 'jpeg' : 'tiff'}")
+      part.expects(:body).at_least_once.returns('abc')
+      mail.expects(:parts).returns([part])
+      exif = mock('exif')
+      exif.expects(:model).at_least_once.returns(model_text)
+      if jpeg
+        EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
+      else
+        EXIFR::TIFF.expects(:new).at_least_once.returns(exif)
+      end
+      mail
+    end
   end
 end
 

data/test/test_mms2r_media.rb

@@ -51,6 +51,11 @@ class TestMms2rMedia < Test::Unit::TestCase
     stub('mail', attrs)
   end
 
+  def test_class_parse
+    mms = MMS2R.parse(load_mail('generic.mail').join)
+    assert_equal ['noreply@rubyforge.org'], mms.from
+  end
+
   def temp_text_file(text)
     tf = Tempfile.new("test" + Time.now.to_f.to_s)
     tf.puts(text)
@@ -94,7 +99,18 @@ class TestMms2rMedia < Test::Unit::TestCase
 
   def test_base_initialize_config
     config = MMS2R::Media.initialize_config(nil)
-    
+
+    # test defaults shipped in mms2r_media.yml
+    assert_not_nil config
+    assert_equal true, config['ignore'].is_a?(Hash)
+    assert_equal true, config['transform'].is_a?(Hash)
+    assert_equal true, config['number'].is_a?(Array)
+  end
+
+  def test_instance_initialize_config
+    mms = MMS2R::Media.new(stub_mail())
+    config = mms.initialize_config(nil)
+
     # test defaults shipped in mms2r_media.yml
     assert_not_nil config
     assert_equal true, config['ignore'].is_a?(Hash)
@@ -727,7 +743,7 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_equal false, mms.is_mobile?
   end
 
-  def test_iphone_device_type
+  def test_iphone_device_type_by_header
     iphones = ['att-iphone-01.mail',
                'iphone-image-01.mail']
     iphones.each do |iphone|
@@ -738,6 +754,54 @@ class TestMms2rMedia < Test::Unit::TestCase
     end
   end
 
+  def test_exif
+    mail = smart_phone_mock('iPhone')
+    mms = MMS2R::Media.new(mail)
+    assert_equal 'iPhone', mms.exif.model
+  end
+
+  def test_exif_load_error
+    mms = MMS2R::Media.new(stub_mail())
+    mms.expects(:require).with('exifr').raises(LoadError)
+
+    assert_equal :unknown, mms.device_type?
+  end
+
+  def test_iphone_device_type_by_exif
+    mail = smart_phone_mock('iPhone')
+    mms = MMS2R::Media.new(mail)
+    assert_equal :iphone, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
+  def test_faux_tiff_iphone_device_type_by_exif
+    mail = smart_phone_mock('iPhone', jpeg = false)
+    mms = MMS2R::Media.new(mail)
+    assert_equal :iphone, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
+  def test_blackberry_device_type_by_exif
+    mail = smart_phone_mock('BlackBerry')
+    mms = MMS2R::Media.new(mail)
+    assert_equal :blackberry, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
+  def test_dash_device_type_by_exif
+    mail = smart_phone_mock('T-Mobile Dash')
+    mms = MMS2R::Media.new(mail)
+    assert_equal :dash, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
+  def test_droid_device_type_by_exif
+    mail = smart_phone_mock('Droid')
+    mms = MMS2R::Media.new(mail)
+    assert_equal :droid, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
   def test_blackberry_device_type
     berries = ['att-blackberry.mail',
                'suncom-blackberry.mail',

data/test/test_pm_sprint_com.rb

@@ -16,7 +16,7 @@ class TestPmSprintCom < Test::Unit::TestCase
     res.expects(:content_type).at_least_once.returns('image/jpeg')
     res.expects(:body).once.returns(body)
     res.expects(:code).never
-    Net::HTTP.expects(:get_response).once.with(uri).returns res
+    Net::HTTP.expects(:get_response).once.returns res
   end
 
   def mock_sprint_purged_image(message_id)
@@ -26,7 +26,7 @@ class TestPmSprintCom < Test::Unit::TestCase
     res.expects(:content_type).once.returns('text/html')
     res.expects(:code).once.returns('500')
     res.expects(:body).never
-    Net::HTTP.expects(:get_response).once.with(uri).returns res
+    Net::HTTP.expects(:get_response).once.returns res
   end
 
   def test_mms_should_have_text
@@ -60,7 +60,7 @@ class TestPmSprintCom < Test::Unit::TestCase
     res.expects(:content_type).at_least_once.returns('video/quicktime')
     res.expects(:body).once.returns(body)
     res.expects(:code).never
-    Net::HTTP.expects(:get_response).once.with(uri).returns res
+    Net::HTTP.expects(:get_response).once.returns res
 
     mms = MMS2R::Media.new(mail)
 
@@ -127,7 +127,7 @@ class TestPmSprintCom < Test::Unit::TestCase
     res1.expects(:content_type).at_least_once.returns('image/jpeg')
     res1.expects(:body).once.returns(body1)
     res1.expects(:code).never
-    Net::HTTP.expects(:get_response).once.with(uri1).returns res1
+    Net::HTTP.expects(:get_response).returns res1
 
     uri2 = URI.parse('http://pictures.sprintpcs.com/mmps/RECIPIENT/001_104058d23d79fb6a_1/3?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=5E1rJSPk5hYDkUnY7op0&outquality=90')
 
@@ -136,7 +136,7 @@ class TestPmSprintCom < Test::Unit::TestCase
     res2.expects(:content_type).at_least_once.returns('image/jpeg')
     res2.expects(:body).once.returns(body2)
     res2.expects(:code).never
-    Net::HTTP.expects(:get_response).once.with(uri2).returns res2
+    Net::HTTP.expects(:get_response).returns res2
     mms = MMS2R::Media.new(mail)
 
     assert_equal 1, mms.media.size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -40,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.4.0
     version: 
 description: |-
   == DESCRIPTION
@@ -54,46 +64,10 @@ description: |-
   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.
-  Suggestions and patches appreciated and welcomed!
-  
-  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,
-    cingularme.com, mobile.mycingular.com pics.cingularme.com
-  * Bell Canada: txt.bell.ca
-  * Bell South / Suncom: bellsouth.net
-  * Cricket Wireless: mms.mycricket.com
-  * Dobson/Cellular One: mms.dobson.net
-  * Helio: mms.myhelio.com
-  * Hutchison 3G UK Ltd: mms.three.co.uk
-  * INDOSAT M2: mobile.indosat.net.id
-  * LUXGSM S.A.: mms.luxgsm.lu
-  * Maroc Telecom / mms.mobileiam.ma
-  * MTM South Africa: mms.mtn.co.za
-  * NetCom (Norway): mms.netcom.no
-  * Nextel: messaging.nextel.com
-  * O2 Germany: mms.o2online.de
-  * O2 UK: mediamessaging.o2.co.uk
-  * Orange & Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr
-  * PLSPICTURES.COM mms hosting: waw.plspictures.com
-  * PXT New Zealand: pxt.vodafone.net.nz
-  * Rogers of Canada: rci.rogers.com
-  * SaskTel: sms.sasktel.com
-  * Sprint: pm.sprint.com, messaging.sprintpcs.com, sprintpcs.com
-  * 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
-    (note: mobile number is tucked away in a text/plain part for unicel.com)
-  * Verizon: vzwpix.com, vtext.com
-  * Virgin Mobile: vmpix.com
-  * Virgin Mobile of Canada: vmobile.ca
-  * Vodacom: mms.vodacom4me.co.za
-email: mikemondragon@gmail.com
+  MMS2R can be used to process any multipart email to conveniently access the
+  parts the mail is comprised of.
+email: 
+- mikemondragon@gmail.com
 executables: []
 
 extensions: []
@@ -143,7 +117,7 @@ files:
 - conf/vzwpix.com.yml
 - conf/waw.plspictures.com.yml
 - dev_tools/anonymizer.rb
-- dev_tools/debug_sprint_hpricot_parsing.rb
+- dev_tools/debug_sprint_nokogiri_parsing.rb
 - dev_tools/github.rb
 - init.rb
 - lib/mms2r.rb
@@ -302,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mms2r
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Extract user media from MMS (and not carrier cruft)