mms2r 3.2.0 → 3.3.0

data/Gemfile

@@ -0,0 +1,19 @@
+# -*- ruby -*-
+
+source :gemcutter
+
+gem "nokogiri", ">=1.4.4"
+gem "mail", ">=2.2.10"
+gem "uuidtools", ">=2.1.1"
+gem "exifr", ">=1.0.3"
+
+gem "rubyforge", ">=2.0.4", :group => [:development, :test]
+gem "gemcutter", ">=0.4.1", :group => [:development, :test]
+gem "hoe", ">=2.5.0", :group => [:development, :test]
+
+group :test do
+  gem 'test-unit', '= 1.2.3'
+  gem 'mocha'
+end
+
+# vim: syntax=ruby

data/Gemfile.lock

@@ -0,0 +1,42 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.3)
+    exifr (1.0.3)
+    gemcutter (0.6.1)
+    hoe (2.8.0)
+      rake (>= 0.8.7)
+    i18n (0.5.0)
+    json_pure (1.4.6)
+    mail (2.2.13)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rake (0.8.7)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    uuidtools (2.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  exifr (>= 1.0.3)
+  gemcutter (>= 0.4.1)
+  hoe (>= 2.5.0)
+  mail (>= 2.2.10)
+  mocha
+  nokogiri (>= 1.4.4)
+  rubyforge (>= 2.0.4)
+  test-unit (= 1.2.3)
+  uuidtools (>= 2.1.1)

data/History.txt

@@ -1,3 +1,15 @@
+### 3.3.0 / 2010-12-31 (Charles Foster Offdensen - CFO, dethklok)
+
+* 1 major enhancement
+  * MMS2R::Media::Sprint is now a module that is extended in for processing
+    Sprint content rather than being child class of MMS2R::Media
+    Extension is the strategy to use for overwriting template methods now
+
+* 1 minor enhancement
+  * process new Sprint subject - Jason Hooper
+  * new SaskTel mms/sms domain alias sasktel.com
+  * new Virgin Mobile mms/sms domain alias yrmobl.com
+
 ### 3.2.0 / 2010-08-17 (Antonio "Tony" DiMarco Thunderbottom - bassist)
 
 * 3 minor enhancements

data/Manifest.txt

@@ -1,4 +1,6 @@
 .gitignore
+Gemfile
+Gemfile.lock
 History.txt
 Manifest.txt
 README.TMail.txt
@@ -106,6 +108,7 @@ 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-new-image-01.mail
 test/fixtures/sprint-pcs-text-01.mail
 test/fixtures/sprint-purged-image-01.mail
 test/fixtures/sprint-text-01.mail

data/README.txt

@@ -48,7 +48,7 @@ Corpus of carriers currently processed by MMS2R:
 * PLSPICTURES.COM mms hosting: waw.plspictures.com
 * PXT New Zealand: pxt.vodafone.net.nz
 * Rogers of Canada: rci.rogers.com
-* SaskTel: sms.sasktel.com
+* SaskTel: sasktel.com, 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
@@ -57,7 +57,7 @@ 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, pixmbl.com, vmobl.com
+* Virgin Mobile: vmpix.com, pixmbl.com, vmobl.com, yrmobl.com
 * Virgin Mobile of Canada: vmobile.ca
 * Vodacom: mms.vodacom4me.co.za
 
@@ -159,7 +159,7 @@ http://peepcode.com/products/mms2r-pdf
   # inspect default media's exif data if exifr gem is installed and default
   # media is a jpeg or tiff
   puts "mail's default media's exif data is:"
-  puts mms.exif.inspect
+  puts mail.exif.inspect
 
   # Block support, process and receive all media types of video.
   mail.process do |media_type, files|

data/Rakefile

@@ -14,6 +14,7 @@ end
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 require 'mms2r'
+require 'rake'
 
 Hoe.plugin :bundler
 Hoe.spec('mms2r') do |p|
@@ -25,10 +26,12 @@ Hoe.spec('mms2r') do |p|
   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 << ['nokogiri', '>= 1.4.0']
-  p.extra_deps << ['mail', '>= 2.2.5']
+  p.readme_file    = 'README.txt'
+  p.history_file   = 'History.txt'
+  p.extra_deps << ['nokogiri', '>= 1.4.4']
+  p.extra_deps << ['mail', '>= 2.2.10']
   p.extra_deps << ['uuidtools', '>= 2.1.1']
-  p.extra_deps << ['exifr', '>= 1.0.1']
+  p.extra_deps << ['exifr', '>= 1.0.3']
   p.clean_globs << 'coverage'
 end
 
@@ -43,11 +46,4 @@ rescue
   task :rcov => :check_dependencies
 end
 
-RDoc::Task.new do |rdoc|
-  rdoc.title    = "mms2r-#{MMS2R::Media::VERSION}"
-  rdoc.rdoc_dir = 'doc'
-  rdoc.options << '-f' << 'horo'
-  rdoc.options << '--main' << 'README.txt'
-end
-
 # vim: syntax=Ruby

data/conf/aliases.yml

@@ -14,7 +14,9 @@ mmsreply.t-mobile.co.uk: tmomail.net
 tmo.blackberry.net: tmomail.net
 info2go.com: unicel.com
 mms.telusmobility.com: msg.telus.com
+sasktel.com: sms.sasktel.com
 sprintpcs.com: pm.sprint.com
 pixmbl.com: vmpix.com
 vmobile.ca: vmpix.com
 vmobl.com: vmpix.com
+yrmobl.com: vmpix.com

data/conf/pm.sprint.com.yml

@@ -8,5 +8,7 @@ transform:
   text/plain: 
   - - /^You have new Picture Mail!$/i
     - ""
+  - - /^New Message$/i
+    - ""
   - - /^PictureMail$/i
     - ""

data/lib/mms2r.rb

@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '3.2.0'
+    VERSION = '3.3.0'
 
   end
 
@@ -55,7 +55,7 @@ end
 
 %W{ mail fileutils pathname tmpdir yaml uuidtools iconv exifr }.each do |g|
   begin
-    gem 'mail', '= 2.2.5' if g == 'mail'
+    gem 'mail', '= 2.2.13' if g == 'mail'
     require g
   rescue LoadError
     require 'rubygems'

data/lib/mms2r/media.rb

@@ -107,17 +107,6 @@ module MMS2R
 
   class MMS2R::Media
 
-    class << self #:nodoc:
-      # alias new so that we can use ::create to select the media processor and
-      # then initialize the new object
-      alias orig_new new
-      def new(mail, opts = {})
-        klass, carrier = MMS2R::Media.create(mail)
-        opts[:domain] = carrier
-        klass.orig_new(mail, opts)
-      end
-    end
-
     # Pass off everything we don't do to the Mail 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
@@ -147,20 +136,6 @@ module MMS2R
 
     attr_reader :media_dir
 
-    ##
-    # Factory method that creates MMS2R::Media products based on the domain
-    # name of the carrier from which the MMS originated.  mail is a Mail
-    # 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|
-        return klass, domain if from_domain == domain
-      end
-      [MMS2R::Media, from_domain]
-    end
-
     ##
     # 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
@@ -183,7 +158,7 @@ module MMS2R
           ''
         end
 
-      f = File.join(self.conf_dir(), "from.yml")
+      f = File.expand_path(File.join(self.conf_dir(), "from.yml"))
       from = YAML::load_file(f) rescue {}
 
       ret = case
@@ -213,10 +188,11 @@ module MMS2R
       @mail = mail
       @logger = opts[:logger]
       log("#{self.class} created", :info)
-      @carrier = opts[:domain]
+      @carrier = self.class.domain(mail)
       @dir_count = 0
-      @media_dir = File.join(self.tmp_dir(),
-                     "#{self.safe_message_id(@mail.message_id)}_#{UUIDTools::UUID.random_create}")
+      @media_dir = File.expand_path(
+                     File.join(self.tmp_dir(),
+                     "#{self.safe_message_id(@mail.message_id)}_#{UUIDTools::UUID.random_create}"))
       @media = {}
       @was_processed = false
       @number = nil
@@ -226,14 +202,17 @@ module MMS2R
       @default_media = nil
       @default_text = nil
 
-      f = File.join(self.conf_dir(), "aliases.yml")
+      f = File.expand_path(File.join(self.conf_dir(), "aliases.yml"))
       @aliases = YAML::load_file(f) rescue {}
 
       conf = "#{@aliases[@carrier] || @carrier}.yml"
-      f = File.join(self.conf_dir(), conf)
+      f = File.expand_path(File.join(self.conf_dir(), conf))
       c = YAML::load_file(f) rescue {}
       @config = self.class.initialize_config(c)
 
+      processor_module = MMS2R::CARRIERS[@carrier]
+      extend processor_module if processor_module
+
       lazy = (opts[:process] == :lazy) rescue false
       self.process() unless lazy
     end
@@ -475,7 +454,7 @@ module MMS2R
 
     def temp_file(part)
       file_name = filename?(part)
-      File.join(msg_tmp_dir(),File.basename(file_name))
+      File.expand_path(File.join(msg_tmp_dir(),File.basename(file_name)))
     end
 
     ##
@@ -501,7 +480,7 @@ module MMS2R
 
     def msg_tmp_dir()
       @dir_count += 1
-      dir = File.join(@media_dir, "#{@dir_count}")
+      dir = File.expand_path(File.join(@media_dir, "#{@dir_count}"))
       FileUtils.mkdir_p(dir)
       dir
     end
@@ -578,8 +557,9 @@ module MMS2R
         end
       end
 
-      return :handset if File.exist?(File.join(self.conf_dir,
-                                     "#{self.aliases[self.carrier] || self.carrier}.yml"))
+      return :handset if File.exist?( File.expand_path(
+                             File.join(self.conf_dir, "#{self.aliases[self.carrier] || self.carrier}.yml")
+                         ) )
 
       :unknown
     end
@@ -603,7 +583,7 @@ module MMS2R
     # Get the temporary directory where media files are written to.
 
     def self.tmp_dir
-      @@tmp_dir ||= File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r')
+      @@tmp_dir ||= File.expand_path(File.join(Dir.tmpdir, (ENV['USER'].nil? ? '':ENV['USER']), 'mms2r'))
     end
 
     ##
@@ -616,7 +596,7 @@ module MMS2R
     # Get the directory where conf files are stored.
 
     def self.conf_dir
-      @@conf_dir ||= File.join(File.dirname(__FILE__), '..', '..', 'conf')
+      @@conf_dir ||= File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'conf'))
     end
 
     ##
@@ -650,7 +630,7 @@ module MMS2R
     # configuration.
 
     def self.initialize_config(c)
-      f = File.join(self.conf_dir(), "mms2r_media.yml")
+      f = File.expand_path(File.join(self.conf_dir(), "mms2r_media.yml"))
       conf = YAML::load_file(f) rescue {}
       conf['ignore'] ||= {} unless conf['ignore']
       conf['transform'] = {} unless conf['transform']

data/lib/mms2r/media/sprint.rb

@@ -25,7 +25,7 @@ module MMS2R
     # The default subject on these messages from the
     # carrier is "You have new Picture Mail!"
 
-    class Sprint < MMS2R::Media
+    module Sprint
 
       ##
       # Override process() because Sprint doesn't attach media (images, video,

data/test/fixtures/sprint-new-image-01.mail

@@ -0,0 +1,171 @@
+Return-Path: <someuser@pm.sprint.com>
+X-Original-To: tommytutone@example.com
+Delivered-To: tommytutone@example.com
+Received: from smtp04.sun3.lightsurf.net (smtp.sun3.lightsurf.net [63.215.195.131])
+	by mail.pressfactory.com (Postfix) with ESMTP id B2B2A9B818E
+	for <someuser@staging.example.com>; Wed, 15 Sep 2010 17:46:35 -0500 (CDT)
+Received: from pcs-nams006 (pcs-mmsc.sun3.lightsurf.net [10.0.0.152])
+	by smtp04.sun3.lightsurf.net (8.12.11.20060308/8.12.11) with ESMTP id o8FMkD1x021419
+	for <jhooper@staging.the773.com>; Wed, 15 Sep 2010 15:46:34 -0700
+Date: Wed, 15 Sep 2010 15:46:34 -0700
+Message-ID: <13279090.1284590794315.JavaMail.lsadm@pcs-nams006>
+From: "someuser@pm.sprint.com" <someuser@pm.sprint.com>
+To: tommytutone@example.com
+Subject: New Message
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+	boundary="----=_Part_1414209_33449409.1284590794315"
+X-Priority: 3
+X-MSMail-Priority: Normal
+Importance: Normal
+
+------=_Part_1414209_33449409.1284590794315
+Content-Type: text/plain; charset=us-ascii
+Content-Transfer-Encoding: 7bit
+
+New Picture Mail from {SENDER_ADDRESS}!
+
+Click Go/View to see.
+http://pictures.sprintpcs.com/?mivt=qEzrz87zPk5JehF8a7Ro&shareName=MMS
+
+ _frsthgl
+
+
+------=_Part_1414209_33449409.1284590794315
+Content-Type: text/html
+Content-Transfer-Encoding: 7bit
+
+<html>
+<head><title>You have new Picture Mail!</title>
+<!-- lsPictureMail-Share-qEzrz87zPk5JehF8a7Ro-comment
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF&#45;8&quot;?&gt;
+&lt;shareMessage&gt;
+   &lt;messageContents type=&quot;PICTURE&quot;&gt;
+      &lt;messageText&gt;&lt;/messageText&gt;
+      &lt;mediaItems&gt;
+         &lt;mediaItem id=&quot;1&quot;&gt;                        
+            &lt;title&gt;&lt;/title&gt;
+            &amp;lt;url&amp;gt;http://pictures.sprintpcs.com/getMMBOXMessageMedia?id=Xw1004H8sLv6S3x76lVPYtnvoa0u8lsCOxfK6ET0QRzlHsYxJBqo8gmk5gW%2FZUWGqyw0fwJJvr5P%0AFLU5A%2FvywOmVt7fzsEh1qaCiCTlPZhWGkNKbb8WqPOCIziOJasq%2FFnEStrmwlGcgabRtSp%2Bg9A%3D%3D%0A&amp;lt;/url&amp;gt;
+
+            &lt;urlExpiration&gt;2010&#45;09&#45;22T22:46:34Z&lt;/urlExpiration&gt;
+         &lt;/mediaItem&gt;
+      &lt;/mediaItems&gt;
+   &lt;/messageContents&gt;
+&lt;/shareMessage&gt;
+
+-->
+<!-- lsPictureMail-UserInfo-qEzrz87zPk5JehF8a7Ro-comment
+&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF&#45;8&quot;?&gt;
+&lt;UserInfo timestamp=&quot;2010&#45;09&#45;15T22:46:34.312+00:00&quot; originating_from_address=&quot;someuser@pm.sprint.com&quot;&gt;&lt;credential name=&quot;MDN&quot;&gt;2068675309&lt;/credential&gt;&lt;/UserInfo&gt;
+ -->
+</head>
+<body marginheight="0" marginwidth="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
+<table border="0" width="100%" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF" >
+<tr>
+   <td VALIGN="top" colspan="2" width="100%">
+        <div style="border-bottom:1px solid rgb(156, 154, 156); padding:20px 0px 20px 10px"><a href="http://www.sprintpcs.com"><img src="http://pictures.sprintpcs.com/retailers/PCSNEXTEL/ui-refresh/images/logo/sprint-logo-white.jpg" alt="" border="0" /></a></div>        
+    </td>
+</tr>
+<tr>
+   <td VALIGN="top" colspan="2">
+        <table border="0" cellpadding="0" cellspacing="0" width="590" bgcolor="#FFFFFF">
+            <tr>
+                <td><br/><p><img src="http://pictures.sprintpcs.com/images/x.gif" border="0" width="10"/><font face="trebuchet ms, Helvetica, Arial, Verdana" size="2"><b>You have a Picture Mail from someuser@pm.sprint.com</b></font><br/><br/></p></td>
+            </tr>
+        </table>
+    </td>
+</tr>
+<tr>
+    <td colspan="2">
+        <table border="0" width="590" cellpadding="0" cellspacing="0">
+            <tr>
+            <td width="10">&nbsp;</td>
+            <td width="280" valign="top">
+                <table border="0" cellpadding="0" style="border:1px solid #9C9A9C;">
+                <tr>
+                    <td>
+                        <table border="0" bgcolor="#ffffff" cellpadding="0" cellspacing="7" style="table-layout:fixed">
+                            <tr>
+                                <td align="center">
+                                    <img src="http://pictures.sprintpcs.com//mmps/RECIPIENT/007_207a642442f51088_1/2?inviteToken=qEzrz87zPk5JehF8a7Ro&amp;limitsize=258,258&amp;outquality=90&amp;squareoutput=255,255,255&amp;ext=.jpg&amp;iconifyVideo=true&amp;wm=1"/>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+                </table>
+            </td>
+            <td width="20">&nbsp;</td>
+             <td VALIGN="top" align="right" width="280">
+                   <table border="0" cellpadding="0" cellspacing="0" width="280" style="table-layout:fixed">
+                       <tr>
+                           <td><p><font face="trebuchet ms, Helvetica, Arial, Verdana" size="2"><b>Message:</b></font></p></td>
+                       </tr>
+                       <tr>
+                           <td><pre style="overflow:auto; font:normal 10pt trebuchet ms; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap;  word-wrap: break-word;"></pre></td>
+                       </tr>
+                       <tr>
+                           <td><img src="http://pictures.sprintpcs.com/images/x.gif" border="0" height="15"/></td>
+                       </tr>
+                       <tr>
+                           <td width="280">
+                                <div style="padding:0px; background-color:#fff; font: normal 10pt trebuchet ms" width="280">
+                                 <a target="_blank" style="color: #148AB2;" href="http://pictures.sprintpcs.com/share.do?invite=qEzrz87zPk5JehF8a7Ro&amp;shareName=MMS&amp;messageState=RETRIEVED">View Entire Message</a>
+                                 <br/><br/>
+                                 Send and receive Pictures and Videos through Picture Mail<sup>SM</sup>. For more information go to <a target="_blank" style="color: #148AB2;" href="http://www.sprint.com/picturemail">www.sprint.com/picturemail.</a>
+                                </div>
+                           </td>
+                       </tr>
+                   </table>
+           </td>
+           </tr>
+       </table>
+   </td>
+   </tr>
+   <tr>
+       <td>
+         <table>
+             <tr>
+                 <td>
+                    <div style="font: normal 10pt trebuchet ms;margin-top:10px;">Please be aware your friends can forward your picture, video, and album share invitations to others or post the unique Web link to your share invitation on any number of sources (e.g. blogs), through which others could also gain access to your online photos. If you have private or sensitive photos you are sharing, please share them only with those you trust.</div>
+                 </td>
+             </tr>
+         </table>
+        </td>
+    </tr>
+    <tr>
+       <td colspan="2">
+           <img src="http://pictures.sprintpcs.com/images/x.gif" width="5" height="45"/>
+       </td>
+    </tr>
+    <tr>
+       <td VALIGN="top" colspan="2" width="590">
+          <img src="http://pictures.sprintpcs.com/images/x.gif" height="5"/>
+       </td>
+    </tr>
+    <tr>
+       <td VALIGN="top" colspan="2" width="100%">
+           <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				  <tr>
+					  <td bgcolor="#ffffff" width="100%">
+							<div style="border-top:1px solid rgb(156, 154, 156)">&nbsp;</div>
+					  </td>
+				  </tr>
+				  <tr>
+					<td>
+						<div style="float:left"><img src="http://pictures.sprintpcs.com/retailers/PCSNEXTEL/ui-refresh/images/logo/syniverse.gif" alt="Syniverse" border="0" /></div>
+						<div style="float:right; padding-right:5px"><span style="font-family:trebuchet ms, Helvetica, Arial, Verdana; Font-size: 11px; Color: #000000">&#169; 2010 Sprint. All rights reserved.</span></div>
+					</td>
+				  </tr>
+				  <tr>
+					  <td bgcolor="#ffffff" width="100%"><img src="http://pictures.sprintpcs.com/images/x.gif" border="0" height="10"/></td>
+				  </tr>
+           </table>
+       </td>
+    </tr>
+</table>
+</body>
+</html><!-- legacy_mms_arrived.txt -->
+
+------=_Part_1414209_33449409.1284590794315--
+

data/test/test_mms2r_media.rb

@@ -3,8 +3,6 @@ require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
 class TestMms2rMedia < Test::Unit::TestCase
   include MMS2R::TestHelper
 
-  class MMS2R::Media::NullCarrier < MMS2R::Media; end
-
   def use_temp_dirs
     MMS2R::Media.tmp_dir = @tmpdir
     MMS2R::Media.conf_dir = @confdir
@@ -121,50 +119,6 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_not_nil config['number'].first == 'from'
   end
 
-  def test_create_with_default_processor
-    mail = mock()
-    mail.expects(:from).at_least_once.returns(['joe@unknown.example.com'])
-    mail.expects(:return_path).at_least_once.returns('joe@unknown.example.com')
-    mms = MMS2R::Media.create(mail)
-    assert_equal [MMS2R::Media, 'unknown.example.com'] , mms
-  end
-
-  def test_create_with_special_processor
-    MMS2R.register('null.example.com', MMS2R::Media::NullCarrier)
-    mail = mock()
-    mail.expects(:from).at_least_once.returns(['joe@null.example.com'])
-    mail.expects(:return_path).at_least_once.returns('joe@null.example.com')
-    mms = MMS2R::Media.create(mail)
-    assert_equal [MMS2R::Media::NullCarrier, 'null.example.com'], mms
-  end
-
-  def test_create_with_special_processor_and_return_path
-    MMS2R.register('null.example.com', MMS2R::Media::NullCarrier)
-    mail = mock()
-    mail.expects(:from).at_least_once.returns([])
-    mail.expects(:return_path).at_least_once.returns('joe@null.example.com')
-    mms = MMS2R::Media.create(mail)
-    assert_equal [MMS2R::Media::NullCarrier, 'null.example.com'], mms
-  end
-
-  def test_create_should_fail_gracefully_with_broken_from
-    mail = mock()
-    mail.expects(:from).at_least_once.returns(nil)
-    mail.expects(:return_path).at_least_once.returns('joe@unknown.example.com')
-    assert_nothing_raised { MMS2R::Media.create(mail) }
-  end
-
-  def test_aliased_new_returns_custom_processor_instance
-    MMS2R.register('null.example.com', MMS2R::Media::NullCarrier)
-    mail = stub_mail
-    mail.expects(:from).at_least_once.returns(['joe@null.example.com'])
-
-    mms = MMS2R::Media.new(mail)
-    assert_not_nil mms
-    assert_equal MMS2R::Media::NullCarrier, mms.class
-    assert_equal true, mms.respond_to?(:process)
-  end
-
   def test_aliased_new_returns_default_processor_instance
     mms = MMS2R::Media.new stub_mail
     assert_not_nil mms
@@ -184,8 +138,14 @@ class TestMms2rMedia < Test::Unit::TestCase
   end
 
   def test_default_processor_initialize_tries_to_open_config_for_carrier
-    f = File.join(MMS2R::Media.conf_dir, 'example.com.yml')
-    YAML.expects(:load_file).once.with(f)
+    mms_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'mms2r_media.yml'))
+    aliases_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'aliases.yml'))
+    from_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'from.yml'))
+    example_yaml = File.expand_path(File.join(MMS2R::Media.conf_dir, 'example.com.yml'))
+    YAML.expects(:load_file).at_least_once.with(mms_yaml).returns({})
+    YAML.expects(:load_file).at_least_once.with(aliases_yaml).returns({})
+    YAML.expects(:load_file).at_least_once.with(from_yaml).returns([])
+    YAML.expects(:load_file).at_least_once.with(example_yaml)
     mms = MMS2R::Media.new stub_mail
   end
 
@@ -519,7 +479,6 @@ class TestMms2rMedia < Test::Unit::TestCase
   end
 
   def test_add_file
-    MMS2R.register('null.example.com', MMS2R::Media::NullCarrier)
     mail = stub_mail
     mail.stubs(:from).returns(['joe@null.example.com'])
 

data/test/test_pm_sprint_com.rb

@@ -194,13 +194,13 @@ class TestPmSprintCom < Test::Unit::TestCase
     mail = mock(:message_id => 'a')
     mail.expects(:from).at_least_once.returns(['joe@pm.sprint.com'])
     mail.expects(:return_path).at_least_once.returns('joe@pm.sprint.com')
-    s = MMS2R::Media::Sprint.new(mail, :process => :lazy)
+    mms = MMS2R::Media.new(mail, :process => :lazy)
     type = 'text/plain'
     content = 'foo'
     file = Tempfile.new('sprint')
     file.close
 
-    type, file = s.send(:sprint_write_file, type, content, file.path)
+    type, file = mms.send(:sprint_write_file, type, content, file.path)
     assert_equal 'text/plain', type
     assert_equal content, IO.read(file)
   end
@@ -213,4 +213,12 @@ class TestPmSprintCom < Test::Unit::TestCase
     assert_equal "", mms.subject
   end
 
+  def test_new_subject
+    mail = mail('sprint-new-image-01.mail')
+    mms = MMS2R::Media.new(mail)
+    assert_equal '2068675309', mms.number
+    assert_equal "pm.sprint.com", mms.carrier
+    assert_equal "", mms.subject
+  end
+
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mms2r
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 3
-  - 2
+  - 3
   - 0
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -14,44 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -07:00
+date: 2010-12-31 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 4
-        - 0
-        version: 1.4.0
+        - 4
+        version: 1.4.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mail
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 2
-        - 5
-        version: 2.2.5
+        - 10
+        version: 2.2.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: uuidtools
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 1
@@ -63,58 +70,34 @@ dependencies:
   name: exifr
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 3
+        version: 1.0.3
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: hoe
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 2
+        - 8
         - 0
-        - 4
-        version: 2.0.4
+        version: 2.8.0
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 1
-        version: 0.4.1
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
-        version: 2.5.0
-  type: :development
-  version_requirements: *id007
 description: |-
   == DESCRIPTION
   
@@ -142,6 +125,8 @@ extra_rdoc_files:
 - README.txt
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - README.TMail.txt
@@ -249,6 +234,7 @@ files:
 - test/fixtures/sasktel-image-01.mail
 - test/fixtures/sprint-broken-image-01.mail
 - test/fixtures/sprint-image-01.mail
+- test/fixtures/sprint-new-image-01.mail
 - test/fixtures/sprint-pcs-text-01.mail
 - test/fixtures/sprint-purged-image-01.mail
 - test/fixtures/sprint-text-01.mail
@@ -331,60 +317,64 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: mms2r
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Extract user media from MMS (and not carrier cruft)
 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_orangemms_net.rb
+- test/test_waw_plspictures_com.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_mms_uscc_net.rb
-- test/test_bellsouth_net.rb
 - test/test_unicel_com.rb
-- test/test_waw_plspictures_com.rb
+- test/test_messaging_sprintpcs_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_mms_uscc_net.rb
+- test/test_mms_netcom_no.rb
+- test/test_1nbox_net.rb
+- test/test_sms_sasktel_com.rb
+- test/test_mms_att_net.rb
+- test/test_mobile_indosat_net_id.rb
 - test/test_messaging_nextel_com.rb
+- test/test_mms_mtn_co_za.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
+- test/test_helper.rb
+- test/test_msg_telus_com.rb
+- test/test_mms_o2online_de.rb
+- test/test_mms2r_media.rb
+- test/test_bell_canada.rb
+- test/test_tmomail_net.rb
+- test/test_mms_3ireland_ie.rb
+- test/test_pm_sprint_com.rb
+- test/test_mms_alltel_com.rb
+- test/test_github.rb
+- test/test_mms_mobileiam_ma.rb
+- test/test_mms_mycricket_com.rb
+- test/test_bellsouth_net.rb
+- test/test_mms_three_co_uk.rb
+- test/test_vmpix_com.rb
+- test/test_mms_myhelio_com.rb
+- test/test_mms_ae.rb