mms2r 3.6.0 → 3.6.1

data/History.txt

@@ -1,3 +1,8 @@
+### 3.6.1 / 2012-02-11 (Mr. Gojira - Owner Mr. Gojira's Driving School)
+
+* 1 minor enhancement
+  * use Net::HTTP#get2 to fetch Sprint content
+
 ### 3.6.0 / 2012-01-19 (Agent 216 - assassin, master of infiltration and sabotage)
 
 * 1 major enhancement

data/lib/mms2r.rb

@@ -39,7 +39,7 @@ module MMS2R
     ##
     # MMS2R library version
 
-    VERSION = '3.6.0'
+    VERSION = '3.6.1'
 
     ##
     # Spoof User-Agent, primarily for the Sprint CDN
@@ -50,9 +50,10 @@ module MMS2R
   # Simple convenience function to make it a one-liner:
   # MMS2R.parse raw_mail or MMS2R.parse File.load(raw_mail)
   # Combined w/ the method_missing delegation, this should behave as an enhanced Mail object, more or less.
-  def self.parse raw_mail
+  def self.parse raw_mail, options = {}
     mail = Mail.new raw_mail
-    MMS2R::Media.new(mail) end
+    MMS2R::Media.new(mail, options)
+  end
 
 end
 

data/lib/mms2r/media/sprint.rb

@@ -134,17 +134,19 @@ module MMS2R
             unless @is_video
               query={}
               uri.query.split('&').each{|a| p=a.split('='); query[p[0]] = p[1]}
-              query.delete_if{|k, v| k == 'limitsize' or k == 'squareoutput' }
+              query.delete_if{|k, v| k == 'limitsize' || k == 'squareoutput' }
               uri.query = query.map{|k,v| "#{k}=#{v}"}.join("&")
             end
             # sprint is a ghetto, they expect to see & for video request
             uri.query = uri.query.gsub(/&/, "&") if @is_video
 
             connection = Net::HTTP.new(uri.host, uri.port)
-            response, content = connection.get(
+            #connection.set_debug_output $stdout
+            response = connection.get2(
               uri.request_uri,
               { "User-Agent" => MMS2R::Media::USER_AGENT }
             )
+            content = response.body
           rescue StandardError => err
             log("#{self.class} processing error, #{$!}", :error)
             next

data/mms2r.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "mms2r"
-  s.version = "3.4.0"
+  s.version = "3.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Mondragon"]

data/test/test_pm_sprint_com.rb

@@ -8,16 +8,17 @@ class TestPmSprintCom < Test::Unit::TestCase
     body = mock('body')
     connection = mock('connection')
     response.expects(:content_type).twice.returns('image/jpeg')
+    response.expects(:body).returns(body)
     response.expects(:code).never
     Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection
-    connection.expects(:get).with(
+    connection.expects(:get2).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])
+    ).once.returns(response)
   end
 
   def mock_sprint_purged_image(message_id)
@@ -25,16 +26,17 @@ class TestPmSprintCom < Test::Unit::TestCase
     body = mock('body')
     connection = mock('connection')
     response.expects(:content_type).once.returns('text/html')
+    response.expects(:body).returns(body)
     response.expects(:code).once.returns('500')
     Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection
-    connection.expects(:get).with(
+    connection.expects(:get2).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])
+    ).once.returns(response)
   end
 
   def test_mms_should_have_text
@@ -68,12 +70,13 @@ class TestPmSprintCom < Test::Unit::TestCase
     body = mock('body')
     connection = mock('connection')
     response.expects(:content_type).twice.returns('video/quicktime')
+    response.expects(:body).returns(body)
     response.expects(:code).never
     Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).once.returns connection
-    connection.expects(:get).with(
+    connection.expects(:get2).with(
       kind_of(String),
       { "User-Agent" => MMS2R::Media::USER_AGENT }
-    ).once.returns([response, body])
+    ).once.returns(response)
 
     mms = MMS2R::Media.new(mail)
     assert_equal '2068675309', mms.number
@@ -146,34 +149,13 @@ class TestPmSprintCom < Test::Unit::TestCase
     body = mock('body')
     connection = mock('connection')
     response.expects(:content_type).times(4).returns('image/jpeg')
+    response.expects(:body).twice.returns(body)
     response.expects(:code).never
     Net::HTTP.expects(:new).with('pictures.sprintpcs.com', 80).twice.returns connection
-    connection.expects(:get).with(
+    connection.expects(:get2).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])
+    ).twice.returns(response)
 
     mms = MMS2R::Media.new(mail)
     assert_equal '2068675309', mms.number

metadata

@@ -2,7 +2,7 @@
 name: mms2r
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors: 
 - Mike Mondragon
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 Z
+date: 2012-02-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -308,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1579114988942475097
+      hash: -2400410557387373563
       segments: 
       - 0
       version: "0"