mms2r 3.4.1 → 3.5.0

data/History.txt

@@ -1,3 +1,11 @@
+### 3.5.0 / 2011-12-01 (Dr. Milminiman Lamilim Swimwambli - Marriage expert)
+
+* 1 major bug fix
+  * In Ruby 1.9.X MMS2R::Media::Sprint was not fetching content from Sprint's
+    CDN correctly because the implementation of Net::HTTP in 1.9.X passes a
+    User-Agent header of "Ruby" to which Sprint responds with a fake 500 -
+    with help from James McGrath
+
 ### 3.4.1 / 2011-11-06 (Fatty Ding-Dongs, Dethklok foster child)
 
 * 2 major enhancements

data/conf/mms2r_media.yml

@@ -72,5 +72,5 @@ device_types:
   software:
     :blackberry: !ruby/regexp /^Rim Exif/i
   filenames:
-    :iphone: !ruby/regexp /^photo\.(JPG|PNG)$/i
+    :iphone: !ruby/regexp /^photo\.(JPG|PNG)$/
     :video: !ruby/regexp /\.3gp$/

data/lib/mms2r.rb

@@ -39,8 +39,12 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '3.4.1'
+    VERSION = '3.5.0'
 
+    ##
+    # Spoof User-Agent, primarily for the Sprint CDN
+
+    USER_AGENT = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3"
   end
 
   # Simple convenience function to make it a one-liner:

data/lib/mms2r/media/sprint.rb

@@ -130,17 +130,21 @@ module MMS2R
         srcs.each do |src|
           begin
 
-            url = URI.parse(CGI.unescapeHTML(src))
+            uri = URI.parse(CGI.unescapeHTML(src))
             unless @is_video
               query={}
-              url.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
+              uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
               query.delete_if{|k, v| k == 'limitsize' or k == 'squareoutput' }
-              url.query = query.map{|k,v| "#{k}=#{v}"}.join("&")
+              uri.query = query.map{|k,v| "#{k}=#{v}"}.join("&")
             end
             # sprint is a ghetto, they expect to see & for video request
-            url.query = url.query.gsub(/&/, "&") if @is_video
+            uri.query = uri.query.gsub(/&/, "&") if @is_video
 
-            res = Net::HTTP.get_response(url)
+            connection = Net::HTTP.new(uri.host, uri.port)
+            response, content = connection.get(
+              uri.request_uri,
+              { "User-Agent" => MMS2R::Media::USER_AGENT }
+            )
           rescue StandardError => err
             log("#{self.class} processing error, #{$!}", :error)
             next
@@ -148,19 +152,19 @@ module MMS2R
 
           # if the Sprint content server uses response code 500 when the content is purged
           # the content type will text/html and the body will be the message
-          if res.content_type == 'text/html' && res.code == "500"
+          if response.content_type == 'text/html' && response.code == "500"
             log("Sprint content server returned response code 500", :error)
             next
           end
 
           # setup the file path and file
           base = /\/RECIPIENT\/([^\/]+)\//.match(src)[1]
-          type = res.content_type
+          type = response.content_type
           file_name = "#{base}-#{cnt}.#{self.class.default_ext(type)}"
           file = File.join(msg_tmp_dir(),File.basename(file_name))
 
           # write it and add it to the media hash
-          type, file = sprint_write_file(type, res.body, file)
+          type, file = sprint_write_file(type, content, file)
           add_file(type, file) unless type.nil? || file.nil?
           cnt = cnt + 1
         end

data/test/test_mms2r_media.rb

@@ -43,6 +43,10 @@ class TestMms2rMedia < Test::Unit::TestCase
     end
   end
 
+  def test_faux_user_agent
+    assert_equal "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3",  MMS2R::Media::USER_AGENT
+  end
+
   def test_class_parse
     mms = mail('generic.mail')
     assert_equal ['noreply@rubyforge.org'], mms.from

data/test/test_pm_sprint_com.rb

@@ -4,23 +4,37 @@ class TestPmSprintCom < Test::Unit::TestCase
   include MMS2R::TestHelper
 
   def mock_sprint_image(message_id)
-    uri = URI.parse('http://pictures.sprintpcs.com//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90')
-    res = mock()
-    body = mock()
-    res.expects(:content_type).at_least_once.returns('image/jpeg')
-    res.expects(:body).once.returns(body)
-    res.expects(:code).never
-    Net::HTTP.expects(:get_response).once.returns res
+    response = mock('response')
+    body = mock('body')
+    connection = mock('connection')
+    response.expects(:content_type).twice.returns('image/jpeg')
+    response.expects(:code).never
+    Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection
+    connection.expects(:get).with(
+      # 1.9.2
+      # '//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90&ext=.jpg&iconifyVideo=true&wm=1'
+      # 1.8.7
+      # '//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&outquality=90&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU'
+      kind_of(String),
+      { "User-Agent" => MMS2R::Media::USER_AGENT }
+    ).once.returns([response, body])
   end
 
   def mock_sprint_purged_image(message_id)
-    uri = URI.parse('http://pictures.sprintpcs.com//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90')
-    res = mock()
-    body = mock()
-    res.expects(:content_type).once.returns('text/html')
-    res.expects(:code).once.returns('500')
-    res.expects(:body).never
-    Net::HTTP.expects(:get_response).once.returns res
+    response = mock('response')
+    body = mock('body')
+    connection = mock('connection')
+    response.expects(:content_type).once.returns('text/html')
+    response.expects(:code).once.returns('500')
+    Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection
+    connection.expects(:get).with(
+      # 1.9.2
+      # '//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?inviteToken=PE5rJ5PdYzzwk7V7zoXU&outquality=90&ext=.jpg&iconifyVideo=true&wm=1'
+      # 1.8.7
+      # '//mmps/RECIPIENT/001_2066c7013e7ca833_1/2?wm=1&ext=.jpg&outquality=90&iconifyVideo=true&inviteToken=PE5rJ5PdYzzwk7V7zoXU'
+      kind_of(String),
+      { "User-Agent" => MMS2R::Media::USER_AGENT }
+    ).once.returns([response, body])
   end
 
   def test_mms_should_have_text
@@ -50,14 +64,16 @@ class TestPmSprintCom < Test::Unit::TestCase
   def test_should_have_simple_video
     mail = mail('sprint-video-01.mail')
 
-    uri = URI.parse(
-     'http://pictures.sprintpcs.com//mmps/RECIPIENT/000_259e41e851be9b1d_1/2?inviteToken=lEvrJnPVY5UfOYmahQcx&amp;iconifyVideo=true&amp;wm=1&amp;limitsize=125,125&amp;outquality=90&amp;squareoutput=255,255,255&amp;ext=.jpg&amp;iconifyVideo=true&amp;wm=1')
-    res = mock()
-    body = mock()
-    res.expects(:content_type).at_least_once.returns('video/quicktime')
-    res.expects(:body).once.returns(body)
-    res.expects(:code).never
-    Net::HTTP.expects(:get_response).once.returns res
+    response = mock('response')
+    body = mock('body')
+    connection = mock('connection')
+    response.expects(:content_type).twice.returns('video/quicktime')
+    response.expects(:code).never
+    Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection
+    connection.expects(:get).with(
+      kind_of(String),
+      { "User-Agent" => MMS2R::Media::USER_AGENT }
+    ).once.returns([response, body])
 
     mms = MMS2R::Media.new(mail)
     assert_equal '2068675309', mms.number
@@ -126,22 +142,39 @@ class TestPmSprintCom < Test::Unit::TestCase
   def test_should_have_two_images
     mail = mail('sprint-two-images-01.mail')
 
-    uri1 = URI.parse('http://pictures.sprintpcs.com/mmps/RECIPIENT/001_104058d23d79fb6a_1/2?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=5E1rJSPk5hYDkUnY7op0&outquality=90')
-    res1 = mock()
-    body1 = mock()
-    res1.expects(:content_type).at_least_once.returns('image/jpeg')
-    res1.expects(:body).once.returns(body1)
-    res1.expects(:code).never
-    Net::HTTP.expects(:get_response).returns res1
-
-    uri2 = URI.parse('http://pictures.sprintpcs.com/mmps/RECIPIENT/001_104058d23d79fb6a_1/3?wm=1&ext=.jpg&iconifyVideo=true&inviteToken=5E1rJSPk5hYDkUnY7op0&outquality=90')
-
-    res2 = mock()
-    body2 = mock()
-    res2.expects(:content_type).at_least_once.returns('image/jpeg')
-    res2.expects(:body).once.returns(body2)
-    res2.expects(:code).never
-    Net::HTTP.expects(:get_response).returns res2
+    response = mock('response')
+    body = mock('body')
+    connection = mock('connection')
+    response.expects(:content_type).times(4).returns('image/jpeg')
+    response.expects(:code).never
+    Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
+    connection.expects(:get).with(
+      kind_of(String),
+      { "User-Agent" => MMS2R::Media::USER_AGENT }
+    ).twice.returns([response, body])
+
+    # response1 = mock('response1')
+    # body1 = mock('body1')
+    # connection1 = mock('connection1')
+    # response1.expects(:content_type).at_least_once.returns('image/jpeg')
+    # response1.expects(:code).never
+    # Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection1
+    # connection1.expects(:get).with(
+    #   kind_of(String),
+    #   { "User-Agent" => MMS2R::Media::USER_AGENT }
+    # ).once.returns([response1, body1])
+
+    # response2 = mock('response2')
+    # body2 = mock('body2')
+    # connection2 = mock('connection2')
+    # response2.expects(:content_type).at_least_once.returns('image/jpeg')
+    # response2.expects(:code).never
+    # Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection2
+    # connection2.expects(:get).with(
+    #   kind_of(String),
+    #   { "User-Agent" => MMS2R::Media::USER_AGENT }
+    # ).once.returns([response2, body2])
+
     mms = MMS2R::Media.new(mail)
     assert_equal '2068675309', mms.number
     assert_equal "pm.sprint.com", mms.carrier

metadata

@@ -1,130 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mms2r
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 3.5.0
   prerelease: 
-  segments: 
-  - 3
-  - 4
-  - 1
-  version: 3.4.1
 platform: ruby
-authors: 
+authors:
 - Mike Mondragon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &20713980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *20713980
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &20712840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 2
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: uuidtools
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *20712840
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &20711600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: exifr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *20711600
+- !ruby/object:Gem::Dependency
+  name: exifr
+  requirement: &20710280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *20710280
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &20708940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 12
-        version: "2.12"
+      - !ruby/object:Gem::Version
+        version: '2.12'
   type: :development
-  version_requirements: *id005
-description: |-
-  == DESCRIPTION
-  
+  prerelease: false
+  version_requirements: *20708940
+description: ! '== 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
+
   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.
-email: 
+
+  MMS other than decoding and consolidating its media.'
+email:
 - mikemondragon@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.TMail.txt
 - README.txt
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -312,39 +291,31 @@ files:
 - .gemtest
 homepage: https://github.com/monde/mms2r
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mms2r
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extract user media from MMS (and not carrier cruft)
-test_files: 
+test_files:
 - test/test_orangemms_net.rb
 - test/test_waw_plspictures_com.rb
 - test/test_mediamessaging_o2_co_uk.rb