mms2r 3.4.0 → 3.4.1

data/test/test_helper.rb

@@ -40,7 +40,7 @@ module MMS2R
       Mail.read(mail_fixture(name))
     end
 
-    def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', jpeg = true)
+    def smart_phone_mock(make_text = 'Apple', model_text = 'iPhone', software_text = nil, jpeg = true)
       mail = stub('mail',
                   :from => ['joe@example.com'],
                   :return_path => '<joe@example.com>',
@@ -55,7 +55,7 @@ module MMS2R
                   :filename => "foo.#{jpeg ? 'jpg' : 'tif'}" )
 
       mail.stubs(:parts).returns([part])
-      exif = stub('exif', :make => make_text, :model => model_text)
+      exif = stub('exif', :make => make_text, :model => model_text, :software => software_text)
       if jpeg
         EXIFR::JPEG.expects(:new).at_least_once.returns(exif)
       else

data/test/test_mms2r_media.rb

@@ -769,19 +769,40 @@ class TestMms2rMedia < Test::Unit::TestCase
   end
 
   def test_faux_tiff_iphone_device_type_by_exif
-    mail = smart_phone_mock('Apple', 'iPhone', jpeg = false)
+    mail = smart_phone_mock('Apple', 'iPhone', nil, jpeg = false)
     mms = MMS2R::Media.new(mail)
     assert_equal :iphone, mms.device_type?
     assert_equal true, mms.is_mobile?
   end
 
-  def test_blackberry_device_type_by_exif
+  def test_iphone_device_type_by_filename_jpg
+    mail = smart_phone_mock('Hipstamatic', '201')
+    mms = MMS2R::Media.new(mail)
+    assert_equal :apple, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
+  def test_iphone_device_type_by_filename_png
+    mail = mail('iphone-image-02.mail')
+    mms = MMS2R::Media.new(mail)
+    assert_equal true, mms.is_mobile?
+    assert_equal :iphone, mms.device_type?
+  end
+
+  def test_blackberry_device_type_by_exif_make_model
     mail = smart_phone_mock('Research In Motion', 'BlackBerry')
     mms = MMS2R::Media.new(mail)
     assert_equal :blackberry, mms.device_type?
     assert_equal true, mms.is_mobile?
   end
 
+  def test_blackberry_device_type_by_exif_software
+    mail = smart_phone_mock(nil, nil, "Rim Exif Version1.00a")
+    mms = MMS2R::Media.new(mail)
+    assert_equal :blackberry, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
   def test_dash_device_type_by_exif
     mail = smart_phone_mock('T-Mobile Dash', 'T-Mobile Dash')
     mms = MMS2R::Media.new(mail)
@@ -810,6 +831,13 @@ class TestMms2rMedia < Test::Unit::TestCase
     assert_equal true, mms.is_mobile?
   end
 
+  def test_android_app_by_exif
+    mail = smart_phone_mock('Retro Camera Android', "Xoloroid 2000")
+    mms = MMS2R::Media.new(mail)
+    assert_equal :android, mms.device_type?
+    assert_equal true, mms.is_mobile?
+  end
+
   def test_handsets_by_exif
     handsets = YAML.load_file(fixture('handsets.yml'))
     handsets.each do |handset|

data/test/test_sprint.rb

@@ -0,0 +1,18 @@
+require "test_helper"
+
+class Testprint < Test::Unit::TestCase
+  include MMS2R::TestHelper
+
+  def test_sprint_blackberry_01
+    # Rim Exif Version1.00a
+    mail = mail('sprint-blackberry-01.mail')
+    mms = MMS2R::Media.new(mail)
+    assert_equal true, mms.is_mobile?
+    assert_equal :blackberry, mms.device_type?
+    assert_equal "", mms.body
+    assert_equal 1, mms.media.size
+    assert_equal 1, mms.media['image/jpeg'].size
+
+    mms.purge
+  end
+end

metadata

@@ -1,109 +1,131 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mms2r
-version: !ruby/object:Gem::Version
-  version: 3.4.0
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 3
+  - 4
+  - 1
+  version: 3.4.1
 platform: ruby
-authors:
+authors: 
 - Mike Mondragon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-06 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: &13599080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 4
+        - 4
         version: 1.4.4
   type: :runtime
-  prerelease: false
-  version_requirements: *13599080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mail
-  requirement: &13597440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 2
+        - 10
         version: 2.2.10
   type: :runtime
-  prerelease: false
-  version_requirements: *13597440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: uuidtools
-  requirement: &13594060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
   type: :runtime
-  prerelease: false
-  version_requirements: *13594060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: exifr
-  requirement: &13553800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 0
+        - 3
         version: 1.0.3
   type: :runtime
-  prerelease: false
-  version_requirements: *13553800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &13551820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 12
+        version: "2.12"
   type: :development
-  prerelease: false
-  version_requirements: *13551820
-description: ! '== DESCRIPTION
-
-
+  version_requirements: *id005
+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
 - History.txt
@@ -130,7 +152,7 @@ files:
 - conf/mms.netcom.no.yml
 - conf/mms.o2online.de.yml
 - conf/mms.three.co.uk.yml
-- conf/mms.uscc.net.mail
+- conf/mms.uscc.net.yml
 - conf/mms.vodacom4me.co.za.yml
 - conf/mms2r_media.yml
 - conf/mobile.indosat.net.id.yml
@@ -188,6 +210,7 @@ files:
 - test/fixtures/indosat-image-02.mail
 - test/fixtures/info2go-image-01.mail
 - test/fixtures/iphone-image-01.mail
+- test/fixtures/iphone-image-02.mail
 - test/fixtures/luxgsm-image-01.mail
 - test/fixtures/maroctelecom-france-mms-01.mail
 - test/fixtures/mediamessaging_o2_co_uk-image-01.mail
@@ -213,6 +236,7 @@ files:
 - test/fixtures/pxt-image-01.mail
 - test/fixtures/rogers-canada-mms-01.mail
 - test/fixtures/sasktel-image-01.mail
+- test/fixtures/sprint-blackberry-01.mail
 - test/fixtures/sprint-broken-image-01.mail
 - test/fixtures/sprint-image-01.mail
 - test/fixtures/sprint-new-image-01.mail
@@ -247,7 +271,6 @@ files:
 - 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
@@ -278,6 +301,7 @@ files:
 - test/test_pxt_vodafone_net_nz.rb
 - test/test_rci_rogers_com.rb
 - test/test_sms_sasktel_com.rb
+- test/test_sprint.rb
 - test/test_tmomail_net.rb
 - test/test_unicel_com.rb
 - test/test_vmpix_com.rb
@@ -288,34 +312,39 @@ 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 4582879088238575309
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      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
@@ -350,4 +379,5 @@ test_files:
 - test/test_mms_three_co_uk.rb
 - test/test_vmpix_com.rb
 - test/test_mms_myhelio_com.rb
+- test/test_sprint.rb
 - test/test_mms_ae.rb

data/test/hax.rb

@@ -1,8 +0,0 @@
-#regexp = "/^([^\s|^\/|^@]+).*/"
-regexp = "^@"
-pattern = Regexp.escape(regexp)
-
-Dir.glob(File.join(File.dirname(__FILE__), "../conf/*yml")).each do |f|
-  content = open(f).read
-  puts f if (/#{pattern}/mi).match(content)
-end