<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>.gitignore</filename>
    </added>
    <added>
      <filename>conf/msg.telus.com.yml</filename>
    </added>
    <added>
      <filename>conf/txt.bell.ca.yml</filename>
    </added>
    <added>
      <filename>conf/unicel.com.yml</filename>
    </added>
    <added>
      <filename>dev_tools/github.rb</filename>
    </added>
    <added>
      <filename>test/fixtures/iconv-fr-text-01.mail</filename>
    </added>
    <added>
      <filename>test/fixtures/info2go-image-01.mail</filename>
    </added>
    <added>
      <filename>test/fixtures/telus-image-01.mail</filename>
    </added>
    <added>
      <filename>test/fixtures/unicel-image-01.mail</filename>
    </added>
    <added>
      <filename>test/test_github.rb</filename>
    </added>
    <added>
      <filename>test/test_msg_telus_com.rb</filename>
    </added>
    <added>
      <filename>test/test_unicel_com.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,9 +1,14 @@
-### 2.1.1 / 2008-XX-XX (Lavona Succuboso, Nathan Explosion uber-groupie)
-
-* 3 minor enhancments
-  * Bell Canada support txt.bell.ca - Matt Conway - http://github.com/wr0ngway
-  * TODO - Unicel support - Michael DelGaudio
-  * TODO - msg.telus.com - TELUS Corporation
+### 2.1.1 / 2008-09-24 (Lavona Succuboso, Nathan Explosion uber-groupie)
+
+* 4 minor enhancments
+  * Bell Canada support txt.bell.ca - Matt Conway / Snap My Life - 
+    http://github.com/wr0ngway, http://github.com/sml
+  * Unicel support unicel.com - Michael DelGaudio
+  * info2go.com support / Unicel
+  * TELUS Corporation support mms.telusmobility.com, msg.telus.com
+  * add test to check that gem builds correctly as a github gem
+* 1 bug fix
+  * Iconv utf8 fix - Kai Kai
 
 ### 2.1.0 / 2008-07-30 (Dr. Gibbons &#8211; Birthday expert and Murderface expert)
 
@@ -11,7 +16,7 @@
   * opens up TMail for improved query method patterned code in MMS2R
 * 2 minor enhancements:
   * UK O2 support mediamessaging.o2.co.uk - Jeremy Wilkins
-  * Write non text files with binary bit set on Windows - Nobody
+  * Write non text files with binary bit set on Windows - David Alm
   * source hosted on github: git clone git://github.com/monde/mms2r.git
 
 ### 2.0.5 / 2008-07-17 (Dr. Ralphus Galkensmelter - Psychological death expert)</diff>
      <filename>History.txt</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,4 @@
+.gitignore
 History.txt
 Manifest.txt
 README.txt
@@ -22,20 +23,25 @@ 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/vzwpix.com.yml
 conf/waw.plspictures.com.yml
 dev_tools/anonymizer.rb
 dev_tools/debug_sprint_hpricot_parsing.rb
+dev_tools/github.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
@@ -53,14 +59,17 @@ 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/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/luxgsm-image-01.mail
 test/fixtures/maroctelecom-france-mms-01.mail
 test/fixtures/mediamessaging_o2_co_uk-image-01.mail
@@ -92,11 +101,13 @@ 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/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
@@ -110,7 +121,9 @@ test/fixtures/vodacom4me-southafrica-mms-04.mail
 test/fixtures/vtext-text-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
@@ -130,12 +143,14 @@ 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_vzwpix_com.rb
 test/test_waw_plspictures_com.rb
 vendor/plugins/mms2r/lib/autotest/discover.rb</diff>
      <filename>Manifest.txt</filename>
    </modified>
    <modified>
      <diff>@@ -3,6 +3,7 @@
   by Mike Mondragon
   http://mms2r.rubyforge.org/ 
   http://rubyforge.org/tracker/?group_id=3065 
+  http://github.com/monde/mms2r/tree/master
 
 == DESCRIPTION
   
@@ -46,8 +47,9 @@ Corpus of carriers currently processed by MMS2R:
 * SaskTel: sms.sasktel.com
 * Sprint: pm.sprint.com, messaging.sprintpcs.com
 * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk
-* TELUS Corporation (Canada): msg.telus.com
-* Unicel: ???
+* TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com
+* Unicel: unicel.com, info2go.com 
+  (note: mobile number is tucked away in a text/plain part for unicel.com)
 * Vodacom: mms.vodacom4me.co.za
 * Verizon: vzwpix.com, vtext.com
 
@@ -128,8 +130,13 @@ http://peepcode.com/products/mms2r-pdf
 
 == INSTALL
 
+conventional
 * sudo gem install mms2r
 
+github
+* gem sources -a http://gems.github.com
+* sudo gem install monde-mms2r
+
 == SOURCE
 
 git clone git://github.com/monde/mms2r.git
@@ -158,8 +165,11 @@ MMS2R's Flickr page[http://www.flickr.com/photos/8627919@N05/]
 * Dave Myron (company[http://contentfree.com/])
 * Vijay Yellapragada
 * Jesse Dp
-* &quot;Nobody&quot;
+* David Alm
 * Jeremy Wilkins
+* Matt Conway
+* Kai Kai
+* Michael DelGaudio
 
 == LICENSE
 </diff>
      <filename>README.txt</filename>
    </modified>
    <modified>
      <diff>@@ -8,3 +8,5 @@ orange.fr: orangemms.net
 mmsemail.orange.pl: orangemms.net
 message.alltel.com: mms.alltel.com
 mmsreply.t-mobile.co.uk: tmomail.net
+info2go.com: unicel.com
+mms.telusmobility.com: msg.telus.com</diff>
      <filename>conf/aliases.yml</filename>
    </modified>
    <modified>
      <diff>@@ -9,5 +9,5 @@ transform:
   text/plain: 
   - - /^Orange UK MMS$/i
     - &quot;&quot;
-  - - /^Wiadomo&#347;&#263; multimedialna.\s*$/i
+  - - /^Wiadomo\303\205\302\233\303\204\302\207 multimedialna\.$/i
     - &quot;&quot;</diff>
      <filename>conf/orangemms.net.yml</filename>
    </modified>
    <modified>
      <diff>@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '2.1.0'
+    VERSION = '2.1.1'
 
   end
 </diff>
      <filename>lib/mms2r.rb</filename>
    </modified>
    <modified>
      <diff>@@ -396,12 +396,12 @@ module MMS2R
     # See the transform section in the discussion of the built-in 
     # configuration.
 
-    def transform_text(type, text)
+    def transform_text(type, text, original_nencoding = 'ISO-8859-1')
       return type, text unless transforms = config['transform'][type] rescue nil
 
       #convert to UTF-8
       begin
-        c = Iconv.new('ISO-8859-1', 'UTF-8' )
+        c = Iconv.new('UTF-8', original_nencoding )
         utf_t = c.iconv(text)
       rescue Exception =&gt; e
         utf_t = text</diff>
      <filename>lib/mms2r/media.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{mms2r}
-  s.version = &quot;2.1.0&quot;
+  s.version = &quot;2.1.1&quot;
 
   s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
   s.authors = [&quot;Mike Mondragon&quot;]
-  s.date = %q{2008-07-30}
-  s.description = %q{== DESCRIPTION  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the mobile carriers.  MMS messages are  multipart email and the carriers often inject branding into these messages.  Use MMS2R if you want to get at the real user generated content from a MMS without having to deal with the cruft from the carriers.  If MMS2R is not aware of a particular carrier no extra processing is done to the  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&amp;T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,  cingularme.com * 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 &amp; Regional Oranges: orangemms.net, mmsemail.orange.pl, orange.fr * PXT New Zealand: pxt.vodafone.net.nz * Rogers of Canada: rci.rogers.com * SaskTel: sms.sasktel.com * Sprint: pm.sprint.com, messaging.sprintpcs.com * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk * Vodacom: mms.vodacom4me.co.za * Verizon: vzwpix.com, vtext.com * PLSPICTURES.COM mms hosting: waw.plspictures.com}
+  s.date = %q{2008-09-24}
+  s.description = %q{== DESCRIPTION  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the mobile carriers.  MMS messages are  multipart email and the carriers often inject branding into these messages.  Use MMS2R if you want to get at the real user generated content from a MMS without having to deal with the cruft from the carriers.  If MMS2R is not aware of a particular carrier no extra processing is done to the  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&amp;T/Cingular/Legacy: mms.att.net, txt.att.net, mmode.com, mms.mycingular.com,  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 &amp; 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 * T-Mobile: tmomail.net, mmsreply.t-mobile.co.uk * TELUS Corporation (Canada): mms.telusmobility.com, msg.telus.com * Unicel: unicel.com, info2go.com  (note: mobile number is tucked away in a text/plain part for unicel.com) * Vodacom: mms.vodacom4me.co.za * Verizon: vzwpix.com, vtext.com}
   s.email = %q{mikemondragon@gmail.com}
   s.extra_rdoc_files = [&quot;History.txt&quot;, &quot;Manifest.txt&quot;, &quot;README.txt&quot;]
-  s.files = [&quot;History.txt&quot;, &quot;Manifest.txt&quot;, &quot;README.txt&quot;, &quot;Rakefile&quot;, &quot;conf/1nbox.net.yml&quot;, &quot;conf/aliases.yml&quot;, &quot;conf/bellsouth.net.yml&quot;, &quot;conf/mediamessaging.o2.co.uk.yml&quot;, &quot;conf/messaging.nextel.com.yml&quot;, &quot;conf/mms.3ireland.ie.yml&quot;, &quot;conf/mms.alltel.com.yml&quot;, &quot;conf/mms.att.net.yml&quot;, &quot;conf/mms.dobson.net.yml&quot;, &quot;conf/mms.luxgsm.lu.yml&quot;, &quot;conf/mms.mobileiam.ma.yml&quot;, &quot;conf/mms.mtn.co.za.yml&quot;, &quot;conf/mms.mycricket.com.yml&quot;, &quot;conf/mms.myhelio.com.yml&quot;, &quot;conf/mms.netcom.no.yml&quot;, &quot;conf/mms.o2online.de.yml&quot;, &quot;conf/mms.three.co.uk.yml&quot;, &quot;conf/mms.vodacom4me.co.za.yml&quot;, &quot;conf/mms2r_media.yml&quot;, &quot;conf/mobile.indosat.net.id.yml&quot;, &quot;conf/orangemms.net.yml&quot;, &quot;conf/pm.sprint.com.yml&quot;, &quot;conf/pxt.vodafone.net.nz.yml&quot;, &quot;conf/rci.rogers.com.yml&quot;, &quot;conf/sms.sasktel.com.yml&quot;, &quot;conf/tmomail.net.yml&quot;, &quot;conf/vzwpix.com.yml&quot;, &quot;conf/waw.plspictures.com.yml&quot;, &quot;dev_tools/anonymizer.rb&quot;, &quot;dev_tools/debug_sprint_hpricot_parsing.rb&quot;, &quot;lib/mms2r.rb&quot;, &quot;lib/mms2r/media.rb&quot;, &quot;lib/mms2r/media/sprint.rb&quot;, &quot;lib/tmail_ext.rb&quot;, &quot;test/fixtures/1nbox-2images-01.mail&quot;, &quot;test/fixtures/1nbox-2images-02.mail&quot;, &quot;test/fixtures/1nbox-2images-03.mail&quot;, &quot;test/fixtures/1nbox-2images-04.mail&quot;, &quot;test/fixtures/3ireland-mms-01.mail&quot;, &quot;test/fixtures/alltel-image-01.mail&quot;, &quot;test/fixtures/alltel-mms-01.mail&quot;, &quot;test/fixtures/alltel-mms-03.mail&quot;, &quot;test/fixtures/apple-double-image-01.mail&quot;, &quot;test/fixtures/att-blackberry-02.mail&quot;, &quot;test/fixtures/att-blackberry.mail&quot;, &quot;test/fixtures/att-image-01.mail&quot;, &quot;test/fixtures/att-image-02.mail&quot;, &quot;test/fixtures/att-iphone-01.mail&quot;, &quot;test/fixtures/att-iphone-02.mail&quot;, &quot;test/fixtures/att-iphone-03.mail&quot;, &quot;test/fixtures/att-text-01.mail&quot;, &quot;test/fixtures/cingularme-text-01.mail&quot;, &quot;test/fixtures/cingularme-text-02.mail&quot;, &quot;test/fixtures/dobson-image-01.mail&quot;, &quot;test/fixtures/dot.jpg&quot;, &quot;test/fixtures/helio-image-01.mail&quot;, &quot;test/fixtures/helio-message-01.mail&quot;, &quot;test/fixtures/indosat-image-01.mail&quot;, &quot;test/fixtures/indosat-image-02.mail&quot;, &quot;test/fixtures/luxgsm-image-01.mail&quot;, &quot;test/fixtures/maroctelecom-france-mms-01.mail&quot;, &quot;test/fixtures/mediamessaging_o2_co_uk-image-01.mail&quot;, &quot;test/fixtures/mmode-image-01.mail&quot;, &quot;test/fixtures/mms.mycricket.com-pic-and-text.mail&quot;, &quot;test/fixtures/mms.mycricket.com-pic.mail&quot;, &quot;test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail&quot;, &quot;test/fixtures/mtn-southafrica-mms.mail&quot;, &quot;test/fixtures/mycingular-image-01.mail&quot;, &quot;test/fixtures/netcom-image-01.mail&quot;, &quot;test/fixtures/nextel-image-01.mail&quot;, &quot;test/fixtures/nextel-image-02.mail&quot;, &quot;test/fixtures/nextel-image-03.mail&quot;, &quot;test/fixtures/nextel-image-04.mail&quot;, &quot;test/fixtures/o2-de-image-01.mail&quot;, &quot;test/fixtures/orange-uk-image-01.mail&quot;, &quot;test/fixtures/orangefrance-text-and-image.mail&quot;, &quot;test/fixtures/orangepoland-text-01.mail&quot;, &quot;test/fixtures/orangepoland-text-02.mail&quot;, &quot;test/fixtures/pxt-image-01.mail&quot;, &quot;test/fixtures/rogers-canada-mms-01.mail&quot;, &quot;test/fixtures/sasktel-image-01.mail&quot;, &quot;test/fixtures/sprint-broken-image-01.mail&quot;, &quot;test/fixtures/sprint-image-01.mail&quot;, &quot;test/fixtures/sprint-pcs-text-01.mail&quot;, &quot;test/fixtures/sprint-purged-image-01.mail&quot;, &quot;test/fixtures/sprint-text-01.mail&quot;, &quot;test/fixtures/sprint-two-images-01.mail&quot;, &quot;test/fixtures/sprint-video-01.mail&quot;, &quot;test/fixtures/sprint.mov&quot;, &quot;test/fixtures/suncom-blackberry.mail&quot;, &quot;test/fixtures/three-uk-image-01.mail&quot;, &quot;test/fixtures/tmobile-blackberry-02.mail&quot;, &quot;test/fixtures/tmobile-blackberry.mail&quot;, &quot;test/fixtures/tmobile-image-01.mail&quot;, &quot;test/fixtures/tmobile-image-02.mail&quot;, &quot;test/fixtures/verizon-blackberry.mail&quot;, &quot;test/fixtures/verizon-image-01.mail&quot;, &quot;test/fixtures/verizon-image-02.mail&quot;, &quot;test/fixtures/verizon-image-03.mail&quot;, &quot;test/fixtures/verizon-text-01.mail&quot;, &quot;test/fixtures/verizon-video-01.mail&quot;, &quot;test/fixtures/vodacom4me-co-za-01.mail&quot;, &quot;test/fixtures/vodacom4me-co-za-02.mail&quot;, &quot;test/fixtures/vodacom4me-southafrica-mms-01.mail&quot;, &quot;test/fixtures/vodacom4me-southafrica-mms-04.mail&quot;, &quot;test/fixtures/vtext-text-01.mail&quot;, &quot;test/fixtures/waw.plspictures.com-image-01.mail&quot;, &quot;test/test_1nbox_net.rb&quot;, &quot;test/test_bellsouth_net.rb&quot;, &quot;test/test_helper.rb&quot;, &quot;test/test_mediamessaging_o2_co_uk.rb&quot;, &quot;test/test_messaging_nextel_com.rb&quot;, &quot;test/test_messaging_sprintpcs_com.rb&quot;, &quot;test/test_mms2r_media.rb&quot;, &quot;test/test_mms_3ireland_ie.rb&quot;, &quot;test/test_mms_alltel_com.rb&quot;, &quot;test/test_mms_att_net.rb&quot;, &quot;test/test_mms_dobson_net.rb&quot;, &quot;test/test_mms_luxgsm_lu.rb&quot;, &quot;test/test_mms_mobileiam_ma.rb&quot;, &quot;test/test_mms_mtn_co_za.rb&quot;, &quot;test/test_mms_mycricket_com.rb&quot;, &quot;test/test_mms_myhelio_com.rb&quot;, &quot;test/test_mms_netcom_no.rb&quot;, &quot;test/test_mms_o2online_de.rb&quot;, &quot;test/test_mms_three_co_uk.rb&quot;, &quot;test/test_mms_vodacom4me_co_za.rb&quot;, &quot;test/test_mobile_indosat_net_id.rb&quot;, &quot;test/test_orangemms_net.rb&quot;, &quot;test/test_pm_sprint_com.rb&quot;, &quot;test/test_pxt_vodafone_net_nz.rb&quot;, &quot;test/test_rci_rogers_com.rb&quot;, &quot;test/test_sms_sasktel_com.rb&quot;, &quot;test/test_tmomail_net.rb&quot;, &quot;test/test_vzwpix_com.rb&quot;, &quot;test/test_waw_plspictures_com.rb&quot;, &quot;vendor/plugins/mms2r/lib/autotest/discover.rb&quot;, &quot;vendor/plugins/mms2r/lib/autotest/mms2r.rb&quot;]
+  s.files = [&quot;.gitignore&quot;, &quot;History.txt&quot;, &quot;Manifest.txt&quot;, &quot;README.txt&quot;, &quot;Rakefile&quot;, &quot;conf/1nbox.net.yml&quot;, &quot;conf/aliases.yml&quot;, &quot;conf/bellsouth.net.yml&quot;, &quot;conf/mediamessaging.o2.co.uk.yml&quot;, &quot;conf/messaging.nextel.com.yml&quot;, &quot;conf/mms.3ireland.ie.yml&quot;, &quot;conf/mms.alltel.com.yml&quot;, &quot;conf/mms.att.net.yml&quot;, &quot;conf/mms.dobson.net.yml&quot;, &quot;conf/mms.luxgsm.lu.yml&quot;, &quot;conf/mms.mobileiam.ma.yml&quot;, &quot;conf/mms.mtn.co.za.yml&quot;, &quot;conf/mms.mycricket.com.yml&quot;, &quot;conf/mms.myhelio.com.yml&quot;, &quot;conf/mms.netcom.no.yml&quot;, &quot;conf/mms.o2online.de.yml&quot;, &quot;conf/mms.three.co.uk.yml&quot;, &quot;conf/mms.vodacom4me.co.za.yml&quot;, &quot;conf/mms2r_media.yml&quot;, &quot;conf/mobile.indosat.net.id.yml&quot;, &quot;conf/msg.telus.com.yml&quot;, &quot;conf/orangemms.net.yml&quot;, &quot;conf/pm.sprint.com.yml&quot;, &quot;conf/pxt.vodafone.net.nz.yml&quot;, &quot;conf/rci.rogers.com.yml&quot;, &quot;conf/sms.sasktel.com.yml&quot;, &quot;conf/tmomail.net.yml&quot;, &quot;conf/txt.bell.ca.yml&quot;, &quot;conf/unicel.com.yml&quot;, &quot;conf/vzwpix.com.yml&quot;, &quot;conf/waw.plspictures.com.yml&quot;, &quot;dev_tools/anonymizer.rb&quot;, &quot;dev_tools/debug_sprint_hpricot_parsing.rb&quot;, &quot;dev_tools/github.rb&quot;, &quot;lib/mms2r.rb&quot;, &quot;lib/mms2r/media.rb&quot;, &quot;lib/mms2r/media/sprint.rb&quot;, &quot;lib/tmail_ext.rb&quot;, &quot;mms2r.gemspec&quot;, &quot;test/fixtures/1nbox-2images-01.mail&quot;, &quot;test/fixtures/1nbox-2images-02.mail&quot;, &quot;test/fixtures/1nbox-2images-03.mail&quot;, &quot;test/fixtures/1nbox-2images-04.mail&quot;, &quot;test/fixtures/3ireland-mms-01.mail&quot;, &quot;test/fixtures/alltel-image-01.mail&quot;, &quot;test/fixtures/alltel-mms-01.mail&quot;, &quot;test/fixtures/alltel-mms-03.mail&quot;, &quot;test/fixtures/apple-double-image-01.mail&quot;, &quot;test/fixtures/att-blackberry-02.mail&quot;, &quot;test/fixtures/att-blackberry.mail&quot;, &quot;test/fixtures/att-image-01.mail&quot;, &quot;test/fixtures/att-image-02.mail&quot;, &quot;test/fixtures/att-iphone-01.mail&quot;, &quot;test/fixtures/att-iphone-02.mail&quot;, &quot;test/fixtures/att-iphone-03.mail&quot;, &quot;test/fixtures/att-text-01.mail&quot;, &quot;test/fixtures/bell-canada-image-01.mail&quot;, &quot;test/fixtures/cingularme-text-01.mail&quot;, &quot;test/fixtures/cingularme-text-02.mail&quot;, &quot;test/fixtures/dobson-image-01.mail&quot;, &quot;test/fixtures/dot.jpg&quot;, &quot;test/fixtures/helio-image-01.mail&quot;, &quot;test/fixtures/helio-message-01.mail&quot;, &quot;test/fixtures/iconv-fr-text-01.mail&quot;, &quot;test/fixtures/indosat-image-01.mail&quot;, &quot;test/fixtures/indosat-image-02.mail&quot;, &quot;test/fixtures/info2go-image-01.mail&quot;, &quot;test/fixtures/luxgsm-image-01.mail&quot;, &quot;test/fixtures/maroctelecom-france-mms-01.mail&quot;, &quot;test/fixtures/mediamessaging_o2_co_uk-image-01.mail&quot;, &quot;test/fixtures/mmode-image-01.mail&quot;, &quot;test/fixtures/mms.mycricket.com-pic-and-text.mail&quot;, &quot;test/fixtures/mms.mycricket.com-pic.mail&quot;, &quot;test/fixtures/mmsreply.t-mobile.co.uk-text-image-01.mail&quot;, &quot;test/fixtures/mtn-southafrica-mms.mail&quot;, &quot;test/fixtures/mycingular-image-01.mail&quot;, &quot;test/fixtures/netcom-image-01.mail&quot;, &quot;test/fixtures/nextel-image-01.mail&quot;, &quot;test/fixtures/nextel-image-02.mail&quot;, &quot;test/fixtures/nextel-image-03.mail&quot;, &quot;test/fixtures/nextel-image-04.mail&quot;, &quot;test/fixtures/o2-de-image-01.mail&quot;, &quot;test/fixtures/orange-uk-image-01.mail&quot;, &quot;test/fixtures/orangefrance-text-and-image.mail&quot;, &quot;test/fixtures/orangepoland-text-01.mail&quot;, &quot;test/fixtures/orangepoland-text-02.mail&quot;, &quot;test/fixtures/pxt-image-01.mail&quot;, &quot;test/fixtures/rogers-canada-mms-01.mail&quot;, &quot;test/fixtures/sasktel-image-01.mail&quot;, &quot;test/fixtures/sprint-broken-image-01.mail&quot;, &quot;test/fixtures/sprint-image-01.mail&quot;, &quot;test/fixtures/sprint-pcs-text-01.mail&quot;, &quot;test/fixtures/sprint-purged-image-01.mail&quot;, &quot;test/fixtures/sprint-text-01.mail&quot;, &quot;test/fixtures/sprint-two-images-01.mail&quot;, &quot;test/fixtures/sprint-video-01.mail&quot;, &quot;test/fixtures/sprint.mov&quot;, &quot;test/fixtures/suncom-blackberry.mail&quot;, &quot;test/fixtures/telus-image-01.mail&quot;, &quot;test/fixtures/three-uk-image-01.mail&quot;, &quot;test/fixtures/tmobile-blackberry-02.mail&quot;, &quot;test/fixtures/tmobile-blackberry.mail&quot;, &quot;test/fixtures/tmobile-image-01.mail&quot;, &quot;test/fixtures/tmobile-image-02.mail&quot;, &quot;test/fixtures/unicel-image-01.mail&quot;, &quot;test/fixtures/verizon-blackberry.mail&quot;, &quot;test/fixtures/verizon-image-01.mail&quot;, &quot;test/fixtures/verizon-image-02.mail&quot;, &quot;test/fixtures/verizon-image-03.mail&quot;, &quot;test/fixtures/verizon-text-01.mail&quot;, &quot;test/fixtures/verizon-video-01.mail&quot;, &quot;test/fixtures/vodacom4me-co-za-01.mail&quot;, &quot;test/fixtures/vodacom4me-co-za-02.mail&quot;, &quot;test/fixtures/vodacom4me-southafrica-mms-01.mail&quot;, &quot;test/fixtures/vodacom4me-southafrica-mms-04.mail&quot;, &quot;test/fixtures/vtext-text-01.mail&quot;, &quot;test/fixtures/waw.plspictures.com-image-01.mail&quot;, &quot;test/test_1nbox_net.rb&quot;, &quot;test/test_bell_canada.rb&quot;, &quot;test/test_bellsouth_net.rb&quot;, &quot;test/test_github.rb&quot;, &quot;test/test_helper.rb&quot;, &quot;test/test_mediamessaging_o2_co_uk.rb&quot;, &quot;test/test_messaging_nextel_com.rb&quot;, &quot;test/test_messaging_sprintpcs_com.rb&quot;, &quot;test/test_mms2r_media.rb&quot;, &quot;test/test_mms_3ireland_ie.rb&quot;, &quot;test/test_mms_alltel_com.rb&quot;, &quot;test/test_mms_att_net.rb&quot;, &quot;test/test_mms_dobson_net.rb&quot;, &quot;test/test_mms_luxgsm_lu.rb&quot;, &quot;test/test_mms_mobileiam_ma.rb&quot;, &quot;test/test_mms_mtn_co_za.rb&quot;, &quot;test/test_mms_mycricket_com.rb&quot;, &quot;test/test_mms_myhelio_com.rb&quot;, &quot;test/test_mms_netcom_no.rb&quot;, &quot;test/test_mms_o2online_de.rb&quot;, &quot;test/test_mms_three_co_uk.rb&quot;, &quot;test/test_mms_vodacom4me_co_za.rb&quot;, &quot;test/test_mobile_indosat_net_id.rb&quot;, &quot;test/test_msg_telus_com.rb&quot;, &quot;test/test_orangemms_net.rb&quot;, &quot;test/test_pm_sprint_com.rb&quot;, &quot;test/test_pxt_vodafone_net_nz.rb&quot;, &quot;test/test_rci_rogers_com.rb&quot;, &quot;test/test_sms_sasktel_com.rb&quot;, &quot;test/test_tmomail_net.rb&quot;, &quot;test/test_unicel_com.rb&quot;, &quot;test/test_vzwpix_com.rb&quot;, &quot;test/test_waw_plspictures_com.rb&quot;, &quot;vendor/plugins/mms2r/lib/autotest/discover.rb&quot;, &quot;vendor/plugins/mms2r/lib/autotest/mms2r.rb&quot;]
   s.has_rdoc = true
   s.homepage = %q{by Mike Mondragon
 }
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{mms2r}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{Extract user media from MMS (and not carrier cruft)}
-  s.test_files = [&quot;test/test_sms_sasktel_com.rb&quot;, &quot;test/test_pxt_vodafone_net_nz.rb&quot;, &quot;test/test_mms_mycricket_com.rb&quot;, &quot;test/test_mobile_indosat_net_id.rb&quot;, &quot;test/test_pm_sprint_com.rb&quot;, &quot;test/test_messaging_sprintpcs_com.rb&quot;, &quot;test/test_vzwpix_com.rb&quot;, &quot;test/test_mms_alltel_com.rb&quot;, &quot;test/test_mms2r_media.rb&quot;, &quot;test/test_waw_plspictures_com.rb&quot;, &quot;test/test_mms_3ireland_ie.rb&quot;, &quot;test/test_bellsouth_net.rb&quot;, &quot;test/test_mms_o2online_de.rb&quot;, &quot;test/test_mms_att_net.rb&quot;, &quot;test/test_mms_netcom_no.rb&quot;, &quot;test/test_rci_rogers_com.rb&quot;, &quot;test/test_mms_mtn_co_za.rb&quot;, &quot;test/test_tmomail_net.rb&quot;, &quot;test/test_mms_myhelio_com.rb&quot;, &quot;test/test_mms_three_co_uk.rb&quot;, &quot;test/test_mms_dobson_net.rb&quot;, &quot;test/test_mms_luxgsm_lu.rb&quot;, &quot;test/test_orangemms_net.rb&quot;, &quot;test/test_helper.rb&quot;, &quot;test/test_mms_mobileiam_ma.rb&quot;, &quot;test/test_messaging_nextel_com.rb&quot;, &quot;test/test_mediamessaging_o2_co_uk.rb&quot;, &quot;test/test_1nbox_net.rb&quot;, &quot;test/test_mms_vodacom4me_co_za.rb&quot;]
+  s.test_files = [&quot;test/test_sms_sasktel_com.rb&quot;, &quot;test/test_pxt_vodafone_net_nz.rb&quot;, &quot;test/test_mms_mycricket_com.rb&quot;, &quot;test/test_mobile_indosat_net_id.rb&quot;, &quot;test/test_unicel_com.rb&quot;, &quot;test/test_pm_sprint_com.rb&quot;, &quot;test/test_messaging_sprintpcs_com.rb&quot;, &quot;test/test_vzwpix_com.rb&quot;, &quot;test/test_mms_alltel_com.rb&quot;, &quot;test/test_mms2r_media.rb&quot;, &quot;test/test_waw_plspictures_com.rb&quot;, &quot;test/test_mms_3ireland_ie.rb&quot;, &quot;test/test_msg_telus_com.rb&quot;, &quot;test/test_bellsouth_net.rb&quot;, &quot;test/test_mms_o2online_de.rb&quot;, &quot;test/test_mms_att_net.rb&quot;, &quot;test/test_mms_netcom_no.rb&quot;, &quot;test/test_rci_rogers_com.rb&quot;, &quot;test/test_mms_mtn_co_za.rb&quot;, &quot;test/test_tmomail_net.rb&quot;, &quot;test/test_mms_myhelio_com.rb&quot;, &quot;test/test_mms_three_co_uk.rb&quot;, &quot;test/test_mms_dobson_net.rb&quot;, &quot;test/test_mms_luxgsm_lu.rb&quot;, &quot;test/test_bell_canada.rb&quot;, &quot;test/test_github.rb&quot;, &quot;test/test_orangemms_net.rb&quot;, &quot;test/test_helper.rb&quot;, &quot;test/test_mms_mobileiam_ma.rb&quot;, &quot;test/test_messaging_nextel_com.rb&quot;, &quot;test/test_mediamessaging_o2_co_uk.rb&quot;, &quot;test/test_1nbox_net.rb&quot;, &quot;test/test_mms_vodacom4me_co_za.rb&quot;]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION</diff>
      <filename>mms2r.gemspec</filename>
    </modified>
    <modified>
      <diff>@@ -22,7 +22,23 @@ class TestBellCanada &lt; Test::Unit::TestCase
     assert_equal 1, mms.media['text/html'].size
     assert_equal 1, mms.media['text/plain'].size
 
+    # make sure transform strips out massive dtd at start of doc
+    assert_equal 3331, File.size(mms.media['text/html'].first)
+    
     mms.purge
   end
 
+
+  def test_default_media_should_return_user_generated_content
+    mail = TMail::Mail.parse(load_mail('bell-canada-image-01.mail').join)
+    mms = MMS2R::Media.new(mail)
+    file = mms.default_media
+    
+    # make sure the users jpg is the one that we default to
+    assert_equal 31962, file.size
+    assert_equal '.jpg', File.extname(file.path)
+    
+    mms.purge
+  end 
+
 end</diff>
      <filename>test/test_bell_canada.rb</filename>
    </modified>
    <modified>
      <diff>@@ -13,7 +13,11 @@ module MMS2R
     end
   
     def load_mail(file)
-      IO.readlines(&quot;#{File.dirname(__FILE__)}/fixtures/#{file}&quot;)
+      IO.readlines(mail_fixture(file))
+    end
+
+    def mail_fixture(file)
+      &quot;#{File.dirname(__FILE__)}/fixtures/#{file}&quot;
     end
   end
 end</diff>
      <filename>test/test_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -245,6 +245,24 @@ class TestMms2rMedia &lt; Test::Unit::TestCase
     assert_equal result, mms.transform_text(type, text)
   end
 
+  def test_transform_text_to_utf8
+    mail = TMail::Mail.load(mail_fixture('iconv-fr-text-01.mail'))
+    mms = MMS2R::Media.new(mail)
+
+    assert_equal 2, mms.media.size
+    assert_equal 1, mms.media['text/plain'].size
+    assert_equal 1, mms.media['text/html'].size
+    file = mms.media['text/plain'][0]
+    assert_not_nil file
+    assert_equal true, File::exist?(file)
+    text = IO.readlines(&quot;#{file}&quot;).join
+    #assert_match(/D'ici un mois G&#233;orgie/, text)
+    assert_match(/D'ici un mois G\303\203\302\251orgie/, text)
+    assert_equal(&quot;sample email message Fwd: sub D'ici un mois G\303\203\302\251orgie&quot;, 
+                 mms.subject)
+    mms.purge
+  end
+
   def test_subject
     s = 'hello world'
     mail = stub_mail()</diff>
      <filename>test/test_mms2r_media.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>3617a6ce8ccb4cc63ee0522d43adbf4d6156ee8b</id>
    </parent>
  </parents>
  <author>
    <name>mikemondragon</name>
    <email>mikemondragon@e135c355-f531-400e-8cb8-2d0dfcbb2ce7</email>
  </author>
  <url>http://github.com/monde/mms2r/commit/1780e94b5d624285dd710cdfb9c1488a4aac0c97</url>
  <id>1780e94b5d624285dd710cdfb9c1488a4aac0c97</id>
  <committed-date>2008-09-24T12:55:33-07:00</committed-date>
  <authored-date>2008-09-24T12:55:33-07:00</authored-date>
  <message>Merge branch 'github'

Conflicts:

	History.txt
	README.txt
	mms2r.gemspec
	test/test_bell_canada.rb


git-svn-id: svn+ssh://rubyforge.org/var/svn/mms2r/trunk@285 e135c355-f531-400e-8cb8-2d0dfcbb2ce7</message>
  <tree>9a0a5b9a3b0ad5bd30e20803242562376ddca0a0</tree>
  <committer>
    <name>mikemondragon</name>
    <email>mikemondragon@e135c355-f531-400e-8cb8-2d0dfcbb2ce7</email>
  </committer>
</commit>
