mms2r 3.0.1 → 3.1.0

data/History.txt

@@ -1,3 +1,16 @@
+### 3.1.0 / 2010-07-09 (Dick "Magic Ears" Knubbler - music producer)
+* 8 minor enhancements
+  * Detects additional Bell/AT&T domain sbcglobal.net as a handset
+  * Detects additional Virgin mobile domains pixmbl.com vmobl.com as a handset
+  * Expanded mobile phone detection for handset makers by : Casio, Google Nexus
+    One, LG Electronics, Motorola, Pantech, Qualcom, Samsung, Sprint, UTStarCom
+  * EXIF Reader (exifr) is integral to MMS2R and is now a required gem
+  * upgrade Mail to 2.2.5
+  * depend on latest gems
+  * corrected example - Jason Hooper
+  * added As Seen On The Internet to README that lists sites known to be using
+    MMS2R in some fashion
+
 ### 3.0.1 / 2010-03-28 (Lavona Succuboso - leader of "Succuboso Explosion")
 
 * 1 minor enhancement

data/Manifest.txt

@@ -71,6 +71,7 @@ test/fixtures/cingularme-text-02.mail
 test/fixtures/dobson-image-01.mail
 test/fixtures/dot.jpg
 test/fixtures/generic.mail
+test/fixtures/handsets.yml
 test/fixtures/helio-image-01.mail
 test/fixtures/helio-message-01.mail
 test/fixtures/iconv-fr-text-01.mail

data/README.txt

@@ -31,7 +31,7 @@ Corpus of carriers currently processed by MMS2R:
 * 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
+* Bell South / Suncom / SBC Global: bellsouth.net, sbcglobal.net
 * Cricket Wireless: mms.mycricket.com
 * Dobson/Cellular One: mms.dobson.net
 * Helio: mms.myhelio.com
@@ -57,27 +57,48 @@ Corpus of carriers currently processed by MMS2R:
 * 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: vmpix.com, pixmbl.com, vmobl.com
 * Virgin Mobile of Canada: vmobile.ca
 * Vodacom: mms.vodacom4me.co.za
 
 Corpus of smart phones known to MMS2R:
-* Blackberry variants
+* Apple iPhone variants
+* Blackberry / Research In Motion variants
+* Casio variants
 * Droid variants
+* Google / Nexus One variants
 * HTC variants (T-Mobile Dash, Sprint HERO)
-* Apple iPhone variants
+* LG Electronics variants
+* Motorola variants
+* Pantech variants
+* Qualcom variants
+* Samsung variants
+* Sprint variants
+* UTStarCom variants
+
+As Seen On The Internets - sites known to be using MMS2R in some fashion
+
+* twitpic.com [http://www.twitpic.com/]
+* fanchatter.com [http://www.fanchatter.com/]
+* camura.com [http://www.camura.com/]
+* eachday.com [http://www.eachday.com/]
+* beenup2.com [http://www.beenup2.com/]
+* snapmylife.com [http://www.snapmylife.com/]
+* email the author to be listed here
+
 
 == FEATURES
 
 * #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
+  attachment_fu or Paperclip
+* #process supports blocks 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 Mail object, any methods not defined on the
-  instance are delegated to its underlying Mail object
+  instance are delegated to it's underlying Mail object
 * #device_type? returns a symbol representing a device or smartphone type
-  Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid
+  Known smartphones thus far: iPhone, BlackBerry, T-Mobile Dash, Droid,
+  Samsung
 
 == BOOKS
 
@@ -92,7 +113,7 @@ http://peepcode.com/products/mms2r-pdf
   # required for the example
   require 'fileutils'
 
-  mail = MMS2R.new(Mail.read('some_saved_mail.file'))
+  mail = MMS2R::Media.new(Mail.read('some_saved_mail.file'))
   puts "mail has default carrier subject" if mail.subject.empty?
 
   # access the sender's phone number
@@ -153,14 +174,10 @@ http://peepcode.com/products/mms2r-pdf
 
 == REQUIREMENTS
 
-* Mail
-* Nokogiri (for mms from Sprint)
-* UUIDTools
-
-== OPTIONAL
-
-* exifr - install exifr for exif access on default jpeg or tiff media, and
-          smart phone detection
+* Mail (mail)
+* Nokogiri (nokogiri)
+* UUIDTools (uuidtools)
+* EXIF Reader (exif)
 
 == INSTALL
 
@@ -172,7 +189,7 @@ git clone git://github.com/monde/mms2r.git
 
 == AUTHORS
 
-Copyright (c) 2007-2008 by Mike Mondragon (blog[http://blog.mondragon.cc/])
+Copyright (c) 2007-2010 by Mike Mondragon (blog[http://plasti.cx/])
 
 MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 

data/Rakefile

@@ -21,18 +21,22 @@ Hoe.spec('mms2r') do |p|
   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 << ['nokogiri', '>= 1.4.0']
-  p.extra_deps << ['mail', '>= 2.1.0']
-  p.extra_deps << ['uuidtools', '>= 2.1.0']
+  p.extra_deps << ['mail', '>= 2.2.5']
+  p.extra_deps << ['uuidtools', '>= 2.1.1']
+  p.extra_deps << ['exifr', '>= 1.0.1']
   p.clean_globs << 'coverage'
 end
 
 begin
-  Rcov::RcovTask.new do |t|
-    t.test_files = FileList['test/test*.rb']
-    t.verbose = true
-    t.rcov_opts << "--exclude rcov.rb,hpricot.rb,hpricot/.*\.rb"
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |rcov|
+    rcov.pattern = 'test/**/test_*.rb'
+    rcov.verbose = true
+    rcov.rcov_opts << "--exclude rcov.rb"
   end
-rescue NameError
+rescue
+  task :rcov => :check_dependencies
 end
 
+
 # vim: syntax=Ruby

data/conf/aliases.yml

@@ -5,6 +5,7 @@ mmode.com: mms.att.net
 mms.mycingular.com: mms.att.net
 mobile.mycingular.com: mms.att.net
 pics.cingularme.com: mms.att.net
+sbcglobal.net: mms.att.net
 vtext.com: vzwpix.com
 orange.fr: orangemms.net
 mmsemail.orange.pl: orangemms.net
@@ -14,4 +15,6 @@ tmo.blackberry.net: tmomail.net
 info2go.com: unicel.com
 mms.telusmobility.com: msg.telus.com
 sprintpcs.com: pm.sprint.com
+pixmbl.com: vmpix.com
 vmobile.ca: vmpix.com
+vmobl.com: vmpix.com

data/conf/mms2r_media.yml

@@ -41,8 +41,23 @@ device_types:
   # 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
     :htc: !ruby/regexp /HTC|Eris|HERO200/i
+    :iphone: !ruby/regexp /iPhone/i
+  makes:
+    :apple: !ruby/regexp /^Apple$/i
+    :casio: !ruby/regexp /^CASIO$/i
+    :dash: !ruby/regexp /T-Mobile Dash/i
+    :google: !ruby/regexp /^google$/i
+    :htc: !ruby/regexp /^HTC/i
+    :lge: !ruby/regexp /^(LG|CX87BL05)/i
+    :motorola: !ruby/regexp /^Motorola/i
+    :pantech: !ruby/regexp /^PANTECH$/i
+    :qualcomm: !ruby/regexp /^MSM6/i
+    :research_in_motion: !ruby/regexp /^(RIM|Research In Motion)$/i
+    :samsung: !ruby/regexp /^(SAMSUNG|ES.M800|M6550B-SAM-4480)/i
+    :seoul_electronics: !ruby/regexp /^ISUS0/i
+    :sprint: !ruby/regexp /^Sprint$/i
+    :utstarcom: !ruby/regexp /^T1A_UC1.88$/i

data/lib/mms2r.rb

@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '3.0.1'
+    VERSION = '3.1.0'
 
   end
 
@@ -54,14 +54,15 @@ module MMS2R
 end
 
 require 'rubygems'
+gem 'mail', '= 2.2.5'
 require 'mail'
-gem 'mail', '>= 2.1.2'
 require 'fileutils'
 require 'pathname'
 require 'tmpdir'
 require 'yaml'
 require 'uuidtools'
 require 'iconv'
+require 'exifr'
 
 require File.join(File.dirname(__FILE__), 'mail_ext')
 require File.join(File.dirname(__FILE__), 'mms2r', 'media')

data/lib/mms2r/media.rb

@@ -185,7 +185,7 @@ module MMS2R
       ret = case
         when from.include?(from_domain)
           from_domain
-        when return_path.any?
+        when return_path.present?
           return_path
         else
           from_domain
@@ -218,6 +218,7 @@ module MMS2R
       @number = nil
       @subject = nil
       @body = nil
+      @exif = nil
       @default_media = nil
       @default_text = nil
 
@@ -428,12 +429,13 @@ module MMS2R
     # 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]
+    def transform_text(type, text, original_encoding = 'ISO-8859-1')
+
+      return type, text if !config['transform'] || !(transforms = config['transform'][type])
 
       #convert to UTF-8
       begin
-        c = Iconv.new('UTF-8', original_nencoding )
+        c = Iconv.new('UTF-8', original_encoding )
         utf_t = c.iconv(text)
       rescue Exception => e
         utf_t = text
@@ -540,26 +542,25 @@ module MMS2R
 
     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 /\.je?pg$/i
-                    EXIFR::JPEG.new(file)
-                  when /\.tiff?$/i
-                    EXIFR::TIFF.new(file)
-                  end
-          if @exif
-            models = config['device_types']['models'] rescue {}
-            models.each do |model, regex|
-              return model if @exif.model =~ regex
-            end
+      file = attachment(['image'])
+      if file
+        original = file.original_filename
+        @exif = case original
+                when /\.je?pg$/i
+                  EXIFR::JPEG.new(file)
+                when /\.tiff?$/i
+                  EXIFR::TIFF.new(file)
+                end
+        if @exif
+          models = config['device_types']['models'] rescue {}
+          models.each do |model, regex|
+            return model if @exif.model =~ regex
+          end
+          makes = config['device_types']['makes'] rescue {}
+          makes.each do |make, regex|
+            return make if @exif.make =~ regex
           end
         end
-      rescue LoadError => err
       end
 
       headers = config['device_types']['headers'] rescue {}
@@ -746,11 +747,13 @@ module MMS2R
       mime_type = nil
 
       #get the largest file
-      files.each do |f|
-        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]
+      files.each do |path|
+        if File.size(path) > size
+          size = File.size(path)
+          file = File.new(path)
+          media.each do |type,files|
+            mime_type = type if files.detect{ |_path| _path == path }
+          end
         end
       end
 

data/mms2r.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = "3.0.0"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]
-  s.date = %q{2010-03-28}
+  s.date = %q{2010-07-09}
   s.description = %q{== DESCRIPTION
 
 MMS2R is a library that decodes the parts of an MMS message to disk while
@@ -22,7 +22,7 @@ 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.TMail.txt", "README.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.TMail.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.uscc.net.mail", "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", "init.rb", "lib/mail_ext.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.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/us-cellular-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_uscc_net.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.files = [".gitignore", "History.txt", "Manifest.txt", "README.TMail.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.uscc.net.mail", "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", "init.rb", "lib/mail_ext.rb", "lib/mms2r.rb", "lib/mms2r/media.rb", "lib/mms2r/media/sprint.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/handsets.yml", "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/us-cellular-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_uscc_net.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"]
@@ -38,23 +38,26 @@ parts the mail is comprised of.}
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.0"])
-      s.add_runtime_dependency(%q<mail>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.0"])
+      s.add_runtime_dependency(%q<mail>, [">= 2.2.5"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.1"])
+      s.add_runtime_dependency(%q<exifr>, [">= 1.0.1"])
       s.add_development_dependency(%q<rubyforge>, [">= 2.0.3"])
       s.add_development_dependency(%q<gemcutter>, [">= 0.4.1"])
       s.add_development_dependency(%q<hoe>, [">= 2.5.0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
-      s.add_dependency(%q<mail>, [">= 2.1.0"])
-      s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
+      s.add_dependency(%q<mail>, [">= 2.2.5"])
+      s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
+      s.add_dependency(%q<exifr>, [">= 1.0.1"])
       s.add_dependency(%q<rubyforge>, [">= 2.0.3"])
       s.add_dependency(%q<gemcutter>, [">= 0.4.1"])
       s.add_dependency(%q<hoe>, [">= 2.5.0"])
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 1.4.0"])
-    s.add_dependency(%q<mail>, [">= 2.1.0"])
-    s.add_dependency(%q<uuidtools>, [">= 2.1.0"])
+    s.add_dependency(%q<mail>, [">= 2.2.5"])
+    s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
+    s.add_dependency(%q<exifr>, [">= 1.0.1"])
     s.add_dependency(%q<rubyforge>, [">= 2.0.3"])
     s.add_dependency(%q<gemcutter>, [">= 0.4.1"])
     s.add_dependency(%q<hoe>, [">= 2.5.0"])

data/test/fixtures/handsets.yml

@@ -0,0 +1,119 @@
+--- 
+- - Apple
+  - iPhone
+- - Apple
+  - iPhone 3G
+- - Apple
+  - iPhone 3GS
+- - CASIO
+  - G'z One TYPE-S
+- - CASIO
+  - G'zOne ROCK
+- - CX87BL05
+  - LG8700
+- - ES.M800
+  - SPH-M800
+- - HTC
+  - Eris
+- - HTC
+  - HERO200
+- - HTC
+  - HTC_TyTN_II
+- - HTC
+  - RAPH800
+- - HTC
+  - T-Mobile G1
+- - HTC
+  - T-Mobile myTouch 3G
+- - HTC-ST7377
+  - HTC-ST7377
+- - ISUS02232009
+  - Seoul Electronics & Telecom SIM120B 1.3M
+- - ISUS09012008
+  - Seoul Electronics & Telecom SIM120B 1.3M
+- - LG Electronics
+  - VX-8800
+- - LG Electronics
+  - VX-9700
+- - LG Electronics
+  - VX11000
+- - LG Electronics, Inc.
+  - LG RUMOR2
+- - LGE
+  - CU920
+- - M6550B-SAM-4480
+  - SYSTEMLSI S5K4BAFB 2.0 MP
+- - MSM6100
+  - Omni_vision-9650
+- - MSM6500
+  - LSI_S5K4AAFA
+- - Motorola
+  - 1.3 Megapixel
+- - Motorola
+  - Droid
+- - Motorola
+  - Motorola Phone
+- - Motorola C.451.01.04.17.08
+  - 2.0 Megapixel
+- - PANTECH
+  - C790
+- - RIM
+  - BlackBerry 8100 Series
+- - Research In Motion
+  - BlackBerry 8310
+- - Research In Motion
+  - BlackBerry 8320
+- - Research In Motion
+  - BlackBerry 8330
+- - Research In Motion
+  - BlackBerry 8330m
+- - Research In Motion
+  - BlackBerry 8530
+- - Research In Motion
+  - BlackBerry 8900
+- - Research In Motion
+  - BlackBerry 9700
+- - SAMSUNG
+  - SAMSUNG
+- - SAMSUNG
+  - SCH-U350
+- - SAMSUNG
+  - SCH-U450
+- - SAMSUNG
+  - SCH-U490
+- - SAMSUNG
+  - SGH-A167
+- - SAMSUNG
+  - SGH-A437
+- - SAMSUNG
+  - SGH-E250
+- - SAMSUNG
+  - SGH-T459
+- - SAMSUNG
+  - SGH-T729
+- - SAMSUNG
+  - SPH-M900
+- - SAMSUNG
+  - Samsung SCH-U750
+- - SAMSUNG Electronics
+  - SGH-i637
+- - Samsung Electronics
+  - A727
+- - Samsung Electronics
+  - A767
+- - Samsung Electronics
+  - SGH-A737
+- - Samsung Electronics
+  - SGH-T749
+- - Samsung Electronics
+  - SGH-T819
+- - Samsung Electronics
+  - T639
+- - Sprint
+  - KATANA Eclipse X
+- - T-Mobile Dash
+  - T-Mobile Dash
+- - T1A_UC1.88
+  - Micron MT9M113 1.3MP YUV
+- - google
+  - Nexus One

data/test/fixtures/luxgsm-image-01.mail

@@ -21,6 +21,7 @@ Mime-Version: 1.0
 Content-Type: multipart/mixed; 
 	boundary="----=_Part_3189_7839582.1195059640065"
 
+
 ------=_Part_3189_7839582.1195059640065
 Content-Type: multipart/alternative; 
 	boundary="----=_Part_3191_16589396.1195059640154"
@@ -168,7 +169,7 @@ ECkC/IANDMCEog5xBQZAA8yD2gQpICXmLxwiegyI4J6n0qrWOU1XzNJhQPbE8YPkLY8Uc1iwPJiX
 KnTogk/B47AlMLHlPq3DeNdYBwXFI9A6m6dFDGBATTiR6eUYhzky6TQDWOCST5e61BIYNamZIxE6
 W/okohUipbf76i/K2lSoqrU7b10qjQjEIcAOtrCFzWtcKyMgADs=
 ------=_Part_3189_7839582.1195059640065
-Content-Type: IMAGE/GIF; name=Drinks.gif
+Content-Type: image/gif; name=Drinks.gif
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename=Drinks.gif
 Content-Description: Drinks.gif

data/test/test_helper.rb

@@ -3,11 +3,10 @@ require 'set'
 require 'net/http'
 require 'net/https'
 require 'pp'
-require 'exifr'
 require 'tempfile'
 require 'test/unit'
 require 'mocha'
-require File.join(File.dirname(__FILE__), "..", "lib", "mms2r")
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'mms2r')
 
 begin require 'redgreen'; rescue LoadError; end
 
@@ -20,30 +19,34 @@ module MMS2R
       assert(File::size(file) == size, "file #{file} is #{File::size(file)} bytes, not #{size} bytes")
     end
 
+    def fixture(file)
+      File.join(File.expand_path(File.dirname(__FILE__)), "fixtures", file)
+    end
+
     def mail_fixture(file)
-      "#{File.dirname(__FILE__)}/fixtures/#{file}"
+      fixture(file)
     end
 
     def mail(name)
       Mail.read(mail_fixture(name))
     end
 
-    def smart_phone_mock(model_text = 'iPhone', jpeg = true)
-      mail = mock('mail')
-      mail.expects(:from).at_least_once.returns(['joe@example.com'])
-      mail.expects(:return_path).at_least_once.returns('<joe@example.com>')
-      mail.expects(:message_id).returns('abcd0123')
-      mail.expects(:multipart?).returns(true)
+    def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', jpeg = true)
+      mail = stub('mail',
+                  :from => ['joe@example.com'],
+                  :return_path => '<joe@example.com>',
+                  :message_id => 'abcd0123',
+                  :multipart? => true,
+                  :header => {})
 
-      part = mock('part')
-      part.expects(:part_type?).at_least_once.returns("image/#{jpeg ? 'jpeg' : 'tiff'}")
-      part.expects(:body).at_least_once.returns(Mail::Body.new('abc'))
-      part.expects(:multipart?).at_least_once.returns(false)
-      part.expects(:filename).returns("foo.#{jpeg ? 'jpg' : 'tif'}")
+      part = stub('part',
+                  :part_type? => "image/#{jpeg ? 'jpeg' : 'tiff'}",
+                  :body => Mail::Body.new('abc'),
+                  :multipart? => false,
+                  :filename => "foo.#{jpeg ? 'jpg' : 'tif'}" )
 
-      mail.expects(:parts).returns([part])
-      exif = mock('exif')
-      exif.expects(:model).at_least_once.returns(model_text)
+      mail.stubs(:parts).returns([part])
+      exif = stub('exif', :make => make_text, :model => model_text)
       if jpeg
         EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
       else

data/test/test_mms2r_media.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
 
 class TestMms2rMedia < Test::Unit::TestCase
   include MMS2R::TestHelper
@@ -232,24 +232,24 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_equal ['text/plain', ''], mms.transform_text('text/plain', " \n\nimage/jpeg")
 
     # has a bad regexp
-    mms.expects(:config).once.returns({'transform' => {type => [['(hello)', 'world']]}})
+    mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
     assert_equal result, mms.transform_text(type, text)
 
     # matches in config
-    mms.expects(:config).once.returns({'transform' => {type => [['/(hello)/', 'world']]}})
+    mms.expects(:config).at_least_once.returns({'transform' => {type => [["/(hello)/", 'world']]}})
     assert_equal [type, 'world'], mms.transform_text(type, text)
 
-    mms.expects(:config).once.returns({'transform' => {type => [['/^Ignore this part, (.+)/', '\1']]}})
+    mms.expects(:config).at_least_once.returns({'transform' => {type => [['/^Ignore this part, (.+)/', '\1']]}})
     assert_equal [type, text], mms.transform_text(type, "Ignore this part, " + text)
 
     # chaining transforms
-    mms.expects(:config).once.returns({'transform' => {type => [['/(hello)/', 'world'], 
+    mms.expects(:config).at_least_once.returns({'transform' => {type => [['/(hello)/', 'world'], 
                                                                 ['/(world)/', 'mars']]}})
     assert_equal [type, 'mars'], mms.transform_text(type, text)
 
     # has a Iconv problem
     Iconv.expects(:new).raises
-    mms.expects(:config).once.returns({'transform' => {type => [['(hello)', 'world']]}})
+    mms.expects(:config).at_least_once.returns({'transform' => {type => [['(hello)', 'world']]}})
     assert_equal result, mms.transform_text(type, text)
   end
 
@@ -264,7 +264,6 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_not_nil file
     assert_equal true, File::exist?(file)
     text = IO.readlines("#{file}").join
-    #assert_match(/D'ici un mois Géorgie/, text)
     assert_match(/D'ici un mois G\303\251orgie/, text)
     assert_match(/D'ici un mois Géorgie/, text)
     assert_equal("sample email message Fwd: sub D'ici un mois G\303\251orgie", mms.subject)
@@ -323,12 +322,12 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_nil mms.send(:attachment, ['text'])
   end
 
-  def test_type_from_filename(filename)
+  def test_type_from_filename
     mms = MMS2R::Media.new stub_mail
     assert_equal 'image/jpeg', mms.send(:type_from_filename, "example.jpg")
   end
 
-  def test_type_from_filename_should_be_nil(filename)
+  def test_type_from_filename_should_be_nil
     mms = MMS2R::Media.new stub_mail
     assert_nil mms.send(:type_from_filename, "example.example")
   end
@@ -766,67 +765,69 @@ class TestMms2rMedia < Test::Unit::TestCase
   end
 
   def test_exif
-    mail = smart_phone_mock('iPhone')
+    mail = smart_phone_mock
     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')
+    mail = smart_phone_mock
     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)
+    mail = smart_phone_mock('Apple', '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')
+    mail = smart_phone_mock('Research In Motion', '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')
+    mail = smart_phone_mock('T-Mobile Dash', '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')
+    mail = smart_phone_mock('Motorola', 'Droid')
     mms = MMS2R::Media.new(mail)
     assert_equal :droid, mms.device_type?
     assert_equal true, mms.is_mobile?
   end
 
   def test_htc_eris_device_type_by_exif
-    mail = smart_phone_mock('Eris')
+    mail = smart_phone_mock('HTC', 'Eris')
     mms = MMS2R::Media.new(mail)
     assert_equal :htc, mms.device_type?
     assert_equal true, mms.is_mobile?
   end
 
   def test_htc_hero_device_type_by_exif
-    mail = smart_phone_mock('HERO200')
+    mail = smart_phone_mock('HTC', 'HERO200')
     mms = MMS2R::Media.new(mail)
     assert_equal :htc, mms.device_type?
     assert_equal true, mms.is_mobile?
   end
 
+  def test_handsets_by_exif
+    handsets = YAML.load_file(fixture('handsets.yml'))
+    handsets.each do |handset|
+      mail = smart_phone_mock(handset.first, handset.last)
+      mms = MMS2R::Media.new(mail)
+      assert_equal true, mms.is_mobile?, "mms with make #{mms.exif.make}, and model #{mms.exif.model}, should be considered a mobile device"
+    end
+  end
+
   def test_blackberry_device_type
     berries = ['att-blackberry.mail',
                'suncom-blackberry.mail',

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 3
-  - 0
   - 1
-  version: 3.0.1
+  - 0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-28 00:00:00 -07:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 1
-        - 0
-        version: 2.1.0
+        - 2
+        - 5
+        version: 2.2.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,14 +55,28 @@ dependencies:
         segments: 
         - 2
         - 1
-        - 0
-        version: 2.1.0
+        - 1
+        version: 2.1.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: exifr
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -72,11 +86,11 @@ dependencies:
         - 3
         version: 2.0.3
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: gemcutter
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -86,11 +100,11 @@ dependencies:
         - 1
         version: 0.4.1
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -100,7 +114,7 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: |-
   == DESCRIPTION
   
@@ -200,6 +214,7 @@ files:
 - test/fixtures/dobson-image-01.mail
 - test/fixtures/dot.jpg
 - test/fixtures/generic.mail
+- test/fixtures/handsets.yml
 - test/fixtures/helio-image-01.mail
 - test/fixtures/helio-message-01.mail
 - test/fixtures/iconv-fr-text-01.mail