mms2r 1.1.6 → 1.1.7

data/History.txt

@@ -1,3 +1,10 @@
+== 1.1.7 / 2007-08-25 (Adam Nergal, friend of Skwisgaar, but not Pickles)
+
+* Added suport for Orange of Poland Orange mmsemail.orange.pl (Zbigniew
+  Sobiecki)
+* Cleaned up documentation modifiers
+* Cleaned out non-Ruby code idioms
+ 
 == 1.1.6 / 2007-08-11 (Mustakrakish, the Lake Troll part 2)
 
 * Redo of release mistake of 1.1.5

data/Manifest.txt

@@ -11,6 +11,7 @@ conf/mms2r_media_ignore.yml
 conf/mms2r_media_subject.yml
 conf/mms2r_my_cingular_media_subject.yml
 conf/mms2r_nextel_media_ignore.yml
+conf/mms2r_orange_poland_media_subject.yml
 conf/mms2r_sprint_media_ignore.yml
 conf/mms2r_sprint_media_subject.yml
 conf/mms2r_t_mobile_media_ignore.yml
@@ -26,6 +27,7 @@ lib/mms2r/m_mode_media.rb
 lib/mms2r/media.rb
 lib/mms2r/my_cingular_media.rb
 lib/mms2r/nextel_media.rb
+lib/mms2r/orange_poland_media.rb
 lib/mms2r/sprint_media.rb
 lib/mms2r/sprint_pcs_media.rb
 lib/mms2r/t_mobile_media.rb
@@ -72,6 +74,8 @@ 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/orangepoland-text-01.mail
+test/fixtures/orangepoland-text-02.mail
 test/fixtures/simple-with-two-images-two-texts.mail
 test/fixtures/simple_image.mail
 test/fixtures/simple_multipart_alternative.mail
@@ -98,6 +102,7 @@ test/test_mms2r_m_mode_media.rb
 test/test_mms2r_media.rb
 test/test_mms2r_my_cingular_media.rb
 test/test_mms2r_nextel_media.rb
+test/test_mms2r_orange_poland_media.rb
 test/test_mms2r_sprint_media.rb
 test/test_mms2r_sprint_pcs_media.rb
 test/test_mms2r_t_mobile_media.rb

data/README.txt

@@ -25,6 +25,7 @@ Corpus of carriers currently processed by MMS2R:
 * Dobson/Cellular One => mms.dobson.net
 * Helio => mms.myhelio.com
 * Nextel => messaging.nextel.com
+* Orange (Poland) => mmsemail.orange.pl
 * Sprint => pm.sprint.com
 * Sprint => messaging.sprintpcs.com
 * T-Mobile => tmomail.net
@@ -55,7 +56,7 @@ Corpus of carriers currently processed by MMS2R:
   # writes the user generated media to disk in a temporary subdirectory
   mms.process
 
-  puts "MMS has default carrier subject!" if mms.get_subject.eql?("")
+  puts "MMS has default carrier subject!" unless mms.get_subject
 
   # access the senders phone number
   puts "MMS was from phone #{mms.get_number}"

data/conf/mms2r_orange_poland_media_subject.yml

@@ -0,0 +1,3 @@
+---
+- !ruby/regexp /^Wiadomość multimedialna.\s*$/i
+

data/lib/mms2r.rb

@@ -13,6 +13,7 @@ require 'mms2r/helio_media'
 require 'mms2r/m_mode_media'
 require 'mms2r/my_cingular_media'
 require 'mms2r/nextel_media'
+require 'mms2r/orange_poland_media'
 require 'mms2r/sprint_media'
 require 'mms2r/sprint_pcs_media'
 require 'mms2r/t_mobile_media'
@@ -36,6 +37,7 @@ module MMS2R
     'mmode.com' => MMS2R::MModeMedia,
     'mms.mycingular.com' => MMS2R::MyCingularMedia,
     'messaging.nextel.com' => MMS2R::NextelMedia,
+    'mmsemail.orange.pl' => MMS2R::OrangePolandMedia,
     'pm.sprint.com' => MMS2R::SprintMedia,
     'messaging.sprintpcs.com' => MMS2R::SprintPcsMedia,
     'tmomail.net' => MMS2R::TMobileMedia,
@@ -61,7 +63,7 @@ module MMS2R
     ##
     # MMS2R Library version
 
-    VERSION = '1.1.6'
+    VERSION = '1.1.7'
 
     end
 

data/lib/mms2r/media.rb

@@ -92,6 +92,8 @@ module MMS2R
       @body = nil
       @default_media = nil
       @default_text = nil
+
+      #TODO: new should be 'create' refactor to this behavior
     end
 
     ##
@@ -116,7 +118,7 @@ module MMS2R
       return @subject if @subject # we've already done the work
 
       subject = @mail.subject
-      return @subject ||= nil if subject.nil? || subject.strip.length == 0
+      return @subject ||= nil if subject.nil? || subject.strip.empty?
 
       # subject is not already set, lets see what our defaults are
       a = Array.new
@@ -128,7 +130,7 @@ module MMS2R
       f = clz.yaml_file_name(clz, :subject)
       yf = File.join(self.class.conf_dir(), "#{f}")
       a = a + YAML::load_file(yf) if File::exist?(yf) 
-      return @subject ||= subject if a.size == 0
+      return @subject ||= subject if a.empty?
       return @subject ||= nil if a.detect{|r| r.match(subject.strip)}
       return @subject ||= subject
     end
@@ -195,7 +197,7 @@ module MMS2R
     # note: auto-purging is a feature of calling process() with a block, purge
     # must be explicitly called otherwise
 
-    def process()
+    def process() # :yields: media_type, file
       @logger.info("#{self.class} processing") unless @logger.nil?
 
       # build up all the parts
@@ -269,8 +271,8 @@ module MMS2R
       f = clz.yaml_file_name(clz, :ignore)
       yf = File.join(self.class.conf_dir(), "#{f}")
       if File::exist?(yf)
-        h2 = YAML::load_file(yf)
-        h2.each do |k,v|
+        ignores = YAML::load_file(yf)
+        ignores.each do |k,v|
           unless h[k]
             h[k] = v
           else
@@ -279,7 +281,7 @@ module MMS2R
         end
       end
       a ||= h[type]
-      return false if h.size == 0 || a.nil?
+      return false if h.empty? || a.nil?
 
       m = /^([^\/]+)\//.match(type)[1]
       # fire each regular expression, only break if there is a match
@@ -542,11 +544,11 @@ module MMS2R
           files.concat(media[k]) if /^#{t}\//.match(k)
         end
       end
-      return nil if files.size == 0
+      return nil if files.empty?
 
       #get the largest file
+      file = nil # explicitly declare the file and sile
       size = 0
-      file = nil # explicitly declare the file
 
       files.each do |f|
         # this will safely evaluate since we wouldn't be looking at
@@ -578,7 +580,7 @@ module MMS2R
         self
       end.send(:define_method, :content_type) { mime_type }
 
-      return file
+      file
     end
 
   end

data/lib/mms2r/orange_poland_media.rb

@@ -0,0 +1,10 @@
+module MMS2R
+
+  ##
+  # Orange-Poland version of MMS2R::Media
+  #
+  # Orange-Poland adds its own subject if it's empty.
+
+  class MMS2R::OrangePolandMedia < MMS2R::Media
+  end
+end

data/lib/mms2r/sprint_media.rb

@@ -78,7 +78,7 @@ module MMS2R
       doc.search("/html/body//pre").each do |pre|
         type = 'text/plain'
         text = pre.inner_html.strip
-        next if text.size == 0
+        next if text.empty?
         type, text = transform_text(type, text)
         type, file = sprint_write_file(type, text.strip)
         add_file(type, file) unless type.nil? || file.nil?

data/test/fixtures/orangepoland-text-01.mail

@@ -0,0 +1,7 @@
+From: 48509123456@mmsemail.orange.pl
+To: foo@bar.com
+Subject: Wiadomość multimedialna. 
+Message-ID: <3633598.1180262316735.JavaMail.wluser@mms-ag1-m-vas>
+Date: Tue, 6 Jun 2006 06:06:06 -0600
+
+pozdro600

data/test/fixtures/orangepoland-text-02.mail

@@ -0,0 +1,7 @@
+From: 48509123456@mmsemail.orange.pl
+To: foo@bar.com
+Subject: whazzup
+Message-ID: <3633598.1180262316735.JavaMail.wluser@mms-ag1-m-vas>
+Date: Tue, 6 Jun 2006 06:06:06 -0600
+
+pozdro600

data/test/test_mms2r_orange_poland_media.rb

@@ -0,0 +1,42 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+require File.dirname(__FILE__) + "/test_helper"
+require 'test/unit'
+require 'rubygems'
+require 'mms2r'
+require 'mms2r/media'
+require 'tmail/mail'
+require 'logger'
+
+class MMS2R::OrangePolandMediaTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
+
+  def test_empty_subject
+    mail = TMail::Mail.parse(load_mail('orangepoland-text-01.mail').join)
+    mms = MMS2R::Media.create(mail)
+    assert_equal MMS2R::OrangePolandMedia, mms.class, "expected a #{MMS2R::OrangePolandMedia} and received a #{mms.class}"
+    mms.process
+    assert_nil mms.get_subject
+    assert_not_nil mms.media['text/plain']
+    file = mms.media['text/plain'][0]
+    assert_not_nil file
+    assert File::exist?(file), "file #{file} does not exist"
+    text = IO.readlines("#{file}").join
+    assert_match(/pozdro600/, text)
+    mms.purge
+  end
+  
+  def test_non_empty_subject
+    mail = TMail::Mail.parse(load_mail('orangepoland-text-02.mail').join)
+    mms = MMS2R::Media.create(mail)
+    assert_equal MMS2R::OrangePolandMedia, mms.class, "expected a #{MMS2R::OrangePolandMedia} and received a #{mms.class}"
+    mms.process
+    assert mms.get_subject, "whazzup"
+    assert_not_nil mms.media['text/plain']
+    file = mms.media['text/plain'][0]
+    assert_not_nil file
+    assert File::exist?(file), "file #{file} does not exist"
+    text = IO.readlines("#{file}").join
+    assert_match(/pozdro600/, text)
+    mms.purge
+  end
+end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mms2r
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
-date: 2007-08-11 00:00:00 -07:00
+  version: 1.1.7
+date: 2007-08-27 00:00:00 -07:00
 summary: Extract user media from MMS (and not carrier cruft)
 require_paths: 
 - lib
 email: mikemondragon@gmail.com
 homepage: http://mms2r.rubyforge.org/
 rubyforge_project: mms2r
-description: "== DESCRIPTION:  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the cellphone 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:  * AT&T => mms.att.net * AT&T/Cingular => mmode.com * Cingular => mms.mycingular.com * Cingular => cingularme.com * Dobson/Cellular One => mms.dobson.net * Helio => mms.myhelio.com * Nextel => messaging.nextel.com * Sprint => pm.sprint.com * Sprint => messaging.sprintpcs.com * T-Mobile => tmomail.net * Verizon => vzwpix.com * Verizon => vtext.com"
+description: "== DESCRIPTION:  MMS2R is a library that decodes the parts of an MMS message to disk while  stripping out advertising injected by the cellphone 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:  * AT&T => mms.att.net * AT&T/Cingular => mmode.com * Cingular => mms.mycingular.com * Cingular => cingularme.com * Dobson/Cellular One => mms.dobson.net * Helio => mms.myhelio.com * Nextel => messaging.nextel.com * Orange (Poland) => mmsemail.orange.pl * Sprint => pm.sprint.com * Sprint => messaging.sprintpcs.com * T-Mobile => tmomail.net * Verizon => vzwpix.com * Verizon => vtext.com"
 autorequire: 
 default_executable: 
 bindir: bin
@@ -42,6 +42,7 @@ files:
 - conf/mms2r_media_subject.yml
 - conf/mms2r_my_cingular_media_subject.yml
 - conf/mms2r_nextel_media_ignore.yml
+- conf/mms2r_orange_poland_media_subject.yml
 - conf/mms2r_sprint_media_ignore.yml
 - conf/mms2r_sprint_media_subject.yml
 - conf/mms2r_t_mobile_media_ignore.yml
@@ -57,6 +58,7 @@ files:
 - lib/mms2r/media.rb
 - lib/mms2r/my_cingular_media.rb
 - lib/mms2r/nextel_media.rb
+- lib/mms2r/orange_poland_media.rb
 - lib/mms2r/sprint_media.rb
 - lib/mms2r/sprint_pcs_media.rb
 - lib/mms2r/t_mobile_media.rb
@@ -103,6 +105,8 @@ files:
 - test/fixtures/nextel-image-02.mail
 - test/fixtures/nextel-image-03.mail
 - test/fixtures/nextel-image-04.mail
+- test/fixtures/orangepoland-text-01.mail
+- test/fixtures/orangepoland-text-02.mail
 - test/fixtures/simple-with-two-images-two-texts.mail
 - test/fixtures/simple_image.mail
 - test/fixtures/simple_multipart_alternative.mail
@@ -129,6 +133,7 @@ files:
 - test/test_mms2r_media.rb
 - test/test_mms2r_my_cingular_media.rb
 - test/test_mms2r_nextel_media.rb
+- test/test_mms2r_orange_poland_media.rb
 - test/test_mms2r_sprint_media.rb
 - test/test_mms2r_sprint_pcs_media.rb
 - test/test_mms2r_t_mobile_media.rb
@@ -138,6 +143,7 @@ files:
 - vendor/plugins/mms2r/lib/autotest/mms2r.rb
 test_files: 
 - test/test_mms2r_cingular_me_media.rb
+- test/test_mms2r_orange_poland_media.rb
 - test/test_mms2r_helio_media.rb
 - test/test_mms2r_sprint_pcs_media.rb
 - test/test_mms2r_media.rb
@@ -190,5 +196,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.1
+        version: 1.3.0
     version: