mms2r 3.3.1 → 3.4.0

data/Gemfile

@@ -2,18 +2,18 @@
 
 source :gemcutter
 
-gem "nokogiri", ">=1.4.4"
-gem "mail", ">=2.2.10"
-gem "uuidtools", ">=2.1.1"
-gem "exifr", ">=1.0.3"
+gem "nokogiri"
+gem "mail"
+gem "exifr"
 
-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'
+group :development, :test do
+  gem "rdoc"
+  gem "rubyforge"
+  gem "gemcutter"
+  gem "hoe"
+  gem "rcov"
+  gem "test-unit", "=1.2.3"
+  gem "mocha"
 end
 
 # vim: syntax=ruby

data/Gemfile.lock

@@ -1,42 +1,46 @@
 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)
+    exifr (1.1.1)
+    gemcutter (0.7.0)
+    hoe (2.12.3)
+      rake (~> 0.8)
+    i18n (0.6.0)
+    json (1.6.1)
+    json_pure (1.6.1)
+    mail (2.3.0)
       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)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    nokogiri (1.5.0)
+    polyglot (0.3.2)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       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)
+  exifr
+  gemcutter
+  hoe
+  mail
   mocha
-  nokogiri (>= 1.4.4)
-  rubyforge (>= 2.0.4)
+  nokogiri
+  rcov
+  rdoc
+  rubyforge
   test-unit (= 1.2.3)
-  uuidtools (>= 2.1.1)

data/History.txt

@@ -1,3 +1,10 @@
+### 3.4.0 / 2011-10-31 (Serveta Skwigelf, Skwisgaar's hot mom)
+
+* 2 major enhancements
+  * regexp's in yaml configs are store as a ruby regexp and not a string that
+    is evaled.
+  * character encoding capability with 1.8 rubies and 1.9 rubies.
+
 ### 3.3.1 / 2011-01-01 (Reverend Aslaug Wartooth (deceased), Toki's dad)
 
 * 2 minor enhancements

data/Manifest.txt

@@ -1,4 +1,3 @@
-.gitignore
 Gemfile
 Gemfile.lock
 History.txt
@@ -43,9 +42,9 @@ 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/ext/mail.rb
+lib/ext/object.rb
 lib/mms2r.rb
 lib/mms2r/media.rb
 lib/mms2r/media/sprint.rb
@@ -55,6 +54,7 @@ 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/ad_new.txt
 test/fixtures/alltel-image-01.mail
 test/fixtures/alltel-mms-01.mail
 test/fixtures/alltel-mms-03.mail
@@ -70,6 +70,7 @@ 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/dici_un_mois_georgie.txt
 test/fixtures/dobson-image-01.mail
 test/fixtures/dot.jpg
 test/fixtures/generic.mail
@@ -140,10 +141,10 @@ 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/hax.rb
 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

data/README.txt

@@ -1,13 +1,15 @@
 = mms2r
 
-  http://mms2r.rubyforge.org/
-  by Mike Mondragon
-  http://github.com/monde/mms2r
-  http://github.com/monde/mms2r/issues
-  http://peepcode.com/products/mms2r-pdf
+  https://github.com/monde/mms2r
 
 == DESCRIPTION
 
+MMS2R by Mike Mondragon
+http://mms2r.rubyforge.org/
+https://github.com/monde/mms2r
+https://github.com/monde/mms2r/issues
+http://peepcode.com/products/mms2r-pdf
+
 MMS2R is a library that decodes the parts of an MMS message to disk while
 stripping out advertising injected by the mobile carriers.  MMS messages are
 multipart email and the carriers often inject branding into these messages.  Use
@@ -79,6 +81,7 @@ Corpus of smart phones known to MMS2R:
 As Seen On The Internets - sites known to be using MMS2R in some fashion
 
 * twitpic.com [http://www.twitpic.com/]
+* Simplton [http://simplton.com/]
 * fanchatter.com [http://www.fanchatter.com/]
 * camura.com [http://www.camura.com/]
 * eachday.com [http://www.eachday.com/]

data/conf/1nbox.net.yml

@@ -1,13 +1,13 @@
 ---
 ignore:
   image/jpeg:
-  - /^.*idea_banner.jpg$/i
+  - !ruby/regexp /^.*idea_banner.jpg$/i
   text/html:
-  - /<title>Message from memova<\/title>/im
+  - !ruby/regexp /<title>Message from memova<\/title>/im
 
 transform:
 
 number:
   - from
-  - /^([^\/|^@]+).*/
-  - "\1"
+  - !ruby/regexp /^([^\/@]+).*/
+  - "\\1"

data/conf/aliases.yml

@@ -1,4 +1,4 @@
---- 
+---
 txt.att.net: mms.att.net
 cingularme.com: mms.att.net
 mmode.com: mms.att.net

data/conf/mediamessaging.o2.co.uk.yml

@@ -1,4 +1,4 @@
 ---
 ignore:
   text/plain:
-  - /This Media Message has been sent using an O2 camera phone/mi
+  - !ruby/regexp /This Media Message has been sent using an O2 camera phone/mi

data/conf/messaging.nextel.com.yml

@@ -1,10 +1,10 @@
 ---
 ignore:
-  text/plain: 
-  - /^This is an MMS message.  20\d\d Sprint Nextel. All rights reserved./
-  - /^This is an MMS message. Please go to http:\/\/mms.nextel.com\/mms\/anon\/do\/legacy\/viewDirect/
-  - /^This is a multi-part message in MIME format./
-  text/html: 
-   - /^<html><body>\s+<center>This is an MMS message. <br><center> 20\d\d Sprint Nextel. All rights reserved<\/center><br><img/m
-   - /^<html><body>\s+This is an MMS message. <br><center> 20\d\d Sprint Nextel. All rights reserved/m
-   - /^<html><body>\s+This is an MMS message. Please go to <a href="http:\/\/mms.nextel.com\/mms\/anon\/do\/legacy\/viewDirect/m
+  text/plain:
+  - !ruby/regexp /^This is an MMS message.  20\d\d Sprint Nextel. All rights reserved./
+  - !ruby/regexp /^This is an MMS message. Please go to http:\/\/mms.nextel.com\/mms\/anon\/do\/legacy\/viewDirect/
+  - !ruby/regexp /^This is a multi-part message in MIME format./
+  text/html:
+   - !ruby/regexp /^<html><body>\s+<center>This is an MMS message. <br><center> 20\d\d Sprint Nextel. All rights reserved<\/center><br><img/m
+   - !ruby/regexp /^<html><body>\s+This is an MMS message. <br><center> 20\d\d Sprint Nextel. All rights reserved/m
+   - !ruby/regexp /^<html><body>\s+This is an MMS message. Please go to <a href="http:\/\/mms.nextel.com\/mms\/anon\/do\/legacy\/viewDirect/m

data/conf/mms.3ireland.ie.yml

@@ -1,17 +1,17 @@
 ---
 ignore:
   image/jpeg:
-  - /^.*tpm.jpg$/i
-  - /^.*vf5.jpg$/i
-  - /^.*reb.jpg$/i
+  - !ruby/regexp /^.*tpm.jpg$/i
+  - !ruby/regexp /^.*vf5.jpg$/i
+  - !ruby/regexp /^.*reb.jpg$/i
   image/gif:
-  - /^.*vf9.gif$/i
+  - !ruby/regexp /^.*vf9.gif$/i
   text/plain:
-  - /^You have received an MMS message.  To see the message correctly, you will need to view this message.*/im
+  - !ruby/regexp /^You have received an MMS message.  To see the message correctly, you will need to view this message.*/im
   text/html:
-  - /Yospace Technologies Ltd - MMS-to-Email version 1-0-1-1/im
+  - !ruby/regexp /Yospace Technologies Ltd - MMS-to-Email version 1-0-1-1/im
 
 number:
   - from
-  - /^([^\s|^\/|^@]+).*/
-  - "\1"
+  - !ruby/regexp /^([^\s\/@]+).*/
+  - "\\1"

data/conf/mms.ae.yml

@@ -1,5 +1,5 @@
 ---
 ignore:
   application/smil:
-  - /^pres\.smil/i
+  - !ruby/regexp /^pres\.smil/i
 

data/conf/mms.alltel.com.yml

@@ -4,8 +4,8 @@ ignore:
   - mms
   text/html:
    - mms.smil.txt
-   - /<html>\s+<head>\s+<title>Picture Messaging<\/title>/m
-  image/gif: 
+   - !ruby/regexp /<html>\s+<head>\s+<title>Picture Messaging<\/title>/m
+  image/gif:
   - spacer.gif
   - header.gif
   - bluebar.gif

data/conf/mms.att.net.yml

@@ -1,11 +1,11 @@
 ---
-transform: 
-  text/plain: 
-  - - /^Multimedia message$/i
+transform:
+  text/plain:
+  - - !ruby/regexp /^Multimedia message$/i
     - ""
-  - - /\A(.+?)\s+--\s+=+\s+This mobile text message is brought to you by AT&T.*/im
-    - "\1"
-  - - /\A(.+?)\s+--\s+=+\s+Brought to you by, Cingular Wireless Messaging.*/im
-    - "\1"
-  - - /\A(.+?)\s+--\s+Mobile Email from a Cingular Wireless Customer.*/im
-    - "\1"
+  - - !ruby/regexp /\A(.+?)\s+--\s+=+\s+This mobile text message is brought to you by AT&T.*/im
+    - "\\1"
+  - - !ruby/regexp /\A(.+?)\s+--\s+=+\s+Brought to you by, Cingular Wireless Messaging.*/im
+    - "\\1"
+  - - !ruby/regexp /\A(.+?)\s+--\s+Mobile Email from a Cingular Wireless Customer.*/im
+    - "\\1"

data/conf/mms.dobson.net.yml

@@ -1,4 +1,4 @@
---- 
+---
 ignore:
-  application/smil: 
-   - /^<smil><head><layout><root-layout width=/i
+  application/smil:
+   - !ruby/regexp /^<smil><head><layout><root-layout width=/i

data/conf/mms.luxgsm.lu.yml

@@ -1,13 +1,13 @@
 ---
 ignore:
-  image/gif: 
-  - /^Vodafone Logo/i
-  text/html: 
-   - /You have received a picture message from phone number/im
-  text/plain: 
-   - /You have received a picture message from mobile phone number/im
+  image/gif:
+  - !ruby/regexp /^Vodafone Logo/i
+  text/html:
+   - !ruby/regexp /You have received a picture message from phone number/im
+  text/plain:
+   - !ruby/regexp /You have received a picture message from mobile phone number/im
 number:
   - from
-  - /^([^\s]+)\s.*/
-  - "\1"
+  - !ruby/regexp /^([^\s]+)\s.*/
+  - "\\1"
 

data/conf/mms.mobileiam.ma.yml

@@ -1,16 +1,16 @@
 ---
 ignore:
   image/jpeg:
-  - /^.*html_DEFAULT_SLIDE_header.JPG$/i
+  - !ruby/regexp /^.*html_DEFAULT_SLIDE_header.JPG$/i
   image/gif:
-  - /^.*footer.gif$/i
-  - /^.*reply.gif$/i
+  - !ruby/regexp /^.*footer.gif$/i
+  - !ruby/regexp /^.*reply.gif$/i
   text/html:
-  - /.*/
+  - !ruby/regexp /.*/
 
 transform:
 
 number:
   - from
-  - /^([^\/|^@]+).*/
-  - "\1"
+  - !ruby/regexp /^([^\/@]+).*/
+  - "\\1"

data/conf/mms.mtn.co.za.yml

@@ -1,13 +1,13 @@
 ---
 ignore:
   image/bmp:
-  - /^.*logo.bmp$/i
+  - !ruby/regexp /^.*logo.bmp$/i
   text/html:
-  - /.*/
+  - !ruby/regexp /.*/
 
 transform:
 
 number:
   - from
-  - /^([^\/|^@]+).*/
-  - "\1"
+  - !ruby/regexp /^([^\/@]+).*/
+  - "\\1"

data/conf/mms.myhelio.com.yml

@@ -1,12 +1,12 @@
 ---
 ignore:
-  image/gif: 
+  image/gif:
   - top.gif
   - bottom.gif
   - middle_img.gif
-  text/html: 
-   - /<html>\s+<head>\s+<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=iso-8859-1\">\s+<title>MMS Email<\/title>/im
-transform: 
-  text/plain: 
-  - - /Note:\s{1,2}.*?\s+message:\s{1,2}(.+)$/m
-    - "\1"
+  text/html:
+   - !ruby/regexp /<html>\s+<head>\s+<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=iso-8859-1\">\s+<title>MMS Email<\/title>/im
+transform:
+  text/plain:
+  - - !ruby/regexp /Note:\s{1,2}.*?\s+message:\s{1,2}(.+)$/m
+    - "\\1"

data/conf/mms.netcom.no.yml

@@ -1,4 +1,4 @@
 ---
 ignore:
-  text/plain: 
-   - /Meldingen er sendt fra mobiltelefon og kan kun besvares med mobiltelefon. Nummeret finner du i e-postadressen./im
+  text/plain:
+   - !ruby/regexp /Meldingen er sendt fra mobiltelefon og kan kun besvares med mobiltelefon. Nummeret finner du i e-postadressen./im

data/conf/mms.o2online.de.yml

@@ -1,8 +1,8 @@
 ---
 ignore:
-  text/html: 
-   - /Diese Nachricht wurde Ihnen von einem Handy mit der Nummer/im
-transform: 
-  text/plain: 
-  - - /.*bermittelt.\s+(.+)\s+Wenn Sie mehr.*/im
-    - "\1"
+  text/html:
+   - !ruby/regexp /Diese Nachricht wurde Ihnen von einem Handy mit der Nummer/im
+transform:
+  text/plain:
+  - - !ruby/regexp /.*bermittelt.\s+(.+)\s+Wenn Sie mehr.*/im
+    - "\\1"

data/conf/mms.three.co.uk.yml

@@ -1,15 +1,15 @@
 ---
-transform: 
-  text/plain: 
-  - - /^You have received a new message$/i
+transform:
+  text/plain:
+  - - !ruby/regexp /^You have received a new message$/i
     - ""
 ignore:
-  image/jpeg: 
+  image/jpeg:
   - images/reb.jpg
   - images/tpm.jpg
-  image/gif: 
+  image/gif:
   - images/vf9.gif
-  text/html: 
-   - /<html><head>.*<title>MMS Message<\/title>/im
-  text/plain: 
-   - /You have received an MMS message.  To see the message correctly, you will need to view this message\s+in a graphical email application./im
+  text/html:
+   - !ruby/regexp /<html><head>.*<title>MMS Message<\/title>/im
+  text/plain:
+   - !ruby/regexp /You have received an MMS message.  To see the message correctly, you will need to view this message\s+in a graphical email application./im